summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorkpdecker <kpdecker@gmail.com>2014-01-17 20:42:02 -0600
committerkpdecker <kpdecker@gmail.com>2014-01-17 20:42:02 -0600
commitd4cfe90959c5a585e5d87e31038eb2f0432f87a5 (patch)
tree6a7699604f3165f7e089c899ca6b34d1f3a7def2 /src
parent051618c024333404746795304f5858f3ef56a215 (diff)
downloadhandlebars.js-d4cfe90959c5a585e5d87e31038eb2f0432f87a5.zip
handlebars.js-d4cfe90959c5a585e5d87e31038eb2f0432f87a5.tar.gz
handlebars.js-d4cfe90959c5a585e5d87e31038eb2f0432f87a5.tar.bz2
Allow decimal number values
Fixes #472
Diffstat (limited to 'src')
-rw-r--r--src/handlebars.l2
-rw-r--r--src/handlebars.yy4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/handlebars.l b/src/handlebars.l
index 996badb..630840e 100644
--- a/src/handlebars.l
+++ b/src/handlebars.l
@@ -77,7 +77,7 @@ ID [^\s!"#%-,\.\/;->@\[-\^`\{-~]+/{LOOKAHEAD}
<mu>"@" return 'DATA';
<mu>"true"/{LITERAL_LOOKAHEAD} return 'BOOLEAN';
<mu>"false"/{LITERAL_LOOKAHEAD} return 'BOOLEAN';
-<mu>\-?[0-9]+/{LITERAL_LOOKAHEAD} return 'INTEGER';
+<mu>\-?[0-9]+(?:\.[0-9]+)?/{LITERAL_LOOKAHEAD} return 'NUMBER';
<mu>{ID} return 'ID';
diff --git a/src/handlebars.yy b/src/handlebars.yy
index bac1cc9..40f68ce 100644
--- a/src/handlebars.yy
+++ b/src/handlebars.yy
@@ -79,7 +79,7 @@ sexpr
param
: path -> $1
| STRING -> new yy.StringNode($1, @$)
- | INTEGER -> new yy.IntegerNode($1, @$)
+ | NUMBER -> new yy.NumberNode($1, @$)
| BOOLEAN -> new yy.BooleanNode($1, @$)
| dataName -> $1
| OPEN_SEXPR sexpr CLOSE_SEXPR {$2.isHelper = true; $$ = $2;}
@@ -96,7 +96,7 @@ hashSegment
partialName
: path -> new yy.PartialNameNode($1, @$)
| STRING -> new yy.PartialNameNode(new yy.StringNode($1, @$), @$)
- | INTEGER -> new yy.PartialNameNode(new yy.IntegerNode($1, @$))
+ | NUMBER -> new yy.PartialNameNode(new yy.NumberNode($1, @$))
;
dataName