X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=ecmalisp.lisp;h=0d091a66a5b354e1bd53033c938239bd238c0147;hb=4951c2dad634560b91b4d0bf3b6545dd02bfa887;hp=02aa16ed5a6dc341973bf770d0310eba20e20e5d;hpb=819d4a5bc9214fdb79ade55f10ba7349110316bf;p=jscl.git

diff --git a/ecmalisp.lisp b/ecmalisp.lisp
index 02aa16e..0d091a6 100644
--- a/ecmalisp.lisp
+++ b/ecmalisp.lisp
@@ -23,7 +23,9 @@
 ;;; language to the compiler to be able to run.
 
 #+ecmalisp
-(js-eval "function pv (x) { return typeof x === 'object' && 'car' in x ? x.car : x; }")
+(js-eval "function pv (x) { return x; }")
+#+ecmalisp
+(js-eval "var values = pv;")
 
 #+ecmalisp
 (progn
@@ -601,13 +603,7 @@
         (oset exports (symbol-name symb) symb))))
 
   (defun get-universal-time ()
-    (+ (get-unix-time) 2208988800))
-
-  (defun values-list (list)
-    (values-list list))
-
-  (defun values (&rest args)
-    (values-list args)))
+    (+ (get-unix-time) 2208988800)))
 
 
 ;;; The compiler offers some primitives and special forms which are
@@ -681,6 +677,15 @@
       (aset v i x)
       (incf i))))
 
+#+ecmalisp
+(progn
+  (defun values-list (list)
+    (values-array (list-to-vector list)))
+
+  (defun values (&rest args)
+    (values-list args)))
+
+
 ;;; Like CONCAT, but prefix each line with four spaces. Two versions
 ;;; of this function are available, because the Ecmalisp version is
 ;;; very slow and bootstraping was annoying.
@@ -979,6 +984,8 @@
 ;;; too. The respective real functions are defined in the target (see
 ;;; the beginning of this file) as well as some primitive functions.
 
+(defvar *multiple-value-p* nil)
+
 (defvar *compilation-unit-checks* '())
 
 (defun make-binding (name type value &optional declarations)
@@ -1100,8 +1107,8 @@
 
 (define-compilation if (condition true false)
   (concat "(" (ls-compile condition) " !== " (ls-compile nil)
-          " ? " (ls-compile true)
-          " : " (ls-compile false)
+          " ? " (ls-compile true *multiple-value-p*)
+          " : " (ls-compile false *multiple-value-p*)
           ")"))
 
 (defvar *lambda-list-keywords* '(&optional &rest))
@@ -1136,13 +1143,10 @@
       (join strs)))
 
 
-(defvar *compiling-lambda-p* nil)
-
 (define-compilation lambda (lambda-list &rest body)
   (let ((required-arguments (lambda-list-required-arguments lambda-list))
         (optional-arguments (lambda-list-optional-arguments lambda-list))
         (rest-argument (lambda-list-rest-argument lambda-list))
-        (*compiling-lambda-p* t)
         documentation)
     ;; Get the documentation string for the lambda function
     (when (and (stringp (car body))
@@ -1564,15 +1568,22 @@
   (let ((func (ls-compile func-form)))
     (js!selfcall
       "var args = [values];" *newline*
-      "function values(){" *newline*
+      "values = function(){" *newline*
       (indent "var result = [];" *newline*
+              "result['multiple-value'] = true;" *newline*
               "for (var i=0; i<arguments.length; i++)" *newline*
-              (indent "result.push(arguments[i]);"))
+              (indent "result.push(arguments[i]);" *newline*)
+              "return result;" *newline*)
       "}" *newline*
+      "var vs;" *newline*
       (mapconcat (lambda (form)
-                   (ls-compile form))
+                   (concat "vs = " (ls-compile form t) ";" *newline*
+                           "if (typeof vs === 'object' && 'multiple-value' in vs)" *newline*
+                           (indent "args = args.concat(vs);" *newline*)
+                           "else" *newline*
+                           (indent "args.push(vs);" *newline*)))
                  forms)
-      "return (" func ").apply(window, [args]);")))
+      "return (" func ").apply(window, args);" *newline*)))
 
 
 
@@ -1930,8 +1941,12 @@
 (define-builtin get-unix-time ()
   (concat "(Math.round(new Date() / 1000))"))
 
