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

diff --git a/lispstrack.lisp b/lispstrack.lisp
index f026618..e8ecb3f 100644
--- a/lispstrack.lisp
+++ b/lispstrack.lisp
@@ -1,15 +1,29 @@
+(defun !reduce (func list initial)
+  (if (null list)
+      initial
+      (!reduce func
+               (cdr list)
+               (funcall func initial (car list)))))
+
 ;;; Utils
 
-(defmacro while (condition &body body)
-  `(do ()
-       ((not ,condition))
-     ,@body))
+#+common-lisp
+(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))
-          strs
-          :initial-value ""))
+  (!reduce (lambda (s1 s2) (concat-two s1 s2))
+           strs
+           ""))
 
 ;;; Concatenate a list of strings, with a separator
 (defun join (list separator)
@@ -23,6 +37,22 @@
              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"
+      (let ((digits nil))
+        (while (not (= x 0))
+          (push (mod x 10) digits)
+          (setq x (truncate x 10)))
+        (join (mapcar (lambda (d) (string (char "0123456789" d)))
+                      digits)
+              ""))))
+
 ;;;; Reader
 
 ;;; It is a basic Lisp reader. It does not use advanced stuff
@@ -49,19 +79,23 @@
   (or (char= ch #\space) (char= ch #\newline) (char= ch #\tab)))
 
 (defun skip-whitespaces (stream)
-  (loop for ch = (%peek-char stream)
-     while (and ch (whitespacep ch))
-     do (%read-char stream)))
+  (let (ch)
+    (setq ch (%peek-char stream))
+    (while (and ch (whitespacep ch))
+      (%read-char stream)
+      (setq ch (%peek-char stream)))))
 
 (defun terminalp (ch)
-  (or (null ch) (whitespacep ch) (char= #\) ch)))
+  (or (null ch) (whitespacep ch) (char= #\) ch) (char= #\( ch)))
 
 (defun read-until (stream func)
-  (let ((string ""))
-    (loop for ch = (%peek-char stream)
-       until (funcall func ch)
-       do (setq string (concat string (string ch)))
-       do (%read-char stream))
+  (let ((string "")
+        (ch))
+    (setq ch (%peek-char stream))
+    (while (not (funcall func ch))
+      (setq string (concat string (string ch)))
+      (%read-char stream)
+      (setq ch (%peek-char stream)))
     string))
 
 (defun skip-whitespaces-and-comments (stream)
@@ -118,7 +152,17 @@
        (%read-char stream)
        (ecase (%read-char stream)
          (#\'
-          (list 'function (ls-read stream)))))
+          (list 'function (ls-read stream)))
+         (#\+
+          (let ((feature (read-until stream #'terminalp)))
+            (cond
+              ((string= feature "common-lisp")
+               (ls-read stream);ignore
+               (ls-read stream))
+              ((string= feature "lispstrack")
+               (ls-read stream))
+              (t
+               (error "Unknown reader form.")))))))
       (t
        (let ((string (read-until stream #'terminalp)))
          (if (every #'digit-char-p string)
@@ -133,20 +177,20 @@
 
 (let ((counter 0))
   (defun make-var-binding (symbol)
-    (cons symbol (format nil "v~d" (incf counter)))))
+    (cons symbol (concat "v" (integer-to-string (incf counter))))))
 
 (let ((counter 0))
   (defun make-func-binding (symbol)
-    (cons symbol (format nil "f~d" (incf counter)))))
+    (cons symbol (concat "f" (integer-to-string (incf counter))))))
 
 (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))
@@ -156,7 +200,7 @@
 
 (defun ls-lookup (symbol env)
   (let ((binding (assoc symbol env)))
-    (and binding (format nil "~a" (cdr binding)))))
+    (and binding (cdr binding))))
 
 (defun lookup-variable (symbol env)
   (or (ls-lookup symbol env)
@@ -175,11 +219,16 @@
   `(push (list ',name (lambda (env fenv ,@args) ,@body))
          *compilations*))
 
+(defvar *toplevel-compilations*)
+
 (define-compilation if (condition true false)
-  (format nil "((~a)? (~a) : (~a))"
+  (concat "("
           (ls-compile condition env fenv)
+          " ? "
           (ls-compile true env fenv)
-          (ls-compile false env fenv)))
+          " : "
+          (ls-compile false env fenv)
+          ")"))
 
 ;;; Return the required args of a lambda list
 (defun lambda-list-required-argument (lambda-list)
@@ -198,37 +247,41 @@
               (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)
-  (format nil "~a = ~a" (lookup-function var fenv) (ls-compile val env fenv)))
+  (concat (lookup-function var fenv)
+          " = "
+          (ls-compile val env fenv)))
 
 (define-compilation setq (var val)
-  (format nil "~a = ~a" (lookup-variable var env) (ls-compile val env fenv)))
+  (concat (lookup-variable var env)
+          " = "
+           (ls-compile val env fenv)))
 
 
 ;;; Literals
 
-(defvar *literals* '())
-
 (defun literal->js (sexp)
   (cond
     ((null sexp) "undefined")
-    ((integerp sexp) (format nil "~a" sexp))
-    ((stringp sexp) (format nil "\"~a\"" sexp))
-    ((symbolp sexp) (format nil "{name: \"~a\"}" (symbol-name sexp)))
+    ((integerp sexp) (integer-to-string sexp))
+    ((stringp sexp) (concat "\"" sexp "\""))
+    ((symbolp sexp) (concat "{name: \"" (symbol-name sexp) "\"}"))
     ((consp sexp) (concat "{car: "
                           (literal->js (car sexp))
                           ", cdr: "
@@ -236,20 +289,22 @@
 
 (let ((counter 0))
   (defun literal (form)
-    (let ((var (format nil "l~d" (incf counter))))
-      (push (cons var (literal->js form)) *literals*)
+    (let ((var (concat "l" (integer-to-string (incf counter)))))
+      (push (concat "var " var " = " (literal->js form)) *toplevel-compilations*)
       var)))
 
 (define-compilation quote (sexp)
   (literal sexp))
 
 (define-compilation debug (form)
-  (format nil "console.log(~a)" (ls-compile form env fenv)))
+  (concat "console.log(" (ls-compile form env fenv) ")"))
 
 (define-compilation while (pred &rest body)
-  (format nil "(function(){while(~a){~a}})() "
-	  (ls-compile pred env fenv)
-	  (ls-compile-block body env fenv)))
+  (concat "(function(){ while("
+          (ls-compile pred env fenv)
+          "){"
+          (ls-compile-block body env fenv)
+          "}})()"))
 
 (define-compilation function (x)
   (cond
@@ -258,17 +313,15 @@
     ((symbolp x)
      (lookup-function x fenv))))
 
+#+common-lisp
 (defmacro eval-when-compile (&body body)
   `(eval-when (:compile-toplevel :execute)
      ,@body))
 
 (defvar *eval-when-compilations*)
 (define-compilation eval-when-compile (&rest body)
-  (setq *eval-when-compilations* "")
   (eval (cons 'progn body))
-  (if (string= *eval-when-compilations* "")
-      nil
-      *eval-when-compilations*))
+  nil)
 
 (defmacro define-transformation (name args form)
   `(define-compilation ,name ,args
@@ -310,27 +363,8 @@
       (backquote-expand-1 (cadr form))
       form))
 
-;;; Some Tests comparing backquote agains the backquote of the host
-;;; Lisp. It is not very exhaustive, but we just want a working
-;;; backquotation to be able bootstrap this program.
-(macrolet ((test (form1 form2)
-             `(assert (equal ,form1 ,form2))))
-  (test (backquote (1 2 3 4))
-        `(1 2 3 4))
-  (test (backquote (1 2 (+ 3 4)))
-        `(1 2 (+ 3 4)))
-  (test (backquote (1 2 (unquote (+ 3 4))))
-        `(1 2 ,(+ 3 4)))
-  (test (backquote (1 2 (unquote-splicing '(3 4))))
-        `(1 2 ,@'(3 4)))
-  (test (backquote (backquote x))
-        ``x)
-  (let ((x 10))
-    (test `',x
-          (backquote (quote (unquote x)))))
-  (let ((x 10))
-    (test (eval ``(,,x))
-          (eval (backquote (backquote ((unquote (unquote x)))))))))
+(defmacro backquote (form)
+  (backquote-expand-1 form))
 
 (define-transformation backquote (form)
   (backquote-expand-1 form))
@@ -352,6 +386,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) "}"))
 
@@ -361,27 +398,63 @@
 (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 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)
+                ", ")
+          ")"))
+
+(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) ")"))
 
 
-(defmacro with-eval-when-compilation (&body body)
-  `(setq *eval-when-compilations*
-         (concat *eval-when-compilations* (progn ,@body))))
-
 (defun %compile-defvar (name)
   (push (make-var-binding name) *env*)
-  (with-eval-when-compilation
-    (format nil "var ~a" (lookup-variable name *env*))))
+  (push (concat "var " (lookup-variable name *env*)) *toplevel-compilations*))
 
 (defun %compile-defun (name)
   (push (make-func-binding name) *fenv*)
-  (with-eval-when-compilation
-    (format nil "var ~a" (lookup-variable name *fenv*))))
+  (push (concat "var " (lookup-variable name *fenv*)) *toplevel-compilations*))
 
 (defun %compile-defmacro (name lambda)
   (push (cons name (cons 'macro lambda)) *fenv*))
@@ -395,21 +468,24 @@
 (defun compile-funcall (function args env fenv)
   (cond
     ((symbolp function)
-     (format nil "~a(~{~a~^, ~})"
-             (lookup-function function fenv)
-             (mapcar (lambda (x) (ls-compile x env fenv)) args)))
+     (concat (lookup-function function fenv)
+             "("
+             (join (mapcar (lambda (x) (ls-compile x env fenv)) args)
+                   ", ")
+             ")"))
     ((and (listp function) (eq (car function) 'lambda))
-     (format nil "(~a)(~{~a~^, ~})"
-             (ls-compile function env fenv)
-             (mapcar (lambda (x) (ls-compile x env fenv)) args)))
+     (concat "(" (ls-compile function env fenv) ")("
+             (join (mapcar (lambda (x) (ls-compile x env fenv)) args)
+                   ", ")
+             ")"))
     (t
      (error "Invalid function designator ~a." function))))
 
 (defun ls-compile (sexp &optional env fenv)
   (cond
     ((symbolp sexp) (lookup-variable sexp env))
-    ((integerp sexp) (format nil "~a" sexp))
-    ((stringp sexp) (format nil "\"~a\"" sexp))
+    ((integerp sexp) (integer-to-string sexp))
+    ((stringp sexp) (concat "\"" sexp "\""))
     ((listp sexp)
      (let ((sexp (ls-macroexpand-1 sexp env fenv)))
        (let ((compiler-func (second (assoc (car sexp) *compilations*))))
@@ -418,27 +494,24 @@
              (compile-funcall (car sexp) (cdr sexp) env fenv)))))))
 
 (defun ls-compile-toplevel (sexp)
-  (setq *literals* nil)
+  (setq *toplevel-compilations* nil)
   (let ((code (ls-compile sexp)))
     (prog1
-        (concat (join (mapcar (lambda (lit)
-                                (concat "var " (car lit) " = " (cdr lit) ";
-"))
-                              *literals*)
+        (concat (join (mapcar (lambda (x) (concat x ";" *newline*))
+                              *toplevel-compilations*)
                       "")
                 code)
-      (setq *literals* nil))))
-
-(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"))
+      (setq *toplevel-compilations* nil))))
+
+#+common-lisp
+(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")))