((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
((and (listp sd) (car sd) (cddr sd))
sd)
(t
- (error "Bad slot accessor."))))
+ (error "Bad slot description `~S'." sd))))
slots))
(predicate (intern (concat name-string "-P"))))
`(progn
(collect
`(defun ,accessor-name (x)
(unless (,predicate x)
- (error ,(concat "The object is not a type " name-string)))
+ (error "The object `~S' is not of type `~S'" x ,name-string))
(nth ,index x)))
;; TODO: Implement this with a higher level
;; abstraction like defsetf or (defun (setf ..))
(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)
" && ")
")" *newline*
(indent
- "throw 'Unknown keyword argument ' + arguments[i].name;" *newline*))
+ "throw 'Unknown keyword argument ' + xstring(arguments[i].name);" *newline*))
"}" *newline*)))))
(defun parse-lambda-list (ll)
(cond
((null pairs) (return))
((null (cdr pairs))
- (error "Odd paris in SETQ"))
+ (error "Odd pairs in SETQ"))
(t
(concatf result
(concat (setq-pair (car pairs) (cadr pairs))
#+common-lisp
(let ((package (symbol-package symbol)))
(if (eq package (find-package "KEYWORD"))
- (code "{name: \"" (escape-string (symbol-name symbol))
- "\", 'package': '" (package-name package) "'}")
- (code "{name: \"" (escape-string (symbol-name symbol)) "\"}")))
+ (code "{name: " (dump-string (symbol-name symbol))
+ ", 'package': " (dump-string (package-name package)) "}")
+ (code "{name: " (dump-string (symbol-name symbol)) "}")))
#+jscl
(let ((package (symbol-package symbol)))
(if (null package)
- (code "{name: \"" (escape-string (symbol-name symbol)) "\"}")
+ (code "{name: " (dump-symbol (symbol-name symbol)) "}")
(ls-compile `(intern ,(symbol-name symbol) ,(package-name package))))))
(defun dump-cons (cons)
(let ((elements (vector-to-list array)))
(concat "[" (join (mapcar #'literal elements) ", ") "]")))
+(defun dump-string (string)
+ (code "make_lisp_string(\"" (escape-string string) "\")"))
+
(defun literal (sexp &optional recursive)
(cond
((integerp sexp) (integer-to-string sexp))
((floatp sexp) (float-to-string sexp))
- ((stringp sexp) (code "\"" (escape-string sexp) "\""))
+ ((characterp sexp) (code "\"" (escape-string (string sexp)) "\""))
(t
- (or (cdr (assoc sexp *literal-table*))
+ (or (cdr (assoc sexp *literal-table* :test #'equal))
(let ((dumped (typecase sexp
(symbol (dump-symbol sexp))
(cons (dump-cons sexp))
+ (string (dump-string sexp))
(array (dump-array sexp)))))
(if (and recursive (not (symbolp sexp)))
dumped
(let* ((b (lookup-in-lexenv name *environment* 'block))
(multiple-value-p (member 'multiple-value (binding-declarations b))))
(when (null b)
- (error (concat "Unknown block `" (symbol-name name) "'.")))
+ (error "Return from unknown block `~S'." (symbol-name name)))
(push 'used (binding-declarations b))
;; The binding value is the name of a variable, whose value is the
;; unique identifier of the block as exception. We can't use the
((symbolp label) (symbol-name label))
((integerp label) (integer-to-string label)))))
(when (null b)
- (error (concat "Unknown tag `" n "'.")))
+ (error "Unknown tag `~S'" label))
(js!selfcall
"throw ({"
"type: 'tagbody', "
(define-setf-expander %js-vref (var)
(let ((new-value (gensym)))
(unless (stringp var)
- (error "a string was expected"))
+ (error "`~S' is not a string." var))
(values nil
(list var)
(list new-value)
(bq-process (bq-completely-process (cadr x))))
((eq (car x) *comma*) (cadr x))
((eq (car x) *comma-atsign*)
- ;; (error ",@~S after `" (cadr x))
- (error "ill-formed"))
+ (error ",@~S after `" (cadr x)))
;; ((eq (car x) *comma-dot*)
;; ;; (error ",.~S after `" (cadr x))
;; (error "ill-formed"))
(nreconc q (list (list *bq-quote* p)))))
(when (eq (car p) *comma*)
(unless (null (cddr p))
- ;; (error "Malformed ,~S" p)
- (error "Malformed"))
+ (error "Malformed ,~S" p))
(return (cons *bq-append*
(nreconc q (list (cadr p))))))
(when (eq (car p) *comma-atsign*)
- ;; (error "Dotted ,@~S" p)
- (error "Dotted"))
+ (error "Dotted ,@~S" p))
;; (when (eq (car p) *comma-dot*)
;; ;; (error "Dotted ,.~S" p)
;; (error "Dotted"))
(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*))))
(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 "})"))
"return (typeof tmp == 'object' && 'name' in tmp);" *newline*)))
(define-builtin make-symbol (name)
- (type-check (("name" "string" name))
- "({name: name})"))
+ (code "({name: " name "})"))
(define-builtin symbol-name (x)
(code "(" x ").name"))
(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-to-string (x)
+(define-builtin char-code (x)
+ (type-check (("x" "string" x))
+ "x.charCodeAt(0)"))
+
+(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-to-string (x)
+ (js!selfcall
+ "var r = [" x "];" *newline*
+ "r.type = 'character';"
+ "return r"))
+
(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.type == 'character';")))
(define-builtin string-upcase (x)
- (type-check (("x" "string" x))
- "x.toUpperCase()"))
+ (code "make_lisp_string(xstring(" x ").toUpperCase())"))
(define-builtin string-length (x)
- (type-check (("x" "string" x))
- "x.length"))
+ (code x ".length"))
-(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.type = 'character';"
+ "return r;" *newline*))
(define-raw-builtin funcall (func &rest args)
(js!selfcall
"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*
- "return values.apply(this, forcemv(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 () "{}")
(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 functionp (x)
(js!bool (code "(typeof " x " == 'function')")))
(define-builtin write-string (x)
- (type-check (("x" "string" x))
- "lisp.write(x)"))
+ (code "lisp.write(xstring(" x "))"))
(define-builtin make-array (n)
(js!selfcall
(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))
(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)))
(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)
(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*))
projects / jscl.git / blobdiff