;;; Printer
-(defun special-symbol-name (s &key uppercase)
+;;; Return T if the string S contains characters which need to be
+;;; escaped to print the symbol name, NIL otherwise.
+(defun escape-symbol-name-p (s &optional uppercase)
(let ((dots-only t))
(dotimes (i (length s))
(let ((ch (char s i)))
(and uppercase (not (char= ch (char (string-upcase (string ch)) 0))))
(char= ch #\\)
(char= ch #\|))
- (return-from special-symbol-name t))))
+ (return-from escape-symbol-name-p t))))
dots-only))
-(defun potential-number (s)
- (let ((i 0)
- (n (length s))
- (ch nil))
- (flet ((next ()
- (setf ch (and (< i n) (char s (1- (incf i)))))))
- (next)
+;;; Return T if the specified string can be read as a number
+;;; In case such a string is the name of a symbol then escaping
+;;; is required when printing to ensure correct reading.
+(defun potential-number-p (string)
+ ;; The four rules for being a potential number are described in
+ ;; 2.3.1.1 Potential Numbers as Token
+ ;;
+ ;; First Rule
+ (dotimes (i (length string))
+ (let ((char (char string i)))
(cond
- ((null ch) (return-from potential-number))
- ((digit-char-p ch))
- ((char= ch #\.))
- ((char= ch #\+) (next))
- ((char= ch #\-) (next))
- (t (return-from potential-number)))
- (when ch
- (while (and ch (digit-char-p ch)) (next))
- (when (null ch)
- (return-from potential-number t)))
- (when (char= ch #\.)
- (next)
- (when ch
- (while (and ch (digit-char-p ch)) (next))))
- (when (or (char= ch #\E) (char= ch #\e)
- (char= ch #\D) (char= ch #\d)
- (char= ch #\F) (char= ch #\f)
- (char= ch #\L) (char= ch #\l))
- (next)
- (cond
- ((null ch) (return-from potential-number))
- ((digit-char-p ch))
- ((char= ch #\+) (next))
- ((char= ch #\-) (next))
- (t (return-from potential-number)))
- (unless (and ch (digit-char-p ch))
- (return-from potential-number))
- (while (and ch (digit-char-p ch)) (next)))
- (null ch))))
-
-(defun special-escape (s package)
- (return-from special-escape s)
- (if (or (potential-number s)
- (special-symbol-name s :uppercase (not (eq package (find-package "JS")))))
+ ;; Digits TODO: DIGIT-CHAR-P should work with the current
+ ;; radix here. If the radix is not decimal, then we have to
+ ;; make sure there is not a decimal-point in the string.
+ ((digit-char-p char))
+ ;; Signs, ratios, decimal point and extension mark
+ ((find char "+-/._^"))
+ ;; Number marker
+ ((alpha-char-p char)
+ (when (and (< i (1- (length string)))
+ (alpha-char-p (char string (1+ i))))
+ ;; fail: adjacent letters are not number marker, or
+ ;; there is a decimal point in the string.
+ (return-from potential-number-p)))
+ (t
+ ;; fail: there is a non-allowed character
+ (return-from potential-number-p)))))
+ (and
+ ;; Second Rule. In particular string is not empty.
+ (find-if #'digit-char-p string)
+ ;; Third rule
+ (let ((first (char string 0)))
+ (and (not (char= first #\:))
+ (or (digit-char-p first)
+ (find first "+-._^"))))
+ ;; Fourth rule
+ (not (find (char string (1- (length string))) "+-)"))))
+
+#+nil
+(mapcar #'potential-number-p
+ '("1b5000" "777777q" "1.7J" "-3/4+6.7J" "12/25/83" "27^19"
+ "3^4/5" "6//7" "3.1.2.6" "^-43^" "3.141_592_653_589_793_238_4"
+ "-3.7+2.6i-6.17j+19.6k"))
+
+#+nil
+(mapcar #'potential-number-p '("/" "/5" "+" "1+" "1-" "foo+" "ab.cd" "_" "^" "^/-"))
+
+(defun escape-token-p (string &optional uppercase)
+ (or (potential-number-p string)
+ (escape-symbol-name-p string uppercase)))
+
+;;; Returns the token in a form that can be used for reading it back.
+(defun escape-token (s &optional uppercase)
+ (if (escape-token-p s uppercase)
(let ((result "|"))
(dotimes (i (length s))
(let ((ch (char s i)))
(defun write-to-string (form)
(cond
- ((null form) "NIL")
- ((symbolp form)
- (multiple-value-bind (found-symbol status)
- (find-symbol (symbol-name form))
- (if (eq found-symbol form)
- (special-escape (symbol-name form) *package*)
- (let ((package (symbol-package form))
- (name (symbol-name form)))
- (concat (cond
+ ((null form) "NIL")
+ ((symbolp form)
+ (let ((name (symbol-name form))
+ (package (symbol-package form)))
+ ;; Check if the symbol is accesible from the current package. It
+ ;; is true even if the symbol's home package is not the current
+ ;; package, because it could be inherited.
+ (if (eq form (find-symbol (symbol-name form)))
+ (escape-token (symbol-name form) (not (eq package *js-package*)))
+ ;; Symbol is not accesible from *PACKAGE*, so let us prefix
+ ;; the symbol with the optional package or uninterned mark.
+ (concat (cond
((null package) "#")
((eq package (find-package "KEYWORD")) "")
- (t (package-name package)))
- ":"
- (if (eq (cadr (multiple-value-list
- (find-symbol name)))
- :internal)
- ":"
- "")
- (special-escape name package))))))
- ((integerp form) (integer-to-string form))
- ((floatp form) (float-to-string form))
- ((characterp form)
- (concat "#\\"
- (case form
- (#\newline "newline")
- (#\space "space")
- (otherwise (string form)))))
- ((stringp form) (if *print-escape*
- (concat "\"" (escape-string form) "\"")
- form))
- ((functionp form)
- (let ((name (oget form "fname")))
- (if name
- (concat "#<FUNCTION " name ">")
- (concat "#<FUNCTION>"))))
- ((listp form)
- (concat "("
- (join-trailing (mapcar #'write-to-string (butlast form)) " ")
- (let ((last (last form)))
- (if (null (cdr last))
- (write-to-string (car last))
- (concat (write-to-string (car last)) " . " (write-to-string (cdr last)))))
- ")"))
- ((arrayp form)
- (concat "#" (if (zerop (length form))
- "()"
- (write-to-string (vector-to-list form)))))
- ((packagep form)
- (concat "#<PACKAGE " (package-name form) ">"))
- (t
- (concat "#<javascript object>"))))
+ (t (escape-token (package-name package) t)))
+ ":"
+ (if (and package
+ (eq (second (multiple-value-list
+ (find-symbol name package)))
+ :internal))
+ ":"
+ "")
+ (escape-token name (not (eq package *js-package*)))))))
+ ((integerp form) (integer-to-string form))
+ ((floatp form) (float-to-string form))
+ ((characterp form)
+ (concat "#\\"
+ (case form
+ (#\newline "newline")
+ (#\space "space")
+ (otherwise (string form)))))
+ ((stringp form) (if *print-escape*
+ (concat "\"" (escape-string form) "\"")
+ form))
+ ((functionp form)
+ (let ((name (oget form "fname")))
+ (if name
+ (concat "#<FUNCTION " name ">")
+ (concat "#<FUNCTION>"))))
+ ((listp form)
+ (concat "("
+ (join-trailing (mapcar #'write-to-string (butlast form)) " ")
+ (let ((last (last form)))
+ (if (null (cdr last))
+ (write-to-string (car last))
+ (concat (write-to-string (car last)) " . " (write-to-string (cdr last)))))
+ ")"))
+ ((arrayp form)
+ (concat "#" (if (zerop (length form))
+ "()"
+ (write-to-string (vector-to-list form)))))
+ ((packagep form)
+ (concat "#<PACKAGE " (package-name form) ">"))
+ (t
+ (concat "#<javascript object>"))))
(defun prin1-to-string (form)
(let ((*print-escape* t))
projects / jscl.git / blobdiff