diff options
| author | kpdecker <kpdecker@gmail.com> | 2013-04-06 15:18:30 -0500 |
|---|---|---|
| committer | kpdecker <kpdecker@gmail.com> | 2013-04-06 15:18:30 -0500 |
| commit | ec5882a31aa9c59fe61c94cf6f21dc7c20feb94a (patch) | |
| tree | 5ebeca20e5b0e668942236b69a161317a62181a4 /src | |
| parent | 671c07e6992d3094f3c06f2552fe1ab414ddec44 (diff) | |
| parent | 681f1a63961b04c68dc4e671513675e946f6f3f9 (diff) | |
| download | handlebars.js-ec5882a31aa9c59fe61c94cf6f21dc7c20feb94a.zip handlebars.js-ec5882a31aa9c59fe61c94cf6f21dc7c20feb94a.tar.gz handlebars.js-ec5882a31aa9c59fe61c94cf6f21dc7c20feb94a.tar.bz2 | |
Merge branch 'master' of github.com:jpfiset/handlebars.js into jpfiset-master
Diffstat (limited to 'src')
| -rw-r--r-- | src/handlebars.l | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/handlebars.l b/src/handlebars.l index cbf048d..e7000b3 100644 --- a/src/handlebars.l +++ b/src/handlebars.l @@ -32,7 +32,7 @@ <mu>"{{" { return 'OPEN'; } <mu>"=" { return 'EQUALS'; } -<mu>"."/[} ] { return 'ID'; } +<mu>"."/[}/ ] { return 'ID'; } <mu>".." { return 'ID'; } <mu>[\/.] { return 'SEP'; } <mu>\s+ { /*ignore whitespace*/ } @@ -44,7 +44,7 @@ <mu>"true"/[}\s] { return 'BOOLEAN'; } <mu>"false"/[}\s] { return 'BOOLEAN'; } <mu>\-?[0-9]+/[}\s] { return 'INTEGER'; } -<mu>[a-zA-Z0-9_$-]+/[=}\s\/.] { return 'ID'; } +<mu>[a-zA-Z0-9_$:-]+/[=}\s\/.] { return 'ID'; } <mu>'['[^\]]*']' { yytext = yytext.substr(1, yyleng-2); return 'ID'; } <mu>. { return 'INVALID'; } <par>\s+ { /*ignore whitespace*/ } |