modified ometa and js compilers to use <...> where appropriate

alexwarth · Jun 28, 2011 · 2e4dae4 · 2e4dae4
1 parent 1737db9
commit 2e4dae4
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 20 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
@@ -1,18 +1,16 @@
-ometa BSJSParser <: Parser {
-  fromTo :x :y = seq(x) (~seq(y) char)* seq(y), 
+ometa BSJSParser {
   space        = ^space | fromTo('//', '\n') | fromTo('/*', '*/'),
   nameFirst    = letter | '$' | '_',
   nameRest     = nameFirst | digit,
-  iName        = firstAndRest(#nameFirst, #nameRest):r                               -> r.join(''),
+  iName        = <nameFirst nameRest*>,
   isKeyword :x = ?BSJSParser._isKeyword(x),
   name         = iName:n ~isKeyword(n)                                               -> [#name, n=='self' ? '$elf' : n],
   keyword      = iName:k isKeyword(k)                                                -> [k, k],
   hexDigit     = char:x {this.hexDigits.indexOf(x.toLowerCase())}:v ?(v >= 0)        -> v,
   hexLit       = hexLit:n hexDigit:d                                                 -> (n * 16 + d)
                | hexDigit,
   number       = ``0x'' hexLit:n                                                     -> [#number, n]
-               | digit+:ws ('.' digit+ | empty -> []):fs                             -> [#number, parseFloat(ws.join('') + '.' +
-                                                                                                             fs.join(''))],
+               | <digit+ ('.' digit+)?>:f                                            -> [#number, parseFloat(f)],
   escapeChar   = '\\' char:c                                                         -> unescape('\\' + c),
   str          = seq('"""')  (escapeChar | ~seq('"""') char)*:cs seq('"""')          -> [#string, cs.join('')]
                | '\'' (escapeChar | ~'\'' char)*:cs '\''                             -> [#string, cs.join('')]