-(define-builtin values-list (list)
-  (concat "values(" list ")"))
+(define-builtin values-array (array)
+  (concat "values.apply(this, " array ")"))
+
+(define-raw-builtin values (&rest args)
+  (concat "values(" (join (mapcar #'ls-compile args) ", ") ")"))
+
 
 (defun macro (x)
   (and (symbolp x)
@@ -1958,16 +1973,17 @@
         form)))
 
 (defun compile-funcall (function args)
-  (if (and (symbolp function)
-           (claimp function 'function 'non-overridable))
-      (concat (ls-compile `',function) ".fvalue("
-              (join (cons "pv" (mapcar #'ls-compile args))
-                    ", ")
-              ")")
-      (concat (ls-compile `#',function) "("
-              (join (cons "pv" (mapcar #'ls-compile args))
-                    ", ")
-              ")")))
+  (let ((values-funcs (if *multiple-value-p* "values" "pv")))
+    (if (and (symbolp function)
+             (claimp function 'function 'non-overridable))
+        (concat (ls-compile `',function) ".fvalue("
+                (join (cons values-funcs (mapcar #'ls-compile args))
+                      ", ")
+                ")")
+        (concat (ls-compile `#',function) "("
+                (join (cons values-funcs (mapcar #'ls-compile args))
+                      ", ")
+                ")"))))
 
 (defun ls-compile-block (sexps &optional return-last-p)
   (if return-last-p
@@ -1977,41 +1993,41 @@
        (remove-if #'null-or-empty-p (mapcar #'ls-compile sexps))
        (concat ";" *newline*))))
 
-(defun ls-compile (sexp)
-  (cond
-    ((symbolp sexp)
-     (let ((b (lookup-in-lexenv sexp *environment* 'variable)))
-       (cond
-         ((and b (not (member 'special (binding-declarations b))))
-          (binding-value b))
-         ((or (keywordp sexp)
-              (member 'constant (binding-declarations b)))
-          (concat (ls-compile `',sexp) ".value"))
-         (t
-          (ls-compile `(symbol-value ',sexp))))))
-    ((integerp sexp) (integer-to-string sexp))
-    ((stringp sexp) (concat "\"" (escape-string sexp) "\""))
-    ((arrayp sexp) (literal sexp))
-    ((listp sexp)
-     (let ((name (car sexp))
-           (args (cdr sexp)))
-       (cond
-         ;; Special forms
-         ((assoc name *compilations*)
-          (let ((comp (second (assoc name *compilations*))))
-            (apply comp args)))
-         ;; Built-in functions
-         ((and (assoc name *builtins*)
-               (not (claimp name 'function 'notinline))
-               *compiling-lambda-p*)
-          (let ((comp (second (assoc name *builtins*))))
-            (apply comp args)))
-         (t
-          (if (macro name)
-              (ls-compile (ls-macroexpand-1 sexp))
-              (compile-funcall name args))))))
-    (t
-     (error "How should I compile this?"))))
+(defun ls-compile (sexp &optional multiple-value-p)
+  (let ((*multiple-value-p* multiple-value-p))
+    (cond
+      ((symbolp sexp)
+       (let ((b (lookup-in-lexenv sexp *environment* 'variable)))
+         (cond
+           ((and b (not (member 'special (binding-declarations b))))
+            (binding-value b))
+           ((or (keywordp sexp)
+                (member 'constant (binding-declarations b)))
+            (concat (ls-compile `',sexp) ".value"))
+           (t
+            (ls-compile `(symbol-value ',sexp))))))
+      ((integerp sexp) (integer-to-string sexp))
+      ((stringp sexp) (concat "\"" (escape-string sexp) "\""))
+      ((arrayp sexp) (literal sexp))
+      ((listp sexp)
+       (let ((name (car sexp))
+             (args (cdr sexp)))
+         (cond
+           ;; Special forms
+           ((assoc name *compilations*)
+            (let ((comp (second (assoc name *compilations*))))
+              (apply comp args)))
+           ;; Built-in functions
+           ((and (assoc name *builtins*)
+                 (not (claimp name 'function 'notinline)))
+            (let ((comp (second (assoc name *builtins*))))
+              (apply comp args)))
+           (t
+            (if (macro name)
+                (ls-compile (ls-macroexpand-1 sexp))
+                (compile-funcall name args))))))
+      (t
+       (error "How should I compile this?")))))
 
 (defun ls-compile-toplevel (sexp)
   (let ((*toplevel-compilations* nil))
@@ -2058,14 +2074,14 @@
             function functionp gensym get-universal-time go identity if in-package
             incf integerp integerp intern keywordp lambda last length let let*
             list-all-packages list listp make-array 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 progn psetq push quote remove remove-if
+            mapcar member minusp mod multiple-value-call  nil not nth nthcdr null
+            numberp or package-name package-use-list packagep plusp prin1-to-string
+            print proclaim prog1 prog2 progn psetq 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))
+            third throw truncate unless unwind-protect values values-list variable
+            warn when write-line write-string zerop))
 
   (setq *package* *user-package*)