[ properly translate words that include hyphens and also upper case l…

…etters ]
jbr · Dec 5, 2010 · fab4221 · fab4221
1 parent 3027be7
commit fab4221
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/lib/browser.js b/lib/browser.js
@@ -553,7 +553,7 @@
                 })();
               } else {
                 return (function() {
-                  if ((typeof(token) === "string" && token.match(/^\$?[*\.a-z-]+([0-9])*(!|\?)?$/))) {
+                  if ((typeof(token) === "string" && token.match((new RegExp(("^" + sibilant.tokens.literal + "$"), undefined))))) {
                     return literal(token);
                   } else {
                     return (function() {

diff --git a/lib/sibilant.js b/lib/sibilant.js
@@ -446,7 +446,7 @@ var translate = (function(token, hint) {
               })();
             } else {
               return (function() {
-                if ((typeof(token) === "string" && token.match(/^\$?[*\.a-z-]+([0-9])*(!|\?)?$/))) {
+                if ((typeof(token) === "string" && token.match((new RegExp(("^" + sibilant.tokens.literal + "$"), undefined))))) {
                   return literal(token);
                 } else {
                   return (function() {

diff --git a/src/core.lisp b/src/core.lisp
@@ -311,7 +311,8 @@
 	 (if (defined? (get macros (translate (first token))))
 	     (apply (get macros (translate (first token))) (token.slice 1))
 	   (apply (get macros (or hint 'call)) token))
-       (if (and (string? token) (token.match /^\$?[*\.a-z-]+([0-9])*(!|\?)?$/))
+       (if (and (string? token)
+                (token.match (regex (concat "^" sibilant.tokens.literal "$"))))
 	   (literal token)
 	 (if (and (string? token) (token.match (regex "^;")))
 	     (token.replace (regex "^;+") "//")

diff --git a/test/test.lisp b/test/test.lisp
@@ -34,6 +34,7 @@
 (assert-translation "-10.2"    "-10.2")
 (assert-translation "hello"    "hello")
 (assert-translation "hi-world" "hiWorld")
+(assert-translation "(Object.to-string)" "Object.toString();")
 (assert-translation "1two"     "1\ntwo")
 (assert-translation "t1"       "t1")
 (assert-translation "JSON"     "JSON")