+(defun ensure-list (x)
+ (if (listp x)
+ x
+ (list x)))
+
(defun !reduce (func list initial)
(if (null list)
initial
,@body))
(defun concat-two (s1 s2)
- (concatenate 'string s1 s2)))
+ (concatenate 'string s1 s2))
+
+ (defun setcar (cons new)
+ (setf (car cons) new))
+ (defun setcdr (cons new)
+ (setf (cdr cons) new)))
(defvar *newline* (string (code-char 10)))
(defun %read-char (stream)
(and (< (cdr stream) (length (car stream)))
(prog1 (char (car stream) (cdr stream))
- (incf (cdr stream)))))
+ (setcdr stream (1+ (cdr stream))))))
(defun whitespacep (ch)
(or (char= ch #\space) (char= ch #\newline) (char= ch #\tab)))
(let (ch)
(skip-whitespaces stream)
(setq ch (%peek-char stream))
- (while (and ch (eql ch #\;))
- (read-until stream (lambda (x) (eql x #\newline)))
+ (while (and ch (char= ch #\;))
+ (read-until stream (lambda (x) (char= x #\newline)))
(skip-whitespaces stream)
(setq ch (%peek-char stream)))))
(#\'
(list 'function (ls-read stream)))
(#\\
- (%read-char stream))
+ (let ((cname
+ (concat (string (%read-char stream))
+ (read-until stream #'terminalp))))
+ (cond
+ ((string= cname "space") (char-code #\space))
+ ((string= cname "newline") (char-code #\newline))
+ (t (char-code (char cname 0))))))
(#\+
(let ((feature (read-until stream #'terminalp)))
(cond
((string= feature "common-lisp")
- (ls-read stream);ignore
+ (ls-read stream) ;ignore
(ls-read stream))
((string= feature "lispstrack")
(ls-read stream))
(t
- (error "Unknown reader form.")))))
- ))
+ (error "Unknown reader form.")))))))
(t
(let ((string (read-until stream #'terminalp)))
(if (every #'digit-char-p string)
;;;; Compiler
+(defvar *compilation-unit-checks* '())
+
+(defparameter *env* '())
+(defparameter *fenv* '())
+
+(defun make-binding (name type js declared)
+ (list name type js declared))
+
+(defun binding-name (b) (first b))
+(defun binding-type (b) (second b))
+(defun binding-translation (b) (third b))
+(defun binding-declared (b)
+ (and b (fourth b)))
+(defun mark-binding-as-declared (b)
+ (setcar (cdddr b) t))
+
(let ((counter 0))
- (defun make-var-binding (symbol)
- (cons symbol (concat "v" (integer-to-string (incf counter))))))
+ (defun gvarname (symbol)
+ (concat "v" (integer-to-string (incf counter))))
+
+ (defun lookup-variable (symbol env)
+ (or (assoc symbol env)
+ (assoc symbol *env*)
+ (let ((name (symbol-name symbol))
+ (binding (make-binding symbol 'variable (gvarname symbol) nil)))
+ (push binding *env*)
+ (push (lambda ()
+ (unless (binding-declared (assoc symbol *env*))
+ (error (concat "Undefined variable `" name "'"))))
+ *compilation-unit-checks*)
+ binding)))
+
+ (defun lookup-variable-translation (symbol env)
+ (binding-translation (lookup-variable symbol env)))
+
+ (defun extend-local-env (args env)
+ (append (mapcar (lambda (symbol)
+ (make-binding symbol 'variable (gvarname symbol) t))
+ args)
+ env)))
(let ((counter 0))
- (defun make-func-binding (symbol)
- (cons symbol (concat "f" (integer-to-string (incf counter))))))
+ (defun lookup-function (symbol env)
+ (or (assoc symbol env)
+ (assoc symbol *fenv*)
+ (let ((name (symbol-name symbol))
+ (binding
+ (make-binding symbol
+ 'function
+ (concat "f" (integer-to-string (incf counter)))
+ nil)))
+ (push binding *fenv*)
+ (push (lambda ()
+ (unless (binding-declared (assoc symbol *fenv*))
+ (error (concat "Undefined function `" name "'"))))
+ *compilation-unit-checks*)
+ binding)))
+
+ (defun lookup-function-translation (symbol env)
+ (binding-translation (lookup-function symbol env))))
+
+
+(defvar *toplevel-compilations*)
+
+(defun %compile-defvar (name)
+ (let ((b (lookup-variable name *env*)))
+ (mark-binding-as-declared b)
+ (push (concat "var " (binding-translation b)) *toplevel-compilations*)))
+
+(defun %compile-defun (name)
+ (let ((b (lookup-function name *env*)))
+ (mark-binding-as-declared b)
+ (push (concat "var " (binding-translation b)) *toplevel-compilations*)))
+
+(defun %compile-defmacro (name lambda)
+ (push (make-binding name 'macro lambda t) *fenv*))
+
(defvar *compilations* nil)
sexps))
";
"))
-
-(defun extend-env (args env)
- (append (mapcar #'make-var-binding args) env))
-
-(defparameter *env* '())
-(defparameter *fenv* '())
-
-(defun lookup (symbol env)
- (let ((binding (assoc symbol env)))
- (and binding (cdr binding))))
-
-(defun lookup-variable (symbol env)
- (or (lookup symbol env)
- (lookup symbol *env*)
- (error "Undefined variable `~a'" symbol)))
-
-(defun lookup-function (symbol env)
- (or (lookup symbol env)
- (lookup symbol *fenv*)
- (error "Undefined function `~a'" symbol)))
-
(defmacro define-compilation (name args &body body)
;; Creates a new primitive `name' with parameters args and
;; @body. The body can access to the local environment through the
`(push (list ',name (lambda (env fenv ,@args) ,@body))
*compilations*))
-(defvar *toplevel-compilations*)
-
(define-compilation if (condition true false)
(concat "("
(ls-compile condition env fenv)
(define-compilation lambda (lambda-list &rest body)
(let ((required-arguments (lambda-list-required-argument lambda-list))
(rest-argument (lambda-list-rest-argument lambda-list)))
- (let ((new-env (extend-env (append (if rest-argument (list rest-argument))
- required-arguments)
- env)))
+ (let ((new-env (extend-local-env
+ (append (if rest-argument (list rest-argument))
+ required-arguments)
+ env)))
(concat "(function ("
- (join (mapcar (lambda (x) (lookup-variable x new-env))
+ (join (mapcar (lambda (x)
+ (lookup-variable-translation x new-env))
required-arguments)
",")
"){"
*newline*
(if rest-argument
- (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*)
+ (let ((js!rest (lookup-variable-translation rest-argument new-env)))
+ (concat "var " js!rest ";" *newline*
+ "for (var i = arguments.length-1; i>="
+ (integer-to-string (length required-arguments))
+ "; i--)" *newline*
+ js!rest " = "
+ "{car: arguments[i], cdr: " js!rest "};"
+ *newline*))
"")
(concat (ls-compile-block (butlast body) new-env fenv)
"return " (ls-compile (car (last body)) new-env fenv) ";")
"})"))))
(define-compilation fsetq (var val)
- (concat (lookup-function var fenv)
+ (concat (lookup-function-translation var fenv)
" = "
(ls-compile val env fenv)))
(define-compilation setq (var val)
- (concat (lookup-variable var env)
+ (concat (lookup-variable-translation var env)
" = "
(ls-compile val env fenv)))
-
;;; Literals
(defun literal->js (sexp)
(cond
- ((null sexp) "undefined")
+ ((null sexp) "false")
((integerp sexp) (integer-to-string sexp))
((stringp sexp) (concat "\"" sexp "\""))
((symbolp sexp) (concat "{name: \"" (symbol-name sexp) "\"}"))
((and (listp x) (eq (car x) 'lambda))
(ls-compile x env fenv))
((symbolp x)
- (lookup-function x fenv))))
+ (lookup-function-translation x fenv))))
#+common-lisp
(defmacro eval-when-compile (&body body)
`((lambda () ,@body)))
(define-transformation let (bindings &rest body)
- `((lambda ,(mapcar 'car bindings) ,@body)
- ,@(mapcar 'cadr bindings)))
+ (let ((bindings (mapcar #'ensure-list bindings)))
+ `((lambda ,(mapcar 'car bindings) ,@body)
+ ,@(mapcar 'cadr bindings))))
;;; A little backquote implementation without optimizations of any
;;; kind for lispstrack.
(concat "(Math.floor(" (ls-compile x env fenv) "))"))
(define-compilation null (x)
- (concat "(" (ls-compile x env fenv) "== undefined)"))
+ (concat "(" (ls-compile x env fenv) "== false)"))
(define-compilation cons (x y)
(concat "{car: " (ls-compile x env fenv) ", cdr: " (ls-compile y env fenv) "}"))
(define-compilation cdr (x)
(concat "(" (ls-compile x env fenv) ").cdr"))
+(define-compilation setcar (x new)
+ (concat "((" (ls-compile x env fenv) ").car = " (ls-compile new env fenv) ")"))
+
+(define-compilation setcdr (x new)
+ (concat "((" (ls-compile x env fenv) ").cdr = " (ls-compile new env fenv) ")"))
+
(define-compilation make-symbol (name)
(concat "{name: " (ls-compile name env fenv) "}"))
(define-compilation string (x)
(concat "String.fromCharCode(" (ls-compile x env fenv) ")"))
+(define-compilation string-upcase (x)
+ (concat "(" (ls-compile x env fenv) ").toUpperCase()"))
+
(define-compilation char (string index)
(concat "("
(ls-compile string env fenv)
", ")
")"))
+(define-compilation error (string)
+ (concat "console.error(" (ls-compile string env fenv) ")"))
+
(define-compilation new ()
"{}")
(ls-compile key env fenv) "]"
" = " (ls-compile value env fenv) ")"))
-
-(defun %compile-defvar (name)
- (unless (lookup name *env*)
- (push (make-var-binding name) *env*)
- (push (concat "var " (lookup-variable name *env*)) *toplevel-compilations*)))
-
-(defun %compile-defun (name)
- (unless (lookup name *fenv*)
- (push (make-func-binding name) *fenv*)
- (push (concat "var " (lookup-variable name *fenv*)) *toplevel-compilations*)))
-
-(defun %compile-defmacro (name lambda)
- (push (cons name (cons 'macro lambda)) *fenv*))
+(defun macrop (x)
+ (and (symbolp x) (eq (binding-type (lookup-function x *fenv*)) 'macro)))
(defun ls-macroexpand-1 (form &optional env fenv)
- (let ((function (cdr (assoc (car form) *fenv*))))
- (if (and (listp function) (eq (car function) 'macro))
- (apply (eval (cdr function)) (cdr form))
- form)))
+ (when (macrop (car form))
+ (let ((binding (lookup-function (car form) *env*)))
+ (if (eq (binding-type binding) 'macro)
+ (apply (eval (binding-translation binding)) (cdr form))
+ form))))
(defun compile-funcall (function args env fenv)
(cond
((symbolp function)
- (concat (lookup-function function fenv)
+ (concat (lookup-function-translation function fenv)
"("
(join (mapcar (lambda (x) (ls-compile x env fenv)) args)
", ")
(defun ls-compile (sexp &optional env fenv)
(cond
- ((symbolp sexp) (lookup-variable sexp env))
+ ((symbolp sexp) (lookup-variable-translation sexp env))
((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*))))
- (if compiler-func
- (apply compiler-func env fenv (cdr sexp))
- (compile-funcall (car sexp) (cdr sexp) env fenv)))))))
+ (if (assoc (car sexp) *compilations*)
+ (let ((comp (second (assoc (car sexp) *compilations*))))
+ (apply comp env fenv (cdr sexp)))
+ (if (macrop (car sexp))
+ (ls-compile (ls-macroexpand-1 sexp env fenv) env fenv)
+ (compile-funcall (car sexp) (cdr sexp) env fenv))))))
(defun ls-compile-toplevel (sexp)
(setq *toplevel-compilations* nil)
#+common-lisp
(progn
-
(defun read-whole-file (filename)
(with-open-file (in filename)
(let ((seq (make-array (file-length in) :element-type 'character)))
until (eq x *eof*)
for compilation = (ls-compile-toplevel x)
when (plusp (length compilation))
- do (write-line (concat compilation "; ") out)))))
+ do (write-line (concat compilation "; ") out))
+ (dolist (check *compilation-unit-checks*)
+ (funcall check)))))
(defun bootstrap ()
(ls-compile-file "lispstrack.lisp" "lispstrack.js")))
projects / jscl.git / blobdiff