Mercurial > repos > tabletprog
changeset 292:f73ebc146af9
Fix ws rule to include block comments
author | Michael Pavone <pavone@retrodev.com> |
---|---|
date | Thu, 24 Jul 2014 09:43:06 -0700 |
parents | 38bbbf74b735 |
children | 2b045d5b673b |
files | parser.js |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/parser.js Tue Jul 22 23:35:08 2014 -0700 +++ b/parser.js Thu Jul 24 09:43:06 2014 -0700 @@ -196,7 +196,7 @@ var grammar = 'start = ws module:(object / lambda) ws { return module; };' + -'ws = ([ \\t\\n\\r] / "//" [^\\n]* "\\n")*;' + +'ws = ([ \\t\\n\\r] / "//" [^\\n]* "\\n" / "/*" ([^*] / "*" ! "/")* "*/")*;' + 'hws = ([ \\t] / "/*" ([^*] / "*" ! "/")* "*/" )*;' + 'expr = e:(funcall / methcall / assignment / opexpr) ws { return e; };' + 'opexpr = left:compareop pieces:(hws ("&&" / "||") ws compareop)* { if (pieces.length) { var cur = new op(left, pieces[0][1], pieces[0][3]); for (var i = 1; i < pieces.length; i++) { cur = new op(cur, pieces[i][1], pieces[i][3]); } return cur; } else { return left; } };'+