(defun gvarname (symbol)
(declare (ignore symbol))
- (code "v" (incf *variable-counter*)))
+ (incf *variable-counter*)
+ (concat "v" (integer-to-string *variable-counter*)))
(defun translate-variable (symbol)
(awhen (lookup-in-lexenv symbol *environment* 'variable)
(when name `(= (get func |fname|) ,name))
(when docstring `(= (get func |docstring|) ,docstring))
`(return func))
- `(code ,code)))
+ code))
(defun lambda-check-argument-count
(n-required-arguments n-optional-arguments rest-p)
(defvar *literal-counter* 0)
(defun genlit ()
- (code "l" (incf *literal-counter*)))
+ (incf *literal-counter*)
+ (concat "l" (integer-to-string *literal-counter*)))
(defun dump-symbol (symbol)
#-jscl
`(get ,x "name"))
(define-builtin set (symbol value)
- `(code "(" ,symbol ").value = " ,value))
+ `(= (get ,symbol "value") ,value))
(define-builtin fset (symbol value)
- `(code "(" ,symbol ").fvalue = " ,value))
+ `(= (get ,symbol "fvalue") ,value))
(define-builtin boundp (x)
- (js!bool `(code "(" ,x ".value !== undefined)")))
+ (js!bool `(!== (get ,x "value") undefined)))
(define-builtin fboundp (x)
- (js!bool `(code "(" ,x ".fvalue !== undefined)")))
+ (js!bool `(!== (get ,x "fvalue") undefined)))
(define-builtin symbol-value (x)
- (js!selfcall
- "var symbol = " x ";"
- "var value = symbol.value;"
- "if (value === undefined) throw \"Variable `\" + xstring(symbol.name) + \"' is unbound.\";"
- "return value;" ))
+ (js!selfcall*
+ `(var (symbol ,x)
+ (value (get symbol "value")))
+ `(if (=== value undefined)
+ (throw (+ "Variable `" (call |xstring| (get symbol "name")) "' is unbound.")))
+ `(return value)))
(define-builtin symbol-function (x)
- (js!selfcall
- "var symbol = " x ";"
- "var func = symbol.fvalue;"
- "if (func === undefined) throw \"Function `\" + xstring(symbol.name) + \"' is undefined.\";"
- "return func;" ))
+ (js!selfcall*
+ `(var (symbol ,x)
+ (func (get symbol "fvalue")))
+ `(if (=== func undefined)
+ (throw (+ "Function `" (call |xstring| (get symbol "name")) "' is undefined.")))
+ `(return func)))
(define-builtin symbol-plist (x)
- `(code "((" ,x ").plist || " ,(ls-compile nil) ")"))
+ `(or (get ,x "plist") ,(ls-compile nil)))
(define-builtin lambda-code (x)
- `(code "make_lisp_string((" ,x ").toString())"))
+ `(call |make_lisp_string| (call (get ,x "toString"))))
(define-builtin eq (x y)
- (js!bool `(code "(" ,x " === " ,y ")")))
+ (js!bool `(=== ,x ,y)))
(define-builtin char-code (x)
(type-check (("x" "string" x))
"return (typeof(" x ") == \"string\") && (x.length == 1 || x.length == 2);")))
(define-builtin char-upcase (x)
- `(code "safe_char_upcase(" ,x ")"))
+ `(call |safe_char_upcase| ,x))
(define-builtin char-downcase (x)
- `(code "safe_char_downcase(" ,x ")"))
+ `(call |safe_char_downcase| ,x))
(define-builtin stringp (x)
(js!bool
- (js!selfcall
- "var x = " x ";"
- "return typeof(x) == 'object' && 'length' in x && x.stringp == 1;")))
+ (js!selfcall*
+ `(var (x ,x))
+ `(return (and (and (===(typeof x) "object")
+ (in "length" x))
+ (== (get x "stringp") 1))))))
(define-raw-builtin funcall (func &rest args)
(js!selfcall
(define-builtin js-eval (string)
(if *multiple-value-p*
- (js!selfcall
- "var v = globalEval(xstring(" string "));"
- "return values.apply(this, forcemv(v));" )
- `(code "globalEval(xstring(" ,string "))")))
+ (js!selfcall*
+ `(var (v (call |globalEval| (call |xstring| ,string))))
+ `(return (call (get |values| "apply") this (call |forcemv| v))))
+ `(call |globalEval| (call |xstring| ,string))))
(define-builtin %throw (string)
- (js!selfcall "throw " string ";" ))
+ (js!selfcall* `(throw ,string)))
(define-builtin functionp (x)
- (js!bool `(code "(typeof " ,x " == 'function')")))
+ (js!bool `(=== (typeof ,x) "function")))
(define-builtin %write-string (x)
- `(code "lisp.write(" ,x ")"))
+ `(call (get |lisp| "write") ,x))
(define-builtin /debug (x)
- `(code "console.log(xstring(" ,x "))"))
+ `(call (get |console| "log") (call |xstring| ,x)))
;;; Storage vectors. They are used to implement arrays and (in the
(define-builtin storage-vector-p (x)
(js!bool
- (js!selfcall
- "var x = " x ";"
- "return typeof x === 'object' && 'length' in x;")))
+ (js!selfcall*
+ `(var (x ,x))
+ `(return (and (=== (typeof x) "object") (in "length" x))))))
(define-builtin make-storage-vector (n)
- (js!selfcall
- "var r = [];"
- "r.length = " n ";"
- "return r;" ))
+ (js!selfcall*
+ `(var (r #()))
+ `(= (get r "length") ,n)
+ `(return r)))
(define-builtin storage-vector-size (x)
- `(code ,x ".length"))
+ `(get ,x "length"))
(define-builtin resize-storage-vector (vector new-size)
- `(code "(" ,vector ".length = " ,new-size ")"))
+ `(= (get ,vector "length") ,new-size))
(define-builtin storage-vector-ref (vector n)
- (js!selfcall
- "var x = " "(" vector ")[" n "];"
- "if (x === undefined) throw 'Out of range';"
- "return x;" ))
+ (js!selfcall*
+ `(var (x (get ,vector ,n)))
+ `(if (=== x undefined) (throw "Out of range."))
+ `(return x)))
(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 ";" ))
+ (js!selfcall*
+ `(var (x ,vector))
+ `(var (i ,n))
+ `(if (or (< i 0) (>= i (get x "length")))
+ (throw "Out of range."))
+ `(return (= (property 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;" ))
+ (js!selfcall*
+ `(var (sv1 ,sv1))
+ `(var (r (call (get sv1 "concat") ,sv2)))
+ `(= (get r "type") (get sv1 "type"))
+ `(= (get r "stringp") (get sv1 "stringp"))
+ `(return r)))
(define-builtin get-internal-real-time ()
- "(new Date()).getTime()")
+ `(call (get (new (call Date)) "getTime")))
(define-builtin values-array (array)
(if *multiple-value-p*
;;; Javascript FFI
-(define-builtin new () "{}")
+(define-builtin new ()
+ '(object))
(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;" ))
+ (js!selfcall*
+ `(progn
+ (var (tmp (get ,(ls-compile object) (call |xstring| ,(ls-compile key)))))
+ ,@(mapcar (lambda (key)
+ `(progn
+ (if (=== tmp undefined) (return ,(ls-compile nil)))
+ (= tmp (get tmp (call |xstring| ,(ls-compile key))))))
+ keys))
+ `(return (if (=== 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;" )))
+ (js!selfcall*
+ `(progn
+ (var (obj ,(ls-compile object)))
+ ,@(mapcar (lambda (key)
+ `(progn
+ (= obj (get obj (call |xstring| ,(ls-compile key))))
+ (if (=== object undefined)
+ (throw "Impossible to set object property."))))
+ (butlast keys))
+ (var (tmp
+ (= (get obj (call |xstring| ,(ls-compile (car (last keys)))))
+ ,(ls-compile value))))
+ (return (if (=== tmp undefined)
+ ,(ls-compile nil)
+ tmp))))))
(define-raw-builtin oget (object key &rest keys)
`(call |js_to_lisp| ,(ls-compile `(oget* ,object ,key ,@keys))))
(js!bool `(in (call |xstring| ,key) ,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) ";" ))
+ (js!selfcall*
+ `(var (f ,function)
+ (g (if (=== (typeof f) "function") f (get f "fvalue")))
+ (o ,object))
+ `(for-in (key o)
+ (call g ,(if *multiple-value-p* '|values| '|pv|) 1 (get o "key")))
+ `(return ,(ls-compile nil))))
(define-compilation %js-vref (var)
`(code "js_to_lisp(" ,var ")"))
projects / jscl.git / blobdiff