Added length, @, mapcar utility functions, exported all library function symbols.

diff --git a/parenscript.asd b/parenscript.asd
index 51b86a0..3ddfa1c 100644 (file)
--- a/parenscript.asd
+++ b/parenscript.asd
@@ -31,7 +31,8 @@
                                       :components ((:static-file "functional.lisp")
                                                   (:file "js-html")
                                                   (:file "css"    )
-                                                  (:file "js-utils"))
+                                                  (:file "js-utils")
+                                                   (:file "js-lib"))
                                      :depends-on ("compilation-interface")))))
   :depends-on ())
 

diff --git a/src/lib/js-lib.lisp b/src/lib/js-lib.lisp
new file mode 100644 (file)
index 0000000..c9485e2
--- /dev/null
+++ b/src/lib/js-lib.lisp
@@ -0,0 +1,15 @@
+(in-package :parenscript)
+
+;;; Script of library functions you can include with your own code to
+;;; provide standard Lisp functionality.
+
+(defparameter *ps-lisp-library*
+  '((defun mapcar (fun &rest as)
+      (let ((result-array (make-array)))
+        (if (= 1 (length as))
+            (dolist (element (aref as 0))
+              (result-array.push (fun element)))
+            (dotimes (i (length (aref as 0)))
+              (let ((args-array (mapcar (lambda (a) (return (aref a i))) as)))
+                (result-array.push (fun.apply fun args-array)))))
+        (return result-array)))))

diff --git a/src/lib/js-utils.lisp b/src/lib/js-utils.lisp
index 5644972..5e413bd 100644 (file)
--- a/src/lib/js-utils.lisp
+++ b/src/lib/js-utils.lisp
@@ -37,7 +37,24 @@
 (defpsmacro ignore-errors (&body body)
   `(try (progn ,@body) (:catch (e))))
 
+;;; Data structures
+
+(defpsmacro length (a)
+  `(.size ,a))
+
 ;;; Misc
 
 (defpsmacro null (x)
   `(= ,x nil))
+
+(defpsmacro @ (obj &rest props)
+  "Handy slot-value/aref composition macro."
+  (if (null props)
+      obj
+      `(@ (slot-value
+           ,(if (stringp obj) `($ ,obj) obj)
+           ,(let ((prop (macroexpand (first props))))
+                 (if (symbolp prop)
+                     `',prop
+                     prop)))
+        ,@(cdr props))))
\ No newline at end of file

diff --git a/src/package.lisp b/src/package.lisp
index 639eefd..c37a315 100644 (file)
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -147,6 +147,31 @@
 
       ;; utils
       #:do-set-timeout
+      #:min
+      #:max
+      #:ceiling
+      #:abs
+      #:sin
+      #:cos
+      #:tan
+      #:acos
+      #:asin
+      #:atan
+      #:exp
+      #:floor
+      #:expt
+      #:round
+      #:random
+      #:oddp
+      #:evenp
+      #:ignore-errors
+      #:length
+      #:null
+      #:@
+
+      ;; libries
+      #:*ps-lisp-library*
+      #:mapcar
       ))
   "All symbols considerred part of the Parenscript language.")