X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=lispstrack.lisp;h=f3f01dfe3debaea3b3c7c8697bbcf7f7244c0c91;hb=0ef25ffae5dd2d182bc69daa9dc41bfec53d7729;hp=4aa57bc815f6c2a930b7657c7fa0f9aa795d0f83;hpb=d0b80709a9000bc3208c806b7f57c727b3610d22;p=jscl.git

diff --git a/lispstrack.lisp b/lispstrack.lisp
index 4aa57bc..f3f01df 100644
--- a/lispstrack.lisp
+++ b/lispstrack.lisp
@@ -1,16 +1,85 @@
+#+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)))))
+
+  (defmacro push (x place)
+    `(setq ,place (cons ,x ,place))))
+
+
+(defun !reduce (func list initial)
+  (if (null list)
+      initial
+      (!reduce func
+               (cdr list)
+               (funcall func initial (car list)))))
+
 ;;; Utils
 
 #+common-lisp
-(defmacro while (condition &body body)
-  `(do ()
-       ((not ,condition))
-     ,@body))
+(progn
+  (defmacro while (condition &body body)
+    `(do ()
+         ((not ,condition))
+       ,@body))
+
+  #+common-lisp
+  (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))
-          strs
-          :initial-value ""))
+  (!reduce (lambda (s1 s2) (concat-two s1 s2))
+           strs
+           ""))
 
 ;;; Concatenate a list of strings, with a separator
 (defun join (list separator)
@@ -24,6 +93,11 @@
              separator
              (join (cdr list) separator)))))
 
+(defun join-trailing (list separator)
+  (if (null list)
+      ""
+      (concat (car list) separator (join-trailing (cdr list) separator))))
+
 (defun integer-to-string (x)
   (if (zerop x)
       "0"
@@ -168,11 +242,11 @@
 (defvar *compilations* nil)
 
 (defun ls-compile-block (sexps env fenv)
-  (concat (join (mapcar (lambda (x)
-                          (concat (ls-compile x env fenv) ";"))
-                        sexps)
-                ";
-")))
+  (join-trailing (mapcar (lambda (x)
+                           (ls-compile x env fenv))
+                         sexps)
+                 ";
+"))
 
 (defun extend-env (args env)
   (append (mapcar #'make-var-binding args) env))
@@ -229,19 +303,21 @@
               (join (mapcar (lambda (x) (lookup-variable x new-env))
                             required-arguments)
                     ",")
-              "){
-"
+              "){"
+              *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)
                       "return " (ls-compile (car (last body)) new-env fenv) ";")
-              "
-})"))))
+              *newline*
+              "})"))))
 
 (define-compilation fsetq (var val)
   (concat (lookup-function var fenv)
@@ -293,6 +369,7 @@
     ((symbolp x)
      (lookup-function x fenv))))
 
+#+common-lisp
 (defmacro eval-when-compile (&body body)
   `(eval-when (:compile-toplevel :execute)
      ,@body))
@@ -342,6 +419,9 @@
       (backquote-expand-1 (cadr form))
       form))
 
+(defmacro backquote (form)
+  (backquote-expand-1 form))
+
 (define-transformation backquote (form)
   (backquote-expand-1 form))
 
@@ -362,6 +442,9 @@
 (define-compilation = (x y)
   (concat "((" (ls-compile x env fenv) ") == (" (ls-compile y env fenv) "))"))
 
+(define-compilation null (x)
+  (concat "(" (ls-compile x env fenv) "== undefined)"))
+
 (define-compilation cons (x y)
   (concat "{car: " (ls-compile x env fenv) ", cdr: " (ls-compile y env fenv) "}"))
 
@@ -377,9 +460,36 @@
 (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)
+          ")("
+          (join (mapcar (lambda (x)
+                          (ls-compile x env fenv))
+                        args)
+                ", ")
+          ")"))
+
 (defun %compile-defvar (name)
   (push (make-var-binding name) *env*)
   (push (concat "var " (lookup-variable name *env*)) *toplevel-compilations*))
@@ -429,23 +539,21 @@
   (setq *toplevel-compilations* nil)
   (let ((code (ls-compile sexp)))
     (prog1
-        (concat (join (mapcar (lambda (x)(concat x ";
-"))
+        (concat (join (mapcar (lambda (x) (concat x ";" *newline*))
                               *toplevel-compilations*)
                       "")
                 code)
       (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")))