From 6274a448675366ab4871bf5d8de90cf10f3cf868 Mon Sep 17 00:00:00 2001 From: Vladimir Sedach Date: Wed, 3 Dec 2008 22:50:17 -0700 Subject: [PATCH] Renamed symbol-to-js to symbol-to-js-string and exported it. --- src/compiler.lisp | 2 +- src/namespace.lisp | 4 ++-- src/package.lisp | 1 + src/utils.lisp | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/compiler.lisp b/src/compiler.lisp index 2284970..3f0cc79 100644 --- a/src/compiler.lisp +++ b/src/compiler.lisp @@ -331,7 +331,7 @@ gensym-prefix-string)." (list symbol)) (if prefix `(,symbol (ps-gensym ,prefix)) - `(,symbol (ps-gensym ,(symbol-to-js symbol)))))) + `(,symbol (ps-gensym ,(symbol-to-js-string symbol)))))) symbols) ,@body)) diff --git a/src/namespace.lisp b/src/namespace.lisp index 06a527a..10cc92c 100644 --- a/src/namespace.lisp +++ b/src/namespace.lisp @@ -36,5 +36,5 @@ designated package when translating ParenScript code." (defun js-translate-symbol (symbol) (let ((possibly-obfuscated-symbol (maybe-obfuscate-symbol symbol))) (if (ps-package-prefix (symbol-package symbol)) - (format nil "~A~A" (ps-package-prefix (symbol-package symbol)) (symbol-to-js possibly-obfuscated-symbol)) - (symbol-to-js possibly-obfuscated-symbol)))) + (format nil "~A~A" (ps-package-prefix (symbol-package symbol)) (symbol-to-js-string possibly-obfuscated-symbol)) + (symbol-to-js-string possibly-obfuscated-symbol)))) diff --git a/src/package.lisp b/src/package.lisp index 4992492..4e2f390 100644 --- a/src/package.lisp +++ b/src/package.lisp @@ -218,6 +218,7 @@ #:unobfuscate-package ;; printer + #:symbol-to-js-string #:*js-string-delimiter* #:*js-inline-string-delimiter* #:*ps-print-pretty* diff --git a/src/utils.lisp b/src/utils.lisp index d3b6ccc..f87bc59 100644 --- a/src/utils.lisp +++ b/src/utils.lisp @@ -53,7 +53,7 @@ (and (> (length string) 1) (char= #\: (char string 0)))) -(defun symbol-to-js (symbol) +(defun symbol-to-js-string (symbol) "Given a Lisp symbol or string, produces to a valid JavaScript identifier by following transformation heuristics case conversion. For example, paren-script becomes parenScript, *some-global* becomes @@ -94,7 +94,7 @@ SOMEGLOBAL." (reschar i))) (t (reschar c)))))) (coerce (nreverse res) 'string))) - (t (string-join (mapcar #'symbol-to-js symbols) ""))))) + (t (string-join (mapcar #'symbol-to-js-string symbols) ""))))) (defun ordered-set-difference (list1 list2 &key (test #'eql)) ; because the CL set-difference may not preserve order (reduce (lambda (list el) (remove el list :test test)) -- 2.20.1