;; You should have received a copy of the GNU General Public License
;; along with JSCL. If not, see <http://www.gnu.org/licenses/>.
+(/debug "loading print.lisp!")
+
;;; Printer
+(defun lisp-escape-string (string)
+ (let ((output "")
+ (index 0)
+ (size (length string)))
+ (while (< index size)
+ (let ((ch (char string index)))
+ (when (or (char= ch #\") (char= ch #\\))
+ (setq output (concat output "\\")))
+ (when (or (char= ch #\newline))
+ (setq output (concat output "\\"))
+ (setq ch #\n))
+ (setq output (concat output (string ch))))
+ (incf index))
+ (concat "\"" output "\"")))
+
;;; 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)
+(defun escape-symbol-name-p (s)
(let ((dots-only t))
(dotimes (i (length s))
(let ((ch (char s i)))
(setf dots-only (and dots-only (char= ch #\.)))
(when (or (terminalp ch)
(char= ch #\:)
- (and uppercase (not (char= ch (char (string-upcase (string ch)) 0))))
(char= ch #\\)
+ (not (char= ch (char-upcase ch)))
(char= ch #\|))
(return-from escape-symbol-name-p t))))
dots-only))
#+nil
(mapcar #'potential-number-p '("/" "/5" "+" "1+" "1-" "foo+" "ab.cd" "_" "^" "^/-"))
-(defun escape-token-p (string &optional uppercase)
+(defun escape-token-p (string)
(or (potential-number-p string)
- (escape-symbol-name-p string uppercase)))
+ (escape-symbol-name-p string)))
;;; 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)
+(defun escape-token (s)
+ (if (escape-token-p s)
(let ((result "|"))
(dotimes (i (length s))
(let ((ch (char s i)))
(defvar *print-circle* nil)
;;; FIXME: Please, rewrite this in a more organized way.
-(defun write-to-string (form &optional known-objects object-ids)
+(defun !write-to-string (form &optional known-objects object-ids)
(when (and (not known-objects) *print-circle*)
;; To support *print-circle* some objects must be tracked for
;; sharing: conses, arrays and apparently-uninterned symbols.
(setf prefix (format nil "#~S=" id))
(aset object-ids ix (- id)))
((and id (< id 0))
- (return-from write-to-string (format nil "#~S#" (- id)))))))
+ (return-from !write-to-string (format nil "#~S#" (- id)))))))
(concat prefix
(cond
((null form) "NIL")
;; 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*)))
+ (escape-token (symbol-name form))
;; 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 (escape-token (package-name package) t)))
+ (t (escape-token (package-name package))))
":"
(if (and package
(eq (second (multiple-value-list
- (find-symbol name package)))
+ (find-symbol name package)))
:internal))
":"
"")
- (escape-token name (not (eq package *js-package*)))))))
+ (escape-token name)))))
((integerp form) (integer-to-string form))
((floatp form) (float-to-string form))
((characterp form)
(lisp-escape-string form)
form))
((functionp form)
- (let ((name (oget form "fname")))
+ (let ((name #+jscl (oget form "fname")
+ #-jscl "noname"))
(if name
(concat "#<FUNCTION " name ">")
(concat "#<FUNCTION>"))))
((listp form)
(concat "("
(join-trailing (mapcar (lambda (x)
- (write-to-string x known-objects object-ids))
+ (!write-to-string x known-objects object-ids))
(butlast form)) " ")
(let ((last (last form)))
(if (null (cdr last))
- (write-to-string (car last) known-objects object-ids)
- (concat (write-to-string (car last) known-objects object-ids)
+ (!write-to-string (car last) known-objects object-ids)
+ (concat (!write-to-string (car last) known-objects object-ids)
" . "
- (write-to-string (cdr last) known-objects object-ids))))
+ (!write-to-string (cdr last) known-objects object-ids))))
")"))
((vectorp form)
(let ((result "#(")
(sep ""))
(dotimes (i (length form))
(setf result (concat result sep
- (write-to-string (aref form i)
- known-objects
- object-ids)))
+ (!write-to-string (aref form i)
+ known-objects
+ object-ids)))
(setf sep " "))
(concat result ")")))
((packagep form)
(concat "#<PACKAGE " (package-name form) ">"))
(t "#<javascript object>")))))
+#+jscl
+(fset 'write-to-string (fdefinition '!write-to-string))
+
+
(defun prin1-to-string (form)
(let ((*print-escape* t))
(write-to-string form)))
(let ((*print-escape* nil))
(write-to-string form)))
+(defun terpri ()
+ (write-char #\newline)
+ (values))
+
(defun write-line (x)
(write-string x)
- (write-string *newline*)
+ (terpri)
x)
-(defun warn (string)
+(defun warn (fmt &rest args)
(write-string "WARNING: ")
- (write-line string))
+ (apply #'format t fmt args)
+ (terpri))
(defun print (x)
(write-line (prin1-to-string x))
((char= next #\~)
(concatf res "~"))
((char= next #\%)
- (concatf res *newline*))
+ (concatf res (string #\newline)))
((char= next #\*)
(pop arguments))
(t
res)))
(defun format-special (chr arg)
- (case chr
+ (case (char-upcase chr)
(#\S (prin1-to-string arg))
- (#\a (princ-to-string arg))))
+ (#\A (princ-to-string arg))
+ (#\D (princ-to-string arg))
+ (t
+ (warn "~S is not implemented yet, using ~~S instead" chr)
+ (prin1-to-string arg))))
projects / jscl.git / blobdiff