X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcompiler.lisp;h=5dd008450f4cee085234367a209f1b967d2b55cb;hb=928c6f695253c9f03ff440d18338efb8eea9b2f0;hp=4914c9d2a46cad3349d4fe24873b35d74e23fe42;hpb=7c2abe8024928a07577fefc447238388de6cdfa4;p=jscl.git
diff --git a/src/compiler.lisp b/src/compiler.lisp
index 4914c9d..5dd0084 100644
--- a/src/compiler.lisp
+++ b/src/compiler.lisp
@@ -1,20 +1,20 @@
-;;; compiler.lisp ---
+;;; compiler.lisp ---
;; copyright (C) 2012, 2013 David Vazquez
;; Copyright (C) 2012 Raimon Grau
-;; This program is free software: you can redistribute it and/or
+;; JSCL is free software: you can redistribute it and/or
;; modify it under the terms of the GNU General Public License as
;; published by the Free Software Foundation, either version 3 of the
;; License, or (at your option) any later version.
;;
-;; This program is distributed in the hope that it will be useful, but
+;; JSCL is distributed in the hope that it will be useful, but
;; WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
;; General Public License for more details.
;;
;; You should have received a copy of the GNU General Public License
-;; along with this program. If not, see .
+;; along with JSCL. If not, see .
;;;; Compiler
@@ -30,7 +30,7 @@
((integerp arg) (integer-to-string arg))
((floatp arg) (float-to-string arg))
((stringp arg) arg)
- (t (error "Unknown argument."))))
+ (t (error "Unknown argument `~S'." arg))))
args))
;;; Wrap X with a Javascript code to convert the result from
@@ -68,7 +68,7 @@
(incf index))
output)))
-#+common-lisp
+#-jscl
(defun indent (&rest string)
(with-output-to-string (*standard-output*)
(with-input-from-string (input (apply #'code string))
@@ -87,62 +87,6 @@
;;; function call.
(defvar *multiple-value-p* nil)
-;; A very simple defstruct built on lists. It supports just slot with
-;; an optional default initform, and it will create a constructor,
-;; predicate and accessors for you.
-(defmacro def!struct (name &rest slots)
- (unless (symbolp name)
- (error "It is not a full defstruct implementation."))
- (let* ((name-string (symbol-name name))
- (slot-descriptions
- (mapcar (lambda (sd)
- (cond
- ((symbolp sd)
- (list sd))
- ((and (listp sd) (car sd) (cddr sd))
- sd)
- (t
- (error "Bad slot accessor."))))
- slots))
- (predicate (intern (concat name-string "-P"))))
- `(progn
- ;; Constructor
- (defun ,(intern (concat "MAKE-" name-string)) (&key ,@slot-descriptions)
- (list ',name ,@(mapcar #'car slot-descriptions)))
- ;; Predicate
- (defun ,predicate (x)
- (and (consp x) (eq (car x) ',name)))
- ;; Copier
- (defun ,(intern (concat "COPY-" name-string)) (x)
- (copy-list x))
- ;; Slot accessors
- ,@(with-collect
- (let ((index 1))
- (dolist (slot slot-descriptions)
- (let* ((name (car slot))
- (accessor-name (intern (concat name-string "-" (string name)))))
- (collect
- `(defun ,accessor-name (x)
- (unless (,predicate x)
- (error ,(concat "The object is not a type " name-string)))
- (nth ,index x)))
- ;; TODO: Implement this with a higher level
- ;; abstraction like defsetf or (defun (setf ..))
- (collect
- `(define-setf-expander ,accessor-name (x)
- (let ((object (gensym))
- (new-value (gensym)))
- (values (list object)
- (list x)
- (list new-value)
- `(progn
- (rplaca (nthcdr ,',index ,object) ,new-value)
- ,new-value)
- `(,',accessor-name ,object)))))
- (incf index)))))
- ',name)))
-
-
;;; Environment
(def!struct binding
@@ -183,6 +127,7 @@
(defvar *variable-counter* 0)
(defun gvarname (symbol)
+ (declare (ignore symbol))
(code "v" (incf *variable-counter*)))
(defun translate-variable (symbol)
@@ -290,7 +235,7 @@
(defun ll-rest-argument (ll)
(let ((rest (ll-section '&rest ll)))
(when (cdr rest)
- (error "Bad lambda-list"))
+ (error "Bad lambda-list `~S'." ll))
(car rest)))
(defun ll-keyword-arguments-canonical (ll)
@@ -331,32 +276,25 @@
(n-required-arguments n-optional-arguments rest-p)
;; Note: Remember that we assume that the number of arguments of a
;; call is at least 1 (the values argument).
- (let ((min (1+ n-required-arguments))
- (max (if rest-p 'n/a (+ 1 n-required-arguments n-optional-arguments))))
+ (let ((min n-required-arguments)
+ (max (if rest-p 'n/a (+ n-required-arguments n-optional-arguments))))
(block nil
;; Special case: a positive exact number of arguments.
- (when (and (< 1 min) (eql min max))
- (return (code "checkArgs(arguments, " min ");" *newline*)))
+ (when (and (< 0 min) (eql min max))
+ (return (code "checkArgs(nargs, " min ");" *newline*)))
;; General case:
(code
- (when (< 1 min)
- (code "checkArgsAtLeast(arguments, " min ");" *newline*))
+ (when (< 0 min)
+ (code "checkArgsAtLeast(nargs, " min ");" *newline*))
(when (numberp max)
- (code "checkArgsAtMost(arguments, " max ");" *newline*))))))
+ (code "checkArgsAtMost(nargs, " max ");" *newline*))))))
(defun compile-lambda-optional (ll)
(let* ((optional-arguments (ll-optional-arguments-canonical ll))
(n-required-arguments (length (ll-required-arguments ll)))
(n-optional-arguments (length optional-arguments)))
(when optional-arguments
- (code (mapconcat (lambda (arg)
- (code "var " (translate-variable (first arg)) "; " *newline*
- (when (third arg)
- (code "var " (translate-variable (third arg))
- " = " (ls-compile t)
- "; " *newline*))))
- optional-arguments)
- "switch(arguments.length-1){" *newline*
+ (code "switch(nargs){" *newline*
(let ((cases nil)
(idx 0))
(progn
@@ -384,11 +322,9 @@
(when rest-argument
(let ((js!rest (translate-variable rest-argument)))
(code "var " js!rest "= " (ls-compile nil) ";" *newline*
- "for (var i = arguments.length-1; i>="
- (+ 1 n-required-arguments n-optional-arguments)
+ "for (var i = nargs-1; i>=" (+ n-required-arguments n-optional-arguments)
"; i--)" *newline*
- (indent js!rest " = {car: arguments[i], cdr: ") js!rest "};"
- *newline*)))))
+ (indent js!rest " = {car: arguments[i+2], cdr: " js!rest "};" *newline*))))))
(defun compile-lambda-parse-keywords (ll)
(let ((n-required-arguments
@@ -410,12 +346,12 @@
;; Parse keywords
(flet ((parse-keyword (keyarg)
;; ((keyword-name var) init-form)
- (code "for (i=" (+ 1 n-required-arguments n-optional-arguments)
- "; i= ">=")
(define-builtin-comparison <= "<=")
(define-builtin-comparison = "==")
+(define-builtin-comparison /= "!=")
(define-builtin numberp (x)
(js!bool (code "(typeof (" x ") == \"number\")")))
@@ -1377,7 +1340,7 @@
(define-builtin float-to-string (x)
(type-check (("x" "number" x))
- "x.toString()"))
+ "make_lisp_string(x.toString())"))
(define-builtin cons (x y)
(code "({car: " x ", cdr: " y "})"))
@@ -1411,14 +1374,10 @@
(code "(x.cdr = " new ", x)")))
(define-builtin symbolp (x)
- (js!bool
- (js!selfcall
- "var tmp = " x ";" *newline*
- "return (typeof tmp == 'object' && 'name' in tmp);" *newline*)))
+ (js!bool (code "(" x " instanceof Symbol)")))
(define-builtin make-symbol (name)
- (type-check (("name" "string" name))
- "({name: name})"))
+ (code "(new Symbol(" name "))"))
(define-builtin symbol-name (x)
(code "(" x ").name"))
@@ -1432,67 +1391,85 @@
(define-builtin boundp (x)
(js!bool (code "(" x ".value !== undefined)")))
+(define-builtin fboundp (x)
+ (js!bool (code "(" x ".fvalue !== undefined)")))
+
(define-builtin symbol-value (x)
(js!selfcall
"var symbol = " x ";" *newline*
"var value = symbol.value;" *newline*
- "if (value === undefined) throw \"Variable `\" + symbol.name + \"' is unbound.\";" *newline*
+ "if (value === undefined) throw \"Variable `\" + xstring(symbol.name) + \"' is unbound.\";" *newline*
"return value;" *newline*))
(define-builtin symbol-function (x)
(js!selfcall
"var symbol = " x ";" *newline*
"var func = symbol.fvalue;" *newline*
- "if (func === undefined) throw \"Function `\" + symbol.name + \"' is undefined.\";" *newline*
+ "if (func === undefined) throw \"Function `\" + xstring(symbol.name) + \"' is undefined.\";" *newline*
"return func;" *newline*))
(define-builtin symbol-plist (x)
(code "((" x ").plist || " (ls-compile nil) ")"))
(define-builtin lambda-code (x)
- (code "(" x ").toString()"))
+ (code "make_lisp_string((" x ").toString())"))
+
+(define-builtin eq (x y)
+ (js!bool (code "(" x " === " y ")")))
-(define-builtin eq (x y) (js!bool (code "(" x " === " y ")")))
+(define-builtin char-code (x)
+ (type-check (("x" "string" x))
+ "x.charCodeAt(0)"))
-(define-builtin char-to-string (x)
+(define-builtin code-char (x)
(type-check (("x" "number" x))
"String.fromCharCode(x)"))
+(define-builtin characterp (x)
+ (js!bool
+ (js!selfcall
+ "var x = " x ";" *newline*
+ "return (typeof(" x ") == \"string\") && x.length == 1;")))
+
+(define-builtin char-upcase (x)
+ (code x ".toUpperCase()"))
+
+(define-builtin char-downcase (x)
+ (code x ".toLowerCase()"))
+
(define-builtin stringp (x)
- (js!bool (code "(typeof(" x ") == \"string\")")))
+ (js!bool
+ (js!selfcall
+ "var x = " x ";" *newline*
+ "return typeof(x) == 'object' && 'length' in x && x.stringp == 1;")))
(define-builtin string-upcase (x)
- (type-check (("x" "string" x))
- "x.toUpperCase()"))
-
-(define-builtin string-length (x)
- (type-check (("x" "string" x))
- "x.length"))
+ (code "make_lisp_string(xstring(" x ").toUpperCase())"))
-(define-raw-builtin slice (string a &optional b)
+(define-raw-builtin slice (vector a &optional b)
(js!selfcall
- "var str = " (ls-compile string) ";" *newline*
+ "var vector = " (ls-compile vector) ";" *newline*
"var a = " (ls-compile a) ";" *newline*
"var b;" *newline*
(when b (code "b = " (ls-compile b) ";" *newline*))
- "return str.slice(a,b);" *newline*))
+ "return vector.slice(a,b);" *newline*))
(define-builtin char (string index)
- (type-check (("string" "string" string)
- ("index" "number" index))
- "string.charCodeAt(index)"))
+ (code string "[" index "]"))
(define-builtin concat-two (string1 string2)
- (type-check (("string1" "string" string1)
- ("string2" "string" string2))
- "string1.concat(string2)"))
+ (js!selfcall
+ "var r = " string1 ".concat(" string2 ");" *newline*
+ "r.stringp = 1;"
+ "return r;" *newline*))
(define-raw-builtin funcall (func &rest args)
(js!selfcall
"var f = " (ls-compile func) ";" *newline*
"return (typeof f === 'function'? f: f.fvalue)("
- (join (cons (if *multiple-value-p* "values" "pv")
- (mapcar #'ls-compile args))
+ (join (list* (if *multiple-value-p* "values" "pv")
+ (integer-to-string (length args))
+ (mapcar #'ls-compile args))
", ")
")"))
@@ -1503,30 +1480,27 @@
(last (car (last args))))
(js!selfcall
"var f = " (ls-compile func) ";" *newline*
- "var args = [" (join (cons (if *multiple-value-p* "values" "pv")
- (mapcar #'ls-compile args))
+ "var args = [" (join (list* (if *multiple-value-p* "values" "pv")
+ (integer-to-string (length args))
+ (mapcar #'ls-compile args))
", ")
"];" *newline*
"var tail = (" (ls-compile last) ");" *newline*
"while (tail != " (ls-compile nil) "){" *newline*
" args.push(tail.car);" *newline*
+ " args[1] += 1;" *newline*
" tail = tail.cdr;" *newline*
"}" *newline*
"return (typeof f === 'function'? f : f.fvalue).apply(this, args);" *newline*))))
(define-builtin js-eval (string)
- (type-check (("string" "string" string))
- (if *multiple-value-p*
- (js!selfcall
- "var v = globalEval(string);" *newline*
- "if (typeof v !== 'object' || !('multiple-value' in v)){" *newline*
- (indent "v = [v];" *newline*
- "v['multiple-value'] = true;" *newline*)
- "}" *newline*
- "return values.apply(this, v);" *newline*)
- "globalEval(string)")))
+ (if *multiple-value-p*
+ (js!selfcall
+ "var v = globalEval(xstring(" string "));" *newline*
+ "return values.apply(this, forcemv(v));" *newline*)
+ (code "globalEval(xstring(" string "))")))
-(define-builtin error (string)
+(define-builtin %throw (string)
(js!selfcall "throw " string ";" *newline*))
(define-builtin new () "{}")
@@ -1536,48 +1510,68 @@
(define-builtin oget (object key)
(js!selfcall
- "var tmp = " "(" object ")[" key "];" *newline*
+ "var tmp = " "(" object ")[xstring(" key ")];" *newline*
"return tmp == undefined? " (ls-compile nil) ": tmp ;" *newline*))
(define-builtin oset (object key value)
- (code "((" object ")[" key "] = " value ")"))
+ (code "((" object ")[xstring(" key ")] = " value ")"))
(define-builtin in (key object)
- (js!bool (code "((" key ") in (" object "))")))
+ (js!bool (code "(xstring(" key ") in (" object "))")))
+
+(define-builtin map-for-in (function object)
+ (js!selfcall
+ "var f = " function ";" *newline*
+ "var g = (typeof f === 'function' ? f : f.fvalue);" *newline*
+ "var o = " object ";" *newline*
+ "for (var key in o){" *newline*
+ (indent "g(" (if *multiple-value-p* "values" "pv") ", 1, o[key]);" *newline*)
+ "}"
+ " return " (ls-compile nil) ";" *newline*))
(define-builtin functionp (x)
(js!bool (code "(typeof " x " == 'function')")))
(define-builtin write-string (x)
- (type-check (("x" "string" x))
- "lisp.write(x)"))
+ (code "lisp.write(" x ")"))
-(define-builtin make-array (n)
- (js!selfcall
- "var r = [];" *newline*
- "for (var i = 0; i < " n "; i++)" *newline*
- (indent "r.push(" (ls-compile nil) ");" *newline*)
- "return r;" *newline*))
-(define-builtin arrayp (x)
+;;; Storage vectors. They are used to implement arrays and (in the
+;;; future) structures.
+
+(define-builtin storage-vector-p (x)
(js!bool
(js!selfcall
"var x = " x ";" *newline*
"return typeof x === 'object' && 'length' in x;")))
-(define-builtin aref (array n)
+(define-builtin make-storage-vector (n)
+ (js!selfcall
+ "var r = [];" *newline*
+ "r.length = " n ";" *newline*
+ "return r;" *newline*))
+
+(define-builtin storage-vector-size (x)
+ (code x ".length"))
+
+(define-builtin resize-storage-vector (vector new-size)
+ (code "(" vector ".length = " new-size ")"))
+
+(define-builtin storage-vector-ref (vector n)
(js!selfcall
- "var x = " "(" array ")[" n "];" *newline*
+ "var x = " "(" vector ")[" n "];" *newline*
"if (x === undefined) throw 'Out of range';" *newline*
"return x;" *newline*))
-(define-builtin aset (array n value)
+(define-builtin storage-vector-set (vector n value)
(js!selfcall
- "var x = " array ";" *newline*
+ "var x = " vector ";" *newline*
"var i = " n ";" *newline*
"if (i < 0 || i >= x.length) throw 'Out of range';" *newline*
"return x[i] = " value ";" *newline*))
+
+
(define-builtin get-internal-real-time ()
"(new Date()).getTime()")
@@ -1591,82 +1585,102 @@
(code "values(" (join (mapcar #'ls-compile args) ", ") ")")
(code "pv(" (join (mapcar #'ls-compile args) ", ") ")")))
-;; Receives the JS function as first argument as a literal string. The
-;; second argument is compiled and should evaluate to a vector of
-;; values to apply to the the function. The result returned.
-(define-builtin %js-call (fun args)
- (code fun ".apply(this, " args ")"))
-(defun macro (x)
- (and (symbolp x)
- (let ((b (lookup-in-lexenv x *environment* 'function)))
- (if (and b (eq (binding-type b) 'macro))
- b
- nil))))
+;;; Javascript FFI
+
+(define-compilation %js-vref (var)
+ (code "js_to_lisp(" var ")"))
+
+(define-compilation %js-vset (var val)
+ (code "(" var " = lisp_to_js(" (ls-compile val) "))"))
+
+(define-setf-expander %js-vref (var)
+ (let ((new-value (gensym)))
+ (unless (stringp var)
+ (error "`~S' is not a string." var))
+ (values nil
+ (list var)
+ (list new-value)
+ `(%js-vset ,var ,new-value)
+ `(%js-vref ,var))))
+
-#+common-lisp
+#-jscl
(defvar *macroexpander-cache*
(make-hash-table :test #'eq))
-(defun ls-macroexpand-1 (form)
+(defun !macro-function (symbol)
+ (unless (symbolp symbol)
+ (error "`~S' is not a symbol." symbol))
+ (let ((b (lookup-in-lexenv symbol *environment* 'function)))
+ (if (and b (eq (binding-type b) 'macro))
+ (let ((expander (binding-value b)))
+ (cond
+ #-jscl
+ ((gethash b *macroexpander-cache*)
+ (setq expander (gethash b *macroexpander-cache*)))
+ ((listp expander)
+ (let ((compiled (eval expander)))
+ ;; The list representation are useful while
+ ;; bootstrapping, as we can dump the definition of the
+ ;; macros easily, but they are slow because we have to
+ ;; evaluate them and compile them now and again. So, let
+ ;; us replace the list representation version of the
+ ;; function with the compiled one.
+ ;;
+ #+jscl (setf (binding-value b) compiled)
+ #-jscl (setf (gethash b *macroexpander-cache*) compiled)
+ (setq expander compiled))))
+ expander)
+ nil)))
+
+(defun !macroexpand-1 (form)
(cond
((symbolp form)
(let ((b (lookup-in-lexenv form *environment* 'variable)))
(if (and b (eq (binding-type b) 'macro))
(values (binding-value b) t)
(values form nil))))
- ((consp form)
- (let ((macro-binding (macro (car form))))
- (if macro-binding
- (let ((expander (binding-value macro-binding)))
- (cond
- #+common-lisp
- ((gethash macro-binding *macroexpander-cache*)
- (setq expander (gethash macro-binding *macroexpander-cache*)))
- ((listp expander)
- (let ((compiled (eval expander)))
- ;; The list representation are useful while
- ;; bootstrapping, as we can dump the definition of the
- ;; macros easily, but they are slow because we have to
- ;; evaluate them and compile them now and again. So, let
- ;; us replace the list representation version of the
- ;; function with the compiled one.
- ;;
- #+jscl (setf (binding-value macro-binding) compiled)
- #+common-lisp (setf (gethash macro-binding *macroexpander-cache*) compiled)
- (setq expander compiled))))
- (values (apply expander (cdr form)) t))
+ ((and (consp form) (symbolp (car form)))
+ (let ((macrofun (!macro-function (car form))))
+ (if macrofun
+ (values (funcall macrofun (cdr form)) t)
(values form nil))))
(t
(values form nil))))
(defun compile-funcall (function args)
(let* ((values-funcs (if *multiple-value-p* "values" "pv"))
- (arglist (concat "(" (join (cons values-funcs (mapcar #'ls-compile args)) ", ") ")")))
+ (arglist (concat "(" (join (list* values-funcs
+ (integer-to-string (length args))
+ (mapcar #'ls-compile args)) ", ") ")")))
(unless (or (symbolp function)
(and (consp function)
(eq (car function) 'lambda)))
- (error "Bad function"))
+ (error "Bad function designator `~S'" function))
(cond
((translate-function function)
(concat (translate-function function) arglist))
((and (symbolp function)
#+jscl (eq (symbol-package function) (find-package "COMMON-LISP"))
- #+common-lisp t)
+ #-jscl t)
(code (ls-compile `',function) ".fvalue" arglist))
(t
(code (ls-compile `#',function) arglist)))))
-(defun ls-compile-block (sexps &optional return-last-p)
- (if return-last-p
- (code (ls-compile-block (butlast sexps))
- "return " (ls-compile (car (last sexps)) *multiple-value-p*) ";")
- (join-trailing
- (remove-if #'null-or-empty-p (mapcar #'ls-compile sexps))
- (concat ";" *newline*))))
+(defun ls-compile-block (sexps &optional return-last-p decls-allowed-p)
+ (multiple-value-bind (sexps decls)
+ (parse-body sexps :declarations decls-allowed-p)
+ (declare (ignore decls))
+ (if return-last-p
+ (code (ls-compile-block (butlast sexps) nil decls-allowed-p)
+ "return " (ls-compile (car (last sexps)) *multiple-value-p*) ";")
+ (join-trailing
+ (remove-if #'null-or-empty-p (mapcar #'ls-compile sexps))
+ (concat ";" *newline*)))))
(defun ls-compile (sexp &optional multiple-value-p)
- (multiple-value-bind (sexp expandedp) (ls-macroexpand-1 sexp)
+ (multiple-value-bind (sexp expandedp) (!macroexpand-1 sexp)
(when expandedp
(return-from ls-compile (ls-compile sexp multiple-value-p)))
;; The expression has been macroexpanded. Now compile it!
@@ -1682,10 +1696,8 @@
(code (ls-compile `',sexp) ".value"))
(t
(ls-compile `(symbol-value ',sexp))))))
- ((integerp sexp) (integer-to-string sexp))
- ((floatp sexp) (float-to-string sexp))
- ((stringp sexp) (code "\"" (escape-string sexp) "\""))
- ((arrayp sexp) (literal sexp))
+ ((or (integerp sexp) (floatp sexp) (characterp sexp) (stringp sexp) (arrayp sexp))
+ (literal sexp))
((listp sexp)
(let ((name (car sexp))
(args (cdr sexp)))
@@ -1702,7 +1714,7 @@
(t
(compile-funcall name args)))))
(t
- (error (concat "How should I compile " (prin1-to-string sexp) "?")))))))
+ (error "How should I compile `~S'?" sexp))))))
(defvar *compile-print-toplevels* nil)
@@ -1723,10 +1735,7 @@
(t
(when *compile-print-toplevels*
(let ((form-string (prin1-to-string sexp)))
- (write-string "Compiling ")
- (write-string (truncate-string form-string))
- (write-line "...")))
-
+ (format t "Compiling ~a..." (truncate-string form-string))))
(let ((code (ls-compile sexp multiple-value-p)))
(code (join-trailing (get-toplevel-compilations)
(code ";" *newline*))