X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=lispstrack.lisp;h=f3f01dfe3debaea3b3c7c8697bbcf7f7244c0c91;hb=0ef25ffae5dd2d182bc69daa9dc41bfec53d7729;hp=d6c850df67bf8abb21d318e45c6bdc517489038a;hpb=1f4ae1183098cb793ad02b8aa08301f59488d28a;p=jscl.git diff --git a/lispstrack.lisp b/lispstrack.lisp index d6c850d..f3f01df 100644 --- a/lispstrack.lisp +++ b/lispstrack.lisp @@ -25,7 +25,7 @@ (defun / (x y) (/ x y)) (defun 1+ (x) (+ x 1)) (defun 1- (x) (- x 1)) - (defun cons (x y ) (cons x y)) + (defun cons (x y) (cons x y)) (defun car (x) (car x)) (defun cdr (x) (cdr x)) @@ -47,7 +47,10 @@ (if (null list) '() (cons (funcall func (car list)) - (mapcar func (cdr list)))))) + (mapcar func (cdr list))))) + + (defmacro push (x place) + `(setq ,place (cons ,x ,place)))) (defun !reduce (func list initial) @@ -61,7 +64,6 @@ #+common-lisp (progn - (defmacro while (condition &body body) `(do () ((not ,condition)) @@ -304,10 +306,12 @@ "){" *newline* (if rest-argument - (concat "var " (lookup-variable rest-argument new-env) - " = arguments.slice(" - (prin1-to-string (length required-arguments)) - ");" + (concat "var " (lookup-variable rest-argument new-env) ";" *newline* + "for (var i = arguments.length-1; i>=" + (integer-to-string (length required-arguments)) + "; i--)" *newline* + (lookup-variable rest-argument new-env) " = " + "{car: arguments[i], cdr: " (lookup-variable rest-argument new-env) "};" *newline*) "") (concat (ls-compile-block (butlast body) new-env fenv)