X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler.lisp;h=27cc37b0d1885f50b173859aff3ac947080b35b7;hb=c296885ca974898925b89af066b1b14a6fca0f57;hp=08932fc01fcba246cbdc87e203e6085ab158c950;hpb=c4527d7a93b1b08528a8420479d30c38f931b9bd;p=jscl.git
diff --git a/src/compiler.lisp b/src/compiler.lisp
index 08932fc..44ccbe7 100644
--- a/src/compiler.lisp
+++ b/src/compiler.lisp
@@ -1,28 +1,40 @@
-;;; compiler.lisp ---
+;;; compiler.lisp ---
-;; Copyright (C) 2012, 2013 David Vazquez
+;; 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
+(/debug "loading compiler.lisp!")
+
;;; Translate the Lisp code to Javascript. It will compile the special
;;; forms. Some primitive functions are compiled as special forms
;;; too. The respective real functions are defined in the target (see
;;; the beginning of this file) as well as some primitive functions.
+(defun interleave (list element &optional after-last-p)
+ (unless (null list)
+ (with-collect
+ (collect (car list))
+ (dolist (x (cdr list))
+ (collect element)
+ (collect x))
+ (when after-last-p
+ (collect element)))))
+
(defun code (&rest args)
(mapconcat (lambda (arg)
(cond
@@ -30,13 +42,15 @@
((integerp arg) (integer-to-string arg))
((floatp arg) (float-to-string arg))
((stringp arg) arg)
- (t (error "Unknown argument."))))
+ (t
+ (with-output-to-string (*standard-output*)
+ (js-expr arg)))))
args))
;;; Wrap X with a Javascript code to convert the result from
;;; Javascript generalized booleans to T or NIL.
(defun js!bool (x)
- (code "(" x "?" (ls-compile t) ": " (ls-compile nil) ")"))
+ `(code "(" ,x "?" ,(ls-compile t) ": " ,(ls-compile nil) ")"))
;;; Concatenate the arguments and wrap them with a self-calling
;;; Javascript anonymous function. It is used to make some Javascript
@@ -44,41 +58,15 @@
;;; It could be defined as function, but we could do some
;;; preprocessing in the future.
(defmacro js!selfcall (&body body)
- `(code "(function(){" *newline* (indent ,@body) "})()"))
+ ``(code "(function(){" ,*newline*
+ (code ,,@body)
+ ,*newline*
+ "})()"))
;;; Like CODE, but prefix each line with four spaces. Two versions
;;; of this function are available, because the Ecmalisp version is
;;; very slow and bootstraping was annoying.
-#+ecmalisp
-(defun indent (&rest string)
- (let ((input (apply #'code string)))
- (let ((output "")
- (index 0)
- (size (length input)))
- (when (plusp (length input)) (concatf output " "))
- (while (< index size)
- (let ((str
- (if (and (char= (char input index) #\newline)
- (< index (1- size))
- (not (char= (char input (1+ index)) #\newline)))
- (concat (string #\newline) " ")
- (string (char input index)))))
- (concatf output str))
- (incf index))
- output)))
-
-#+common-lisp
-(defun indent (&rest string)
- (with-output-to-string (*standard-output*)
- (with-input-from-string (input (apply #'code string))
- (loop
- for line = (read-line input nil)
- while line
- do (write-string " ")
- do (write-line line)))))
-
-
;;; A Form can return a multiple values object calling VALUES, like
;;; values(arg1, arg2, ...). It will work in any context, as well as
;;; returning an individual object. However, if the special variable
@@ -87,62 +75,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,7 +115,8 @@
(defvar *variable-counter* 0)
(defun gvarname (symbol)
- (code "v" (incf *variable-counter*)))
+ (declare (ignore symbol))
+ (format nil "v~d" (incf *variable-counter*)))
(defun translate-variable (symbol)
(awhen (lookup-in-lexenv symbol *environment* 'variable)
@@ -201,11 +134,8 @@
(defun toplevel-compilation (string)
(push string *toplevel-compilations*))
-(defun null-or-empty-p (x)
- (zerop (length x)))
-
(defun get-toplevel-compilations ()
- (reverse (remove-if #'null-or-empty-p *toplevel-compilations*)))
+ (reverse *toplevel-compilations*))
(defun %compile-defmacro (name lambda)
(toplevel-compilation (ls-compile `',name))
@@ -238,7 +168,7 @@
(let ((b (global-binding name 'variable 'variable)))
(push 'constant (binding-declarations b)))))))
-#+ecmalisp
+#+jscl
(fset 'proclaim #'!proclaim)
(defun %define-symbol-macro (name expansion)
@@ -246,7 +176,7 @@
(push-to-lexenv b *environment* 'variable)
name))
-#+ecmalisp
+#+jscl
(defmacro define-symbol-macro (name expansion)
`(%define-symbol-macro ',name ',expansion))
@@ -262,11 +192,11 @@
`(push (list ',name (lambda ,args (block ,name ,@body)))
*compilations*))
-(define-compilation if (condition true false)
- (code "(" (ls-compile condition) " !== " (ls-compile nil)
- " ? " (ls-compile true *multiple-value-p*)
- " : " (ls-compile false *multiple-value-p*)
- ")"))
+(define-compilation if (condition true &optional false)
+ `(code "(" ,(ls-compile condition) " !== " ,(ls-compile nil)
+ " ? " ,(ls-compile true *multiple-value-p*)
+ " : " ,(ls-compile false *multiple-value-p*)
+ ")"))
(defvar *ll-keywords* '(&optional &rest &key))
@@ -290,7 +220,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)
@@ -316,63 +246,59 @@
(ll-optional-arguments-canonical lambda-list))))
(remove nil (mapcar #'third args))))
-(defun lambda-docstring-wrapper (docstring &rest strs)
- (if docstring
+(defun lambda-name/docstring-wrapper (name docstring &rest code)
+ (if (or name docstring)
(js!selfcall
- "var func = " (join strs) ";" *newline*
- "func.docstring = '" docstring "';" *newline*
- "return func;" *newline*)
- (apply #'code strs)))
+ "var func = " `(code ,@code) ";"
+ (when name
+ `(code "func.fname = " ,(js-escape-string name) ";"))
+ (when docstring
+ `(code "func.docstring = " ,(js-escape-string docstring) ";"))
+ "return func;")
+ `(code ,@code)))
(defun lambda-check-argument-count
(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 ");")))
;; General case:
- (code
- (when (< 1 min)
- (code "checkArgsAtLeast(arguments, " min ");" *newline*))
- (when (numberp max)
- (code "checkArgsAtMost(arguments, " max ");" *newline*))))))
+ `(code
+ ,(when (< 0 min)
+ `(code "checkArgsAtLeast(nargs, " ,min ");"))
+ ,(when (numberp max)
+ `(code "checkArgsAtMost(nargs, " ,max ");"))))))
(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*
- (let ((cases nil)
- (idx 0))
- (progn
- (while (< idx n-optional-arguments)
- (let ((arg (nth idx optional-arguments)))
- (push (code "case " (+ idx n-required-arguments) ":" *newline*
- (indent (translate-variable (car arg))
- "="
- (ls-compile (cadr arg)) ";" *newline*)
- (when (third arg)
- (indent (translate-variable (third arg))
- "="
- (ls-compile nil)
- ";" *newline*)))
- cases)
- (incf idx)))
- (push (code "default: break;" *newline*) cases)
- (join (reverse cases))))
- "}" *newline*))))
+ `(code "switch(nargs){"
+ ,(let ((cases nil)
+ (idx 0))
+ (progn
+ (while (< idx n-optional-arguments)
+ (let ((arg (nth idx optional-arguments)))
+ (push `(code "case " ,(+ idx n-required-arguments) ":"
+ (code ,(translate-variable (car arg))
+ "="
+ ,(ls-compile (cadr arg)) ";")
+ ,(when (third arg)
+ `(code ,(translate-variable (third arg))
+ "="
+ ,(ls-compile nil)
+ ";")))
+ cases)
+ (incf idx)))
+ (push `(code "default: break;") cases)
+ `(code ,@(reverse cases))))
+ "}"))))
(defun compile-lambda-rest (ll)
(let ((n-required-arguments (length (ll-required-arguments ll)))
@@ -380,12 +306,10 @@
(rest-argument (ll-rest-argument ll)))
(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)
- "; i--)" *newline*
- (indent js!rest " = {car: arguments[i], cdr: ") js!rest "};"
- *newline*)))))
+ `(code "var " ,js!rest "= " ,(ls-compile nil) ";"
+ "for (var i = nargs-1; i>=" ,(+ n-required-arguments n-optional-arguments)
+ "; i--)"
+ (code ,js!rest " = {car: arguments[i+2], cdr: " ,js!rest "};"))))))
(defun compile-lambda-parse-keywords (ll)
(let ((n-required-arguments
@@ -394,91 +318,126 @@
(length (ll-optional-arguments ll)))
(keyword-arguments
(ll-keyword-arguments-canonical ll)))
- (code
- ;; Declare variables
- (mapconcat (lambda (arg)
- (let ((var (second (car arg))))
- (code "var " (translate-variable var) "; " *newline*
- (when (third arg)
- (code "var " (translate-variable (third arg))
- " = " (ls-compile nil)
- ";" *newline*)))))
- keyword-arguments)
- ;; Parse keywords
- (flet ((parse-keyword (keyarg)
- ;; ((keyword-name var) init-form)
- (code "for (i=" (+ 1 n-required-arguments n-optional-arguments)
- "; i (LIST* a b c foo)
-;;; provided a, b, c are not splicing frobs
-;;; (APPEND (LIST* a b c) foo) => (LIST* a b (APPEND c foo))
-;;; provided a, b, c are not splicing frobs
-;;; (APPEND (QUOTE (x)) foo) => (LIST* (QUOTE x) foo)
-;;; (APPEND (CLOBBERABLE x) foo) => (NCONC x foo)
-(defun bq-simplify (x)
- (if (atom x)
- x
- (let ((x (if (eq (car x) *bq-quote*)
- x
- (maptree #'bq-simplify x))))
- (if (not (eq (car x) *bq-append*))
- x
- (bq-simplify-args x)))))
-
-(defun bq-simplify-args (x)
- (do ((args (reverse (cdr x)) (cdr args))
- (result
- nil
- (cond ((atom (car args))
- (bq-attach-append *bq-append* (car args) result))
- ((and (eq (caar args) *bq-list*)
- (notany #'bq-splicing-frob (cdar args)))
- (bq-attach-conses (cdar args) result))
- ((and (eq (caar args) *bq-list**)
- (notany #'bq-splicing-frob (cdar args)))
- (bq-attach-conses
- (reverse (cdr (reverse (cdar args))))
- (bq-attach-append *bq-append*
- (car (last (car args)))
- result)))
- ((and (eq (caar args) *bq-quote*)
- (consp (cadar args))
- (not (bq-frob (cadar args)))
- (null (cddar args)))
- (bq-attach-conses (list (list *bq-quote*
- (caadar args)))
- result))
- ((eq (caar args) *bq-clobberable*)
- (bq-attach-append *bq-nconc* (cadar args) result))
- (t (bq-attach-append *bq-append*
- (car args)
- result)))))
- ((null args) result)))
-
-(defun null-or-quoted (x)
- (or (null x) (and (consp x) (eq (car x) *bq-quote*))))
-
-;;; When BQ-ATTACH-APPEND is called, the OP should be #:BQ-APPEND
-;;; or #:BQ-NCONC. This produces a form (op item result) but
-;;; some simplifications are done on the fly:
-;;;
-;;; (op '(a b c) '(d e f g)) => '(a b c d e f g)
-;;; (op item 'nil) => item, provided item is not a splicable frob
-;;; (op item 'nil) => (op item), if item is a splicable frob
-;;; (op item (op a b c)) => (op item a b c)
-(defun bq-attach-append (op item result)
- (cond ((and (null-or-quoted item) (null-or-quoted result))
- (list *bq-quote* (append (cadr item) (cadr result))))
- ((or (null result) (equal result *bq-quote-nil*))
- (if (bq-splicing-frob item) (list op item) item))
- ((and (consp result) (eq (car result) op))
- (list* (car result) item (cdr result)))
- (t (list op item result))))
-
-;;; The effect of BQ-ATTACH-CONSES is to produce a form as if by
-;;; `(LIST* ,@items ,result) but some simplifications are done
-;;; on the fly.
-;;;
-;;; (LIST* 'a 'b 'c 'd) => '(a b c . d)
-;;; (LIST* a b c 'nil) => (LIST a b c)
-;;; (LIST* a b c (LIST* d e f g)) => (LIST* a b c d e f g)
-;;; (LIST* a b c (LIST d e f g)) => (LIST a b c d e f g)
-(defun bq-attach-conses (items result)
- (cond ((and (every #'null-or-quoted items)
- (null-or-quoted result))
- (list *bq-quote*
- (append (mapcar #'cadr items) (cadr result))))
- ((or (null result) (equal result *bq-quote-nil*))
- (cons *bq-list* items))
- ((and (consp result)
- (or (eq (car result) *bq-list*)
- (eq (car result) *bq-list**)))
- (cons (car result) (append items (cdr result))))
- (t (cons *bq-list** (append items (list result))))))
-
-;;; Removes funny tokens and changes (#:BQ-LIST* a b) into
-;;; (CONS a b) instead of (LIST* a b), purely for readability.
-(defun bq-remove-tokens (x)
- (cond ((eq x *bq-list*) 'list)
- ((eq x *bq-append*) 'append)
- ((eq x *bq-nconc*) 'nconc)
- ((eq x *bq-list**) 'list*)
- ((eq x *bq-quote*) 'quote)
- ((atom x) x)
- ((eq (car x) *bq-clobberable*)
- (bq-remove-tokens (cadr x)))
- ((and (eq (car x) *bq-list**)
- (consp (cddr x))
- (null (cdddr x)))
- (cons 'cons (maptree #'bq-remove-tokens (cdr x))))
- (t (maptree #'bq-remove-tokens x))))
+ "return args;" ))
(define-transformation backquote (form)
(bq-completely-process form))
@@ -1219,18 +972,22 @@
(defmacro type-check (decls &body body)
`(js!selfcall
,@(mapcar (lambda (decl)
- `(code "var " ,(first decl) " = " ,(third decl) ";" *newline*))
+ `(let ((name ,(first decl))
+ (value ,(third decl)))
+ `(code "var " ,name " = " ,value ";" )))
decls)
,@(mapcar (lambda (decl)
- `(code "if (typeof " ,(first decl) " != '" ,(second decl) "')" *newline*
- (indent "throw 'The value ' + "
- ,(first decl)
- " + ' is not a type "
- ,(second decl)
- ".';"
- *newline*)))
+ `(let ((name ,(first decl))
+ (type ,(second decl)))
+ `(code "if (typeof " ,name " != '" ,type "')"
+ (code "throw 'The value ' + "
+ ,name
+ " + ' is not a type "
+ ,type
+ ".';"
+ ))))
decls)
- (code "return " (progn ,@body) ";" *newline*)))
+ `(code "return " ,,@body ";" )))
;;; VARIABLE-ARITY compiles variable arity operations. ARGS stands for
;;; a variable which holds a list of forms. It will compile them and
@@ -1243,56 +1000,57 @@
(error "ARGS must be a non-empty list"))
(let ((counter 0)
(fargs '())
- (prelude ""))
+ (prelude '()))
(dolist (x args)
(cond
((floatp x) (push (float-to-string x) fargs))
((numberp x) (push (integer-to-string x) fargs))
- (t (let ((v (code "x" (incf counter))))
+ (t (let ((v (format nil "x~d" (incf counter))))
(push v fargs)
- (concatf prelude
- (code "var " v " = " (ls-compile x) ";" *newline*
- "if (typeof " v " !== 'number') throw 'Not a number!';"
- *newline*))))))
- (js!selfcall prelude (funcall function (reverse fargs)))))
+ (push `(code "var " ,v " = " ,(ls-compile x) ";"
+ "if (typeof " ,v " !== 'number') throw 'Not a number!';")
+ prelude)))))
+ (js!selfcall
+ `(code ,@(reverse prelude))
+ (funcall function (reverse fargs)))))
(defmacro variable-arity (args &body body)
(unless (symbolp args)
- (error "Bad usage of VARIABLE-ARITY, you must pass a symbol"))
+ (error "`~S' is not a symbol." args))
`(variable-arity-call ,args
(lambda (,args)
- (code "return " ,@body ";" *newline*))))
+ `(code "return " ,,@body ";" ))))
(defun num-op-num (x op y)
(type-check (("x" "number" x) ("y" "number" y))
- (code "x" op "y")))
+ `(code "x" ,op "y")))
(define-raw-builtin + (&rest numbers)
(if (null numbers)
"0"
(variable-arity numbers
- (join numbers "+"))))
+ `(code ,@(interleave numbers "+")))))
(define-raw-builtin - (x &rest others)
(let ((args (cons x others)))
(variable-arity args
(if (null others)
- (concat "-" (car args))
- (join args "-")))))
+ `(code "-" ,(car args))
+ `(code ,@(interleave args "-"))))))
(define-raw-builtin * (&rest numbers)
(if (null numbers)
"1"
(variable-arity numbers
- (join numbers "*"))))
+ `(code ,@(interleave numbers "*")))))
(define-raw-builtin / (x &rest others)
(let ((args (cons x others)))
(variable-arity args
(if (null others)
- (concat "1 /" (car args))
- (join args "/")))))
+ `(code "1 /" ,(car args))
+ `(code ,@(interleave args "/"))))))
(define-builtin mod (x y) (num-op-num x "%" y))
@@ -1302,11 +1060,11 @@
((null (cdr vars))
"true")
((null (cddr vars))
- (concat (car vars) op (cadr vars)))
+ `(code ,(car vars) ,op ,(cadr vars)))
(t
- (concat (car vars) op (cadr vars)
- " && "
- (comparison-conjuntion (cdr vars) op)))))
+ `(code ,(car vars) ,op ,(cadr vars)
+ " && "
+ ,(comparison-conjuntion (cdr vars) op)))))
(defmacro define-builtin-comparison (op sym)
`(define-raw-builtin ,op (x &rest args)
@@ -1319,9 +1077,10 @@
(define-builtin-comparison >= ">=")
(define-builtin-comparison <= "<=")
(define-builtin-comparison = "==")
+(define-builtin-comparison /= "!=")
(define-builtin numberp (x)
- (js!bool (code "(typeof (" x ") == \"number\")")))
+ (js!bool `(code "(typeof (" ,x ") == \"number\")")))
(define-builtin floor (x)
(type-check (("x" "number" x))
@@ -1334,293 +1093,370 @@
(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 "})"))
+ `(code "({car: " ,x ", cdr: " ,y "})"))
(define-builtin consp (x)
(js!bool
(js!selfcall
- "var tmp = " x ";" *newline*
- "return (typeof tmp == 'object' && 'car' in tmp);" *newline*)))
+ "var tmp = " x ";"
+ "return (typeof tmp == 'object' && 'car' in tmp);" )))
(define-builtin car (x)
(js!selfcall
- "var tmp = " x ";" *newline*
+ "var tmp = " x ";"
"return tmp === " (ls-compile nil)
"? " (ls-compile nil)
- ": tmp.car;" *newline*))
+ ": tmp.car;" ))
(define-builtin cdr (x)
(js!selfcall
- "var tmp = " x ";" *newline*
+ "var tmp = " x ";"
"return tmp === " (ls-compile nil) "? "
(ls-compile nil)
- ": tmp.cdr;" *newline*))
+ ": tmp.cdr;" ))
(define-builtin rplaca (x new)
(type-check (("x" "object" x))
- (code "(x.car = " new ", x)")))
+ `(code "(x.car = " ,new ", x)")))
(define-builtin rplacd (x new)
(type-check (("x" "object" x))
- (code "(x.cdr = " new ", x)")))
+ `(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"))
+ `(code "(" ,x ").name"))
(define-builtin set (symbol value)
- (code "(" symbol ").value = " value))
+ `(code "(" ,symbol ").value = " ,value))
(define-builtin fset (symbol value)
- (code "(" symbol ").fvalue = " value))
+ `(code "(" ,symbol ").fvalue = " ,value))
(define-builtin boundp (x)
- (js!bool (code "(" x ".value !== undefined)")))
+ (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*
- "return value;" *newline*))
+ "var symbol = " x ";"
+ "var value = symbol.value;"
+ "if (value === undefined) throw \"Variable `\" + xstring(symbol.name) + \"' is unbound.\";"
+ "return value;" ))
(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*
- "return func;" *newline*))
+ "var symbol = " x ";"
+ "var func = symbol.fvalue;"
+ "if (func === undefined) throw \"Function `\" + xstring(symbol.name) + \"' is undefined.\";"
+ "return func;" ))
(define-builtin symbol-plist (x)
- (code "((" x ").plist || " (ls-compile nil) ")"))
+ `(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 equal (x y) (js!bool (code "(" x " == " y ")")))
+(define-builtin char-code (x)
+ (type-check (("x" "string" x))
+ "char_to_codepoint(x)"))
-(define-builtin char-to-string (x)
+(define-builtin code-char (x)
(type-check (("x" "number" x))
- "String.fromCharCode(x)"))
+ "char_from_codepoint(x)"))
-(define-builtin stringp (x)
- (js!bool (code "(typeof(" x ") == \"string\")")))
+(define-builtin characterp (x)
+ (js!bool
+ (js!selfcall
+ "var x = " x ";"
+ "return (typeof(" x ") == \"string\") && (x.length == 1 || x.length == 2);")))
-(define-builtin string-upcase (x)
- (type-check (("x" "string" x))
- "x.toUpperCase()"))
+(define-builtin char-upcase (x)
+ `(code "safe_char_upcase(" ,x ")"))
-(define-builtin string-length (x)
- (type-check (("x" "string" x))
- "x.length"))
+(define-builtin char-downcase (x)
+ `(code "safe_char_downcase(" ,x ")"))
-(define-raw-builtin slice (string a &optional b)
- (js!selfcall
- "var str = " (ls-compile string) ";" *newline*
- "var a = " (ls-compile a) ";" *newline*
- "var b;" *newline*
- (when b (code "b = " (ls-compile b) ";" *newline*))
- "return str.slice(a,b);" *newline*))
-
-(define-builtin char (string index)
- (type-check (("string" "string" string)
- ("index" "number" index))
- "string.charCodeAt(index)"))
-
-(define-builtin concat-two (string1 string2)
- (type-check (("string1" "string" string1)
- ("string2" "string" string2))
- "string1.concat(string2)"))
+(define-builtin stringp (x)
+ (js!bool
+ (js!selfcall
+ "var x = " x ";"
+ "return typeof(x) == 'object' && 'length' in x && x.stringp == 1;")))
(define-raw-builtin funcall (func &rest args)
(js!selfcall
- "var f = " (ls-compile func) ";" *newline*
+ "var f = " (ls-compile func) ";"
"return (typeof f === 'function'? f: f.fvalue)("
- (join (cons (if *multiple-value-p* "values" "pv")
- (mapcar #'ls-compile args))
- ", ")
+ `(code
+ ,@(interleave (list* (if *multiple-value-p* "values" "pv")
+ (integer-to-string (length args))
+ (mapcar #'ls-compile args))
+ ", "))
")"))
(define-raw-builtin apply (func &rest args)
(if (null args)
- (code "(" (ls-compile func) ")()")
+ `(code "(" ,(ls-compile func) ")()")
(let ((args (butlast args))
(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))
- ", ")
- "];" *newline*
- "var tail = (" (ls-compile last) ");" *newline*
- "while (tail != " (ls-compile nil) "){" *newline*
- " args.push(tail.car);" *newline*
- " tail = tail.cdr;" *newline*
- "}" *newline*
- "return (typeof f === 'function'? f : f.fvalue).apply(this, args);" *newline*))))
+ "var f = " (ls-compile func) ";"
+ "var args = [" `(code
+ ,@(interleave (list* (if *multiple-value-p* "values" "pv")
+ (integer-to-string (length args))
+ (mapcar #'ls-compile args))
+ ", "))
+ "];"
+ "var tail = (" (ls-compile last) ");"
+ "while (tail != " (ls-compile nil) "){"
+ " args.push(tail.car);"
+ " args[1] += 1;"
+ " tail = tail.cdr;"
+ "}"
+ "return (typeof f === 'function'? f : f.fvalue).apply(this, args);" ))))
(define-builtin js-eval (string)
- (type-check (("string" "string" string))
- (if *multiple-value-p*
- (js!selfcall
- "var v = eval.apply(window, [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*)
- "eval.apply(window, [string])")))
-
-(define-builtin error (string)
- (js!selfcall "throw " string ";" *newline*))
-
-(define-builtin new () "{}")
-
-(define-builtin objectp (x)
- (js!bool (code "(typeof (" x ") === 'object')")))
+ (if *multiple-value-p*
+ (js!selfcall
+ "var v = globalEval(xstring(" string "));"
+ "return values.apply(this, forcemv(v));" )
+ `(code "globalEval(xstring(" ,string "))")))
-(define-builtin oget (object key)
- (js!selfcall
- "var tmp = " "(" object ")[" key "];" *newline*
- "return tmp == undefined? " (ls-compile nil) ": tmp ;" *newline*))
+(define-builtin %throw (string)
+ (js!selfcall "throw " string ";" ))
-(define-builtin oset (object key value)
- (code "((" object ")[" key "] = " value ")"))
+(define-builtin functionp (x)
+ (js!bool `(code "(typeof " ,x " == 'function')")))
-(define-builtin in (key object)
- (js!bool (code "((" key ") in (" object "))")))
+(define-builtin %write-string (x)
+ `(code "lisp.write(" ,x ")"))
-(define-builtin functionp (x)
- (js!bool (code "(typeof " x " == 'function')")))
+(define-builtin /debug (x)
+ `(code "console.log(xstring(" ,x "))"))
-(define-builtin write-string (x)
- (type-check (("x" "string" x))
- "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*))
+;;; Storage vectors. They are used to implement arrays and (in the
+;;; future) structures.
-(define-builtin arrayp (x)
+(define-builtin storage-vector-p (x)
(js!bool
(js!selfcall
- "var x = " x ";" *newline*
+ "var x = " x ";"
"return typeof x === 'object' && 'length' in x;")))
-(define-builtin aref (array n)
+(define-builtin make-storage-vector (n)
(js!selfcall
- "var x = " "(" array ")[" n "];" *newline*
- "if (x === undefined) throw 'Out of range';" *newline*
- "return x;" *newline*))
+ "var r = [];"
+ "r.length = " n ";"
+ "return r;" ))
+
+(define-builtin storage-vector-size (x)
+ `(code ,x ".length"))
-(define-builtin aset (array n value)
+(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 ";" *newline*
- "var i = " n ";" *newline*
- "if (i < 0 || i >= x.length) throw 'Out of range';" *newline*
- "return x[i] = " value ";" *newline*))
+ "var x = " "(" vector ")[" n "];"
+ "if (x === undefined) throw 'Out of range';"
+ "return x;" ))
-(define-builtin get-unix-time ()
- (code "(Math.round(new Date() / 1000))"))
+(define-builtin storage-vector-set (vector n value)
+ (js!selfcall
+ "var x = " vector ";"
+ "var i = " n ";"
+ "if (i < 0 || i >= x.length) throw 'Out of range';"
+ "return x[i] = " value ";" ))
+
+(define-builtin concatenate-storage-vector (sv1 sv2)
+ (js!selfcall
+ "var sv1 = " sv1 ";"
+ "var r = sv1.concat(" sv2 ");"
+ "r.type = sv1.type;"
+ "r.stringp = sv1.stringp;"
+ "return r;" ))
+
+(define-builtin get-internal-real-time ()
+ "(new Date()).getTime()")
(define-builtin values-array (array)
(if *multiple-value-p*
- (code "values.apply(this, " array ")")
- (code "pv.apply(this, " array ")")))
+ `(code "values.apply(this, " ,array ")")
+ `(code "pv.apply(this, " ,array ")")))
(define-raw-builtin values (&rest args)
(if *multiple-value-p*
- (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))))
-
-#+common-lisp
+ `(code "values(" ,@(interleave (mapcar #'ls-compile args) ",") ")")
+ `(code "pv(" ,@(interleave (mapcar #'ls-compile args) ", ") ")")))
+
+
+;;; Javascript FFI
+
+(define-builtin new () "{}")
+
+(define-raw-builtin oget* (object key &rest keys)
+ (js!selfcall
+ "var tmp = (" (ls-compile object) ")[xstring(" (ls-compile key) ")];"
+ `(code
+ ,@(mapcar (lambda (key)
+ `(code "if (tmp === undefined) return " ,(ls-compile nil) ";"
+ "tmp = tmp[xstring(" ,(ls-compile key) ")];" ))
+ keys))
+ "return tmp === undefined? " (ls-compile nil) " : tmp;" ))
+
+(define-raw-builtin oset* (value object key &rest keys)
+ (let ((keys (cons key keys)))
+ (js!selfcall
+ "var obj = " (ls-compile object) ";"
+ `(code ,@(mapcar (lambda (key)
+ `(code "obj = obj[xstring(" ,(ls-compile key) ")];"
+ "if (obj === undefined) throw 'Impossible to set Javascript property.';" ))
+ (butlast keys)))
+ "var tmp = obj[xstring(" (ls-compile (car (last keys))) ")] = " (ls-compile value) ";"
+ "return tmp === undefined? " (ls-compile nil) " : tmp;" )))
+
+(define-raw-builtin oget (object key &rest keys)
+ `(code "js_to_lisp(" ,(ls-compile `(oget* ,object ,key ,@keys)) ")"))
+
+(define-raw-builtin oset (value object key &rest keys)
+ (ls-compile `(oset* (lisp-to-js ,value) ,object ,key ,@keys)))
+
+(define-builtin objectp (x)
+ (js!bool `(code "(typeof (" ,x ") === 'object')")))
+
+(define-builtin lisp-to-js (x) `(code "lisp_to_js(" ,x ")"))
+(define-builtin js-to-lisp (x) `(code "js_to_lisp(" ,x ")"))
+
+
+(define-builtin in (key object)
+ (js!bool `(code "(xstring(" ,key ") in (" ,object "))")))
+
+(define-builtin map-for-in (function object)
+ (js!selfcall
+ "var f = " function ";"
+ "var g = (typeof f === 'function' ? f : f.fvalue);"
+ "var o = " object ";"
+ "for (var key in o){"
+ `(code "g(" ,(if *multiple-value-p* "values" "pv") ", 1, o[key]);" )
+ "}"
+ " return " (ls-compile nil) ";" ))
+
+(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))))
+
+
+#-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.
- ;;
- #+ecmalisp (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 `(code "(" ,@(interleave (list* values-funcs
+ (integer-to-string (length args))
+ (mapcar #'ls-compile args))
+ ", ")
+ ")")))
+ (unless (or (symbolp function)
+ (and (consp function)
+ (member (car function) '(lambda oget))))
+ (error "Bad function designator `~S'" function))
(cond
((translate-function function)
- (concat (translate-function function) arglist))
+ `(code ,(translate-function function) ,arglist))
((and (symbolp function)
- #+ecmalisp (eq (symbol-package function) (find-package "COMMON-LISP"))
- #+common-lisp t)
- (code (ls-compile `',function) ".fvalue" arglist))
+ #+jscl (eq (symbol-package function) (find-package "COMMON-LISP"))
+ #-jscl t)
+ `(code ,(ls-compile `',function) ".fvalue" ,arglist))
+ #+jscl((symbolp function)
+ `(code ,(ls-compile `#',function) ,arglist))
+ ((and (consp function) (eq (car function) 'lambda))
+ `(code ,(ls-compile `#',function) ,arglist))
+ ((and (consp function) (eq (car function) 'oget))
+ `(code ,(ls-compile function) ,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*))))
+ (error "Bad function descriptor")))))
+
+(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*) ";")
+ `(code
+ ,@(interleave (mapcar #'ls-compile sexps) ";
+" *newline*)
+ ";" ,*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!
@@ -1633,12 +1469,11 @@
(binding-value b))
((or (keywordp sexp)
(and b (member 'constant (binding-declarations b))))
- (code (ls-compile `',sexp) ".value"))
+ `(code ,(ls-compile `',sexp) ".value"))
(t
(ls-compile `(symbol-value ',sexp))))))
- ((integerp sexp) (integer-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)))
@@ -1655,7 +1490,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)
@@ -1665,23 +1500,24 @@
(min width (length string)))))
(subseq string 0 n)))
-(defun ls-compile-toplevel (sexp &optional multiple-value-p)
+(defun convert-toplevel (sexp &optional multiple-value-p)
(let ((*toplevel-compilations* nil))
(cond
((and (consp sexp) (eq (car sexp) 'progn))
- (let ((subs (mapcar (lambda (s)
- (ls-compile-toplevel s t))
- (cdr sexp))))
- (join (remove-if #'null-or-empty-p subs))))
+ `(progn
+ ,@(mapcar (lambda (s) (convert-toplevel s t))
+ (cdr sexp))))
(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*))
- (when code
- (code code ";" *newline*))))))))
+ `(code
+ ,@(interleave (get-toplevel-compilations) ";
+" t)
+ ,(when code
+ `(code ,code ";"))))))))
+
+(defun ls-compile-toplevel (sexp &optional multiple-value-p)
+ (with-output-to-string (*standard-output*)
+ (js (convert-toplevel sexp multiple-value-p))))