X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ecmalisp.lisp;h=d015254570b5531a763da031f01eb46881117707;hb=0294dcffc8c3a9f7bd0a2c5242a091fc33cbcc6e;hp=2e75d2487f0b3b7fe3b03a2672f7fe37b57bd139;hpb=3d6b319c5c78eb53616e162f79ac01c13fbd3db2;p=jscl.git

diff --git a/ecmalisp.lisp b/ecmalisp.lisp
index 2e75d24..d015254 100644
--- a/ecmalisp.lisp
+++ b/ecmalisp.lisp
@@ -98,8 +98,6 @@
 
   ;; Basic functions
   (defun = (x y) (= x y))
-  (defun + (x y) (+ x y))
-  (defun - (x y) (- x y))
   (defun * (x y) (* x y))
   (defun / (x y) (/ x y))
   (defun 1+ (x) (+ x 1))
@@ -249,6 +247,18 @@
 ;;; constructions.
 #+ecmalisp
 (progn
+  (defun + (&rest args)
+    (let ((r 0))
+      (dolist (x args r)
+	(incf r x))))
+
+  (defun - (x &rest others)
+    (if (null others)
+	(- x)
+	(let ((r x))
+	  (dolist (y others r)
+	    (decf r y)))))
+
   (defun append-two (list1 list2)
     (if (null list1)
         list2
@@ -1228,48 +1238,46 @@
 (define-compilation progn (&rest body)
   (js!selfcall (ls-compile-block body t)))
 
-
-(defun restoring-dynamic-binding (bindings body)
+(defun special-variable-p (x)
+  (claimp x 'variable 'special))
+
+;;; Wrap CODE to restore the symbol values of the dynamic
+;;; bindings. BINDINGS is a list of pairs of the form
+;;; (SYMBOL . PLACE),  where PLACE is a Javascript variable
+;;; name to initialize the symbol value and where to stored
+;;; the old value.
+(defun let-binding-wrapper (bindings body)
+  (when (null bindings)
+    (return-from let-binding-wrapper body))
   (concat
    "try {" *newline*
-   (indent body)
+   (indent "var tmp;" *newline*
+           (mapconcat
+            (lambda (b)
+              (let ((s (ls-compile `(quote ,(car b)))))
+                (concat "tmp = " s ".value;" *newline*
+                        s ".value = " (cdr b) ";" *newline*
+                        (cdr b) " = tmp;" *newline*)))
+            bindings)
+           body *newline*)
    "}" *newline*
    "finally {"  *newline*
    (indent
-    (join-trailing (mapcar (lambda (b)
-                             (let ((s (ls-compile `(quote ,(car b)))))
-                               (concat s ".value" " = " (cdr b))))
-                           bindings)
-                   (concat ";" *newline*)))
+    (mapconcat (lambda (b)
+                 (let ((s (ls-compile `(quote ,(car b)))))
+                   (concat s ".value" " = " (cdr b) ";" *newline*)))
+               bindings))
    "}" *newline*))
 
-(defun dynamic-binding-wrapper (bindings body)
-  (if (null bindings)
-      body
-      (restoring-dynamic-binding
-       bindings
-       (concat "var tmp;" *newline*
-               (join (mapcar (lambda (b)
-                               (let ((s (ls-compile `(quote ,(car b)))))
-                                 (concat "tmp = " s ".value;" *newline*
-                                         s ".value = " (cdr b) ";" *newline*
-                                         (cdr b) " = tmp;" *newline*)))
-                             bindings))
-               body
-               *newline*))))
-
 (define-compilation let (bindings &rest body)
   (let ((bindings (mapcar #'ensure-list bindings)))
-    (let ((variables (mapcar #'first bindings))
-          (values    (mapcar #'second bindings)))
-      (let ((cvalues (mapcar #'ls-compile values))
-            (*environment*
-             (extend-local-env (remove-if (lambda (v)(claimp v 'variable 'special))
-                                          variables)))
+    (let ((variables (mapcar #'first bindings)))
+      (let ((cvalues (mapcar #'ls-compile (mapcar #'second bindings)))
+            (*environment* (extend-local-env (remove-if #'special-variable-p variables)))
             (dynamic-bindings))
         (concat "(function("
                 (join (mapcar (lambda (x)
-                                (if (claimp x 'variable 'special)
+                                (if (special-variable-p x)
                                     (let ((v (gvarname x)))
                                       (push (cons x v) dynamic-bindings)
                                       v)
@@ -1278,31 +1286,56 @@
                       ",")
                 "){" *newline*
                 (let ((body (ls-compile-block body t)))
-                  (indent (dynamic-binding-wrapper dynamic-bindings body)))
+                  (indent (let-binding-wrapper dynamic-bindings body)))
                 "})(" (join cvalues ",") ")")))))
 
 
-(defun let*-initialize (x)
-  (let ((var (first x))
-        (value (second x)))
-    (if (claimp var 'variable 'special)
-        (ls-compile `(setq ,var ,value))
+;;; Return the code to initialize BINDING, and push it extending the
+;;; current lexical environment if the variable is special.
+(defun let*-initialize-value (binding)
+  (let ((var (first binding))
+        (value (second binding)))
+    (if (special-variable-p var)
+        (concat (ls-compile `(setq ,var ,value)) ";" *newline*)
         (let ((v (gvarname var)))
           (let ((b (make-binding var 'variable v)))
             (prog1 (concat "var " v " = " (ls-compile value) ";" *newline*)
               (push-to-lexenv b *environment* 'variable)))))))
 
+;;; Wrap BODY to restore the symbol values of SYMBOLS after body. It
+;;; DOES NOT generate code to initialize the value of the symbols,
+;;; unlike let-binding-wrapper.
+(defun let*-binding-wrapper (symbols body)
+  (when (null symbols)
+    (return-from let*-binding-wrapper body))
+  (let ((store (mapcar (lambda (s) (cons s (gvarname s)))
+                       (remove-if-not #'special-variable-p symbols))))
+    (concat
+     "try {" *newline*
+     (indent
+      (mapconcat (lambda (b)
+                   (let ((s (ls-compile `(quote ,(car b)))))
+                     (concat "var " (cdr b) " = " s ".value;" *newline*)))
+                 store)
+      body)
+     "}" *newline*
+     "finally {" *newline*
+     (indent
+      (mapconcat (lambda (b)
+                   (let ((s (ls-compile `(quote ,(car b)))))
+                     (concat s ".value" " = " (cdr b) ";" *newline*)))
+                 store))
+     "}" *newline*)))
+
+
 (define-compilation let* (bindings &rest body)
   (let ((bindings (mapcar #'ensure-list bindings))
         (*environment* (copy-lexenv *environment*)))
     (js!selfcall
-      (let ((body
-             (concat (mapconcat #'let*-initialize bindings)
-                     (ls-compile-block body t))))
-        (if (some (lambda (b) (claimp (car b) 'variable 'special)) bindings)
-            (restoring-dynamic-binding bindings body)
-            body)))))
-
+      (let ((specials (remove-if-not #'special-variable-p (mapcar #'first bindings)))
+            (body (concat (mapconcat #'let*-initialize-value bindings)
+                          (ls-compile-block body t))))
+        (let*-binding-wrapper specials body)))))
 
 
 (defvar *block-counter* 0)
@@ -1511,12 +1544,54 @@
                decls)
      (concat "return " (progn ,@body) ";" *newline*)))
 
+;;; VARIABLE-ARITY compiles variable arity operations. ARGS stands for
+;;; a variable which holds a list of forms. It will compile them and
+;;; store the result in some Javascript variables. BODY is evaluated
+;;; with ARGS bound to the list of these variables to generate the
+;;; code which performs the transformation on these variables.
+
+(defun variable-arity-call (args function)
+  (unless (consp args)
+    (error "ARGS must be a non-empty list"))
+  (let ((counter 0)
+        (variables '())
+        (prelude ""))
+    (dolist (x args)
+      (let ((v (concat "x" (integer-to-string (incf counter)))))
+        (push v variables)
+        (concatf prelude
+                 (concat "var " v " = " (ls-compile x) ";" *newline*
+                         "if (typeof " v " !== 'number') throw 'Not a number!';"
+                         *newline*))))
+    (js!selfcall prelude (funcall function (reverse variables)))))
+
+
+(defmacro variable-arity (args &body body)
+  (unless (symbolp args)
+    (error "Bad usage of VARIABLE-ARITY, yo must pass a symbol"))
+  `(variable-arity-call ,args
+                        (lambda (,args)
+                          (concat "return " ,@body ";" *newline*))))
+
+
 (defun num-op-num (x op y)
   (type-check (("x" "number" x) ("y" "number" y))
     (concat "x" op "y")))
 
-(define-builtin + (x y) (num-op-num x "+" y))
-(define-builtin - (x y) (num-op-num x "-" y))
+(define-raw-builtin + (&rest numbers)
+  (if (null numbers)
+      "0"
+      (variable-arity numbers
+	(join numbers "+"))))
+
+(define-raw-builtin - (x &rest others)
+  (let ((args (cons x others)))
+    (variable-arity args
+      (if (null others)
+	  (concat "-" (car args))
+	  (join args "-")))))
+
+
 (define-builtin * (x y) (num-op-num x "*" y))
 (define-builtin / (x y) (num-op-num x "/" y))
 
@@ -1811,26 +1886,23 @@
                (ls-compile-toplevel x))))
       (js-eval code)))
 
-  (export '(* *gensym-counter* *package* + - / 1+ 1- < <= = = > >= and append
-            apply assoc atom block boundp boundp butlast caar cadddr
-            caddr cadr car car case catch cdar cdddr cddr cdr cdr char
-            char-code char= code-char cond cons consp copy-list decf
-            declaim defparameter defun defvar digit-char-p disassemble
-            documentation dolist dotimes ecase eq eql equal error eval
-            every export fdefinition find-package find-symbol first
-            fourth fset funcall function functionp gensym go identity
-            in-package incf integerp integerp intern keywordp
-            lambda-code last length let let* list-all-packages list listp
-            make-package make-symbol mapcar member minusp mod nil not
-            nth nthcdr null numberp or package-name package-use-list
-            packagep plusp prin1-to-string print proclaim prog1 prog2
-            pron push quote remove remove-if remove-if-not return
-            return-from revappend reverse second set setq some
-            string-upcase string string= stringp subseq
-            symbol-function symbol-name symbol-package symbol-plist
-            symbol-value symbolp t tagbody third throw truncate unless
-            unwind-protect variable warn when write-line write-string
-            zerop))
+  (export '(&rest &optional &body * *gensym-counter* *package* + - / 1+ 1- < <= =
+= > >= and append apply assoc atom block boundp boundp butlast caar
+cadddr caddr cadr car car case catch cdar cdddr cddr cdr cdr char
+char-code char= code-char cond cons consp copy-list decf declaim
+defparameter defun defvar digit-char-p disassemble documentation
+dolist dotimes ecase eq eql equal error eval every export fdefinition
+find-package find-symbol first fourth fset funcall function functionp
+gensym go identity if in-package incf integerp integerp intern
+keywordp lambda last length let let* list-all-packages list listp
+make-package make-symbol mapcar member minusp mod nil not nth nthcdr
+null numberp or package-name package-use-list packagep plusp
+prin1-to-string print proclaim prog1 prog2 pron push quote remove
+remove-if remove-if-not return return-from revappend reverse second
+set setq some string-upcase string string= stringp subseq
+symbol-function symbol-name symbol-package symbol-plist symbol-value
+symbolp t tagbody third throw truncate unless unwind-protect variable
+warn when write-line write-string zerop))
 
   (setq *package* *user-package*)