(defmacro defvar (name value)
`(progn
- (eval-when-compile
- (%compile-defvar ',name))
(setq ,name ,value)
',name))
(defmacro defun (name args &body body)
`(progn
- (eval-when-compile
- (%compile-defun ',name))
- (fsetq ,name (named-lambda ,(symbol-name name) ,args
+ (fset ',name (named-lambda ,(symbol-name name) ,args
(block ,name ,@body)))
',name))
,value)))
(defmacro prog2 (form1 result &body body)
- `(prog1 (progn ,form1 ,result) ,@body))
+ `(prog1 (progn ,form1 ,result) ,@body)))
- )
;;; This couple of helper functions will be defined in both Common
(write-string *newline*)
x)
+ (defun warn (string)
+ (write-string "WARNING: ")
+ (write-line string))
+
(defun print (x)
(write-line (prin1-to-string x))
x))
(defun gvarname (symbol)
(concat "v" (integer-to-string (incf *variable-counter*))))
-(defun lookup-variable (symbol env)
- (or (lookup-in-lexenv symbol env 'variable)
- (lookup-in-lexenv symbol *environment* 'variable)
- (let ((name (symbol-name symbol))
- (binding (make-binding symbol 'special-variable (gvarname symbol) nil)))
- (push-to-lexenv binding *environment* 'variable)
- (push (lambda ()
- (let ((b (lookup-in-lexenv symbol *environment* 'variable)))
- (unless (binding-declared b)
- (error (concat "Undefined variable `" name "'")))))
- *compilation-unit-checks*)
- binding)))
-
-(defun lookup-variable-translation (symbol env)
- (binding-translation (lookup-variable symbol env)))
+(defun translate-variable (symbol env)
+ (binding-translation (lookup-in-lexenv symbol env 'variable)))
(defun extend-local-env (args env)
(let ((new (copy-lexenv env)))
(let ((b (make-binding symbol 'lexical-variable (gvarname symbol) t)))
(push-to-lexenv b new 'variable)))))
-(defvar *function-counter* 0)
-(defun lookup-function (symbol env)
- (or (lookup-in-lexenv symbol env 'function)
- (lookup-in-lexenv symbol *environment* 'function)
- (let ((name (symbol-name symbol))
- (binding
- (make-binding symbol
- 'function
- (concat "f" (integer-to-string (incf *function-counter*)))
- nil)))
- (push-to-lexenv binding *environment* 'function)
- (push (lambda ()
- (let ((b (lookup-in-lexenv symbol *environment* 'function)))
- (unless (binding-declared b)
- (error (concat "Undefined function `" name "'")))))
- *compilation-unit-checks*)
- binding)))
-
-(defun lookup-function-translation (symbol env)
- (binding-translation (lookup-function symbol env)))
-
;;; Toplevel compilations
(defvar *toplevel-compilations* nil)
(defun get-toplevel-compilations ()
(reverse (remove-if #'null-or-empty-p *toplevel-compilations*)))
-
-(defun %compile-defvar (name)
- (let ((b (lookup-variable name *environment*)))
- (mark-binding-as-declared b)
- (toplevel-compilation (concat "var " (binding-translation b)))))
-
-(defun %compile-defun (name)
- (let ((b (lookup-function name *environment*)))
- (mark-binding-as-declared b)
- (toplevel-compilation (concat "var " (binding-translation b)))))
-
(defun %compile-defmacro (name lambda)
(push-to-lexenv (make-binding name 'macro lambda t) *environment* 'function))
(defun ls-compile-block (sexps env)
(join-trailing
- (remove-if #'null
- (mapcar (lambda (x) (ls-compile x env)) sexps))
+ (remove-if #'null-or-empty-p
+ (mapcar (lambda (x) (ls-compile x env)) sexps))
(concat ";" *newline*)))
(defmacro define-compilation (name args &body body)
env)))
(concat "(function ("
(join (mapcar (lambda (x)
- (lookup-variable-translation x new-env))
+ (translate-variable x new-env))
(append required-arguments optional-arguments))
",")
"){" *newline*
(let ((arg (nth idx optional-and-defaults)))
(push (concat "case "
(integer-to-string (+ idx n-required-arguments)) ":" *newline*
- (lookup-variable-translation (car arg) new-env)
+ (translate-variable (car arg) new-env)
"="
(ls-compile (cadr arg) new-env)
";" *newline*)
"")
;; &rest/&body argument
(if rest-argument
- (let ((js!rest (lookup-variable-translation rest-argument new-env)))
+ (let ((js!rest (translate-variable rest-argument new-env)))
(concat "var " js!rest "= " (ls-compile nil) ";" *newline*
"for (var i = arguments.length-1; i>="
(integer-to-string (+ n-required-arguments n-optional-arguments))
"return " (ls-compile (car (last body)) new-env) ";")) *newline*
"})"))))
-(define-compilation fsetq (var val)
- (concat (lookup-function-translation var env)
- " = "
- (ls-compile val env)))
-
(define-compilation setq (var val)
- (let ((b (lookup-variable var env)))
- (ecase (binding-type b)
- (lexical-variable (concat (binding-translation b) " = " (ls-compile val env)))
- (special-variable (ls-compile `(set ',var ,val) env)))))
+ (let ((b (lookup-in-lexenv var env 'variable)))
+ (if (eq (binding-type b) 'lexical-variable)
+ (concat (binding-translation b) " = " (ls-compile val env))
+ (ls-compile `(set ',var ,val) env))))
;;; FFI Variable accessors
(define-compilation js-vref (var)
var)
+
(define-compilation js-vset (var val)
(concat "(" var " = " (ls-compile val env) ")"))
((and (listp x) (eq (car x) 'lambda))
(ls-compile x env))
((symbolp x)
- (lookup-function-translation x env))))
+ (ls-compile `(symbol-function ',x))
+ ;; TODO: Add lexical functions
+ ;;(lookup-function-translation x env)
+ )))
(define-compilation eval-when-compile (&rest body)
(eval (cons 'progn body))
(let ((new-env (extend-local-env variables env)))
(concat "(function("
(join (mapcar (lambda (x)
- (lookup-variable-translation x new-env))
+ (translate-variable x new-env))
variables)
",")
"){" *newline*
(define-builtin set (symbol value)
(concat "(" symbol ").value =" value))
+(define-builtin fset (symbol value)
+ (concat "(" symbol ").function =" value))
+
(define-builtin symbol-value (x)
- (concat "(" x ").value"))
+ (js!selfcall
+ "var symbol = " x ";" *newline*
+ "var value = symbol.value;" *newline*
+ "if (value === undefined) throw \"Variable `\" + symbol.name + \"' is unbound.\";" *newline*
+ "return value;" *newline*))
(define-builtin symbol-function (x)
- (concat "(" x ").function"))
+ (js!selfcall
+ "var symbol = " x ";" *newline*
+ "var func = symbol.function;" *newline*
+ "if (func === undefined) throw \"Function `\" + symbol.name + \"' is undefined.\";" *newline*
+ "return func;" *newline*))
(define-builtin eq (x y) (js!bool (concat "(" x " === " y ")")))
(define-builtin equal (x y) (js!bool (concat "(" x " == " y ")")))
(type-check (("x" "string" x))
"lisp.write(x)"))
-(defun macrop (x)
- (and (symbolp x) (eq (binding-type (lookup-function x *environment*)) 'macro)))
+(defun macro (x)
+ (and (symbolp x)
+ (let ((b (lookup-in-lexenv x *environment* 'function)))
+ (eq (binding-type b) 'macro)
+ b)))
-(defun ls-macroexpand-1 (form env)
- (if (macrop (car form))
- (let ((binding (lookup-function (car form) *environment*)))
- (if (eq (binding-type binding) 'macro)
- (apply (eval (binding-translation binding)) (cdr form))
- form))
- form))
+(defun ls-macroexpand-1 (form)
+ (let ((macro-binding (macro (car form))))
+ (if macro-binding
+ (apply (eval (binding-translation macro-binding)) (cdr form))
+ form)))
(defun compile-funcall (function args env)
- (cond
- ((symbolp function)
- (concat (lookup-function-translation function env)
- "("
- (join (mapcar (lambda (x) (ls-compile x env)) args)
- ", ")
- ")"))
- ((and (listp function) (eq (car function) 'lambda))
- (concat "(" (ls-compile function env) ")("
- (join (mapcar (lambda (x) (ls-compile x env)) args)
- ", ")
- ")"))
- (t
- (error (concat "Invalid function designator " (symbol-name function))))))
+ (concat (ls-compile `#',function) "("
+ (join (mapcar (lambda (x) (ls-compile x env)) args)
+ ", ")
+ ")"))
(defun ls-compile (sexp &optional (env (make-lexenv)))
(cond
((symbolp sexp)
- (let ((b (lookup-variable sexp env)))
- (ecase (binding-type b)
- (lexical-variable
- (binding-translation b))
- (special-variable
- (ls-compile `(symbol-value ',sexp) env)))))
+ (let ((b (lookup-in-lexenv sexp env 'variable)))
+ (if (eq (binding-type b) 'lexical-variable)
+ (binding-translation b)
+ (ls-compile `(symbol-value ',sexp) env))))
((integerp sexp) (integer-to-string sexp))
((stringp sexp) (concat "\"" (escape-string sexp) "\""))
((listp sexp)
(if (assoc (car sexp) *compilations*)
(let ((comp (second (assoc (car sexp) *compilations*))))
(apply comp env (cdr sexp)))
- (if (macrop (car sexp))
- (ls-compile (ls-macroexpand-1 sexp env) env)
+ (if (macro (car sexp))
+ (ls-compile (ls-macroexpand-1 sexp) env)
(compile-funcall (car sexp) (cdr sexp) env))))))
(defun ls-compile-toplevel (sexp)
*literal-symbols*)
(setq *environment* ',*environment*)
(setq *variable-counter* ,*variable-counter*)
- (setq *function-counter* ,*function-counter*)
(setq *gensym-counter* ,*gensym-counter*)
(setq *block-counter* ,*block-counter*)))))
(setq *literal-symbols* nil)
(setq *variable-counter* 0
*gensym-counter* 0
- *function-counter* 0
*literal-counter* 0
*block-counter* 0)
(ls-compile-file "ecmalisp.lisp" "ecmalisp.js")))
projects / jscl.git / blobdiff