Move unescape() to String.prototype

veged · Nov 15, 2009 · e566d88 · e566d88
1 parent 04d49a6
commit e566d88
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/bs-js-compiler.js b/bs-js-compiler.js
diff --git a/bs-js-compiler.txt b/bs-js-compiler.txt
@@ -10,7 +10,7 @@ ometa BSJSParser <: Parser {
   number       = digit+:ws ('.' digit+ | empty -> []):fs                                         -> [#number,
                                                                                                      parseFloat(ws.join('') + '.' +
                                                                                                                 fs.join(''))],
-  escapeChar   = '\\' char:c                                                                     -> unescape('\\' + c),
+  escapeChar   = '\\' char:c                                                                     -> ('\\' + c).unescape(),
   str          = seq('"""')  (escapeChar | ~seq('"""') char)*:cs seq('"""')                      -> [#string, cs.join('')]
                | '\'' (escapeChar | ~'\'' char)*:cs '\''                                         -> [#string, cs.join('')]
                | '"'  (escapeChar | ~'"'  char)*:cs '"'                                          -> [#string, cs.join('')]

diff --git a/bs-ometa-compiler.js b/bs-ometa-compiler.js
diff --git a/bs-ometa-compiler.txt b/bs-ometa-compiler.txt
@@ -5,7 +5,7 @@ ometa BSOMetaParser <: Parser {
   nameRest       = nameFirst | digit,
   tsName         = firstAndRest(#nameFirst, #nameRest):xs              -> xs.join(''),
   name           = spaces tsName,
-  eChar          = '\\' char:c                                         -> unescape('\\' +c)
+  eChar          = '\\' char:c                                         -> ('\\' + c).unescape()
                  | char,
   tsString       = '\'' (~'\'' eChar)*:xs '\''                         -> xs.join(''),
   characters     = '`' '`' (~('\'' '\'') eChar)*:xs '\'' '\''          -> [#App, #seq,     xs.join('').toProgramString()],

diff --git a/lib.js b/lib.js
@@ -145,7 +145,8 @@ escapeChar = function(c) {
   return charCode > 255 ? String.fromCharCode(charCode) : escapeStringFor[charCode]
 }
 
-function unescape(s) {
+function unescape() {
+  var s = arguments[0] || this;
   if (s[0] == '\\')
     switch (s[1]) {
       case '\\': return '\\'
@@ -157,6 +158,7 @@ function unescape(s) {
   else
     return s
 }
+String.prototype.unescape= unescape;
 
 String.prototype.toProgramString = function() {
   var ws = "\"".writeStream()