X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=lispstrack.lisp;h=e8ecb3f6e991cc448b3f8b5b53296a0d20a41fdc;hb=23bcad1a24d7d46fb2896705cb2a3361eeeb2e0b;hp=8481fb74c29219e0013db14479dd49b5a4a70df9;hpb=623000fd16dc784cb9e6b5e264f1fbd6eb455d5f;p=jscl.git

diff --git a/lispstrack.lisp b/lispstrack.lisp
index 8481fb7..e8ecb3f 100644
--- a/lispstrack.lisp
+++ b/lispstrack.lisp
@@ -1,55 +1,3 @@
-#+lispstrack
-(progn
-  (eval-when-compile
-    (%compile-defmacro 'defmacro
-                       (lambda (name args &rest body)
-                         `(eval-when-compile
-                            (%compile-defmacro ',name (lambda ,args ,@body))))))
-
-  (defmacro defvar (name value)
-    `(progn
-       (eval-when-compile
-         (%compile-defvar ',name))
-       (setq ,name ,value)))
-
-  (defmacro defun (name args &rest body)
-    `(progn
-       (eval-when-compile
-         (%compile-defun ',name))
-       (fsetq ,name (lambda ,args ,@body))))
-
-  (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))
-  (defun 1- (x) (- x 1))
-  (defun cons (x y ) (cons x y))
-  (defun car (x) (car x))
-  (defun cdr (x) (cdr x))
-
-  (defun append (list1 list2)
-    (if (null list1)
-        list2
-        (cons (car list1)
-              (append (cdr list1) list2))))
-
-  (defun reverse-aux (list acc)
-    (if (null list)
-        acc
-        (reverse-aux (cdr list) (cons (car list) acc))))
-
-  (defun reverse (list)
-    (reverse-aux list '()))
-
-  (defun mapcar (func list)
-    (if (null list)
-        '()
-        (cons (funcall func (car list))
-              (mapcar func (cdr list))))))
-
-
 (defun !reduce (func list initial)
   (if (null list)
       initial
@@ -60,17 +8,20 @@
 ;;; Utils
 
 #+common-lisp
-(defmacro while (condition &body body)
-  `(do ()
-       ((not ,condition))
-     ,@body))
+(progn
+  (defmacro while (condition &body body)
+    `(do ()
+         ((not ,condition))
+       ,@body))
+
+  (defun concat-two (s1 s2)
+    (concatenate 'string s1 s2)))
 
 (defvar *newline* "
 ")
 
-;;; simplify me, please
 (defun concat (&rest strs)
-  (!reduce (lambda (s1 s2) (concatenate 'string s1 s2))
+  (!reduce (lambda (s1 s2) (concat-two s1 s2))
            strs
            ""))
 
@@ -299,10 +250,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)
@@ -445,18 +398,32 @@
 (define-compilation cdr (x)
   (concat "(" (ls-compile x env fenv) ").cdr"))
 
+(define-compilation make-symbol (name)
+  (concat "{name: " (ls-compile name env fenv) "}"))
+
 (define-compilation symbol-name (x)
   (concat "(" (ls-compile x env fenv) ").name"))
 
 (define-compilation eq (x y)
   (concat "(" (ls-compile x env fenv) " === " (ls-compile y env fenv) ")"))
 
-(define-compilation eql (x y)
-  (concat "(" (ls-compile x env fenv) " == " (ls-compile y env fenv) ")"))
-
 (define-compilation code-char (x)
   (concat "String.fromCharCode( " (ls-compile x env fenv) ")"))
 
+(define-compilation char (string index)
+  (concat "("
+          (ls-compile string env fenv)
+          ").charCodeAt("
+          (ls-compile index env fenv)
+          ")"))
+
+(define-compilation concat-two (string1 string2)
+  (concat "("
+          (ls-compile string1 env fenv)
+          ").concat("
+          (ls-compile string2 env fenv)
+          ")"))
+
 (define-compilation funcall (func &rest args)
   (concat "("
           (ls-compile func env fenv)
@@ -467,6 +434,20 @@
                 ", ")
           ")"))
 
+(define-compilation new ()
+  "{}")
+
+(define-compilation get (object key)
+  (concat "(" (ls-compile object env fenv) ")[" (ls-compile key env fenv) "]"))
+
+(define-compilation set (object key value)
+  (concat "(("
+          (ls-compile object env fenv)
+          ")["
+          (ls-compile key env fenv) "]"
+          " = " (ls-compile value env fenv) ")"))
+
+
 (defun %compile-defvar (name)
   (push (make-var-binding name) *env*)
   (push (concat "var " (lookup-variable name *env*)) *toplevel-compilations*))
@@ -523,15 +504,14 @@
       (setq *toplevel-compilations* nil))))
 
 #+common-lisp
-(defun ls-compile-file (filename output)
-  (with-open-file (in filename)
-    (with-open-file (out output :direction :output :if-exists :supersede)
-      (loop
-         for x = (ls-read in)
-         until (eq x *eof*)
-         for compilation = (ls-compile-toplevel x)
-         when compilation do (write-line (concat compilation "; ") out)))))
-
-;;; Testing
-(defun compile-test ()
-  (ls-compile-file "test.lisp" "test.js"))
+(progn
+  (defun ls-compile-file (filename output)
+    (with-open-file (in filename)
+      (with-open-file (out output :direction :output :if-exists :supersede)
+        (loop
+           for x = (ls-read in)
+           until (eq x *eof*)
+           for compilation = (ls-compile-toplevel x)
+           when compilation do (write-line (concat compilation "; ") out)))))
+  (defun bootstrap ()
+    (ls-compile-file "lispstrack.lisp" "lispstrack.js")))