Treat colons and commas as end of input in expression parser

[fio.git] / exp / expression-parser.l

diff --git a/exp/expression-parser.l b/exp/expression-parser.l
index a0c6b24d362ed59d6fc991d81f993477055c935f..c084db6a1885786f84a015c726ebf8b870eaa06b 100644 (file)
--- a/exp/expression-parser.l
+++ b/exp/expression-parser.l
@@ -109,7 +109,7 @@ bye         return BYE;
                        return SUFFIX;
                }
 [ \t] ; /* ignore whitespace */
-#.+ ; /* ignore comments */
+[#:,].* ; /* ignore comments, and everything after colons and commas */
 [0-9]*[.][0-9]+ {
                        int rc;
                        double dval;
@@ -158,7 +158,7 @@ bye         return BYE;
                }
        }
 \n     return 0;
-[+-/*()^]      return yytext[0];
+[+-/*()^%]     return yytext[0];
 
 .      {
                yylval.v.has_error = 1;