From 64c230d2222e53e754c8d8636fc6cb2c6eda7e0c Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Fri, 27 Jul 2012 13:47:01 +0200 Subject: [PATCH] Parsing a comma as an operator now - unless noop is true --- lexer.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lexer.c b/lexer.c index 1bea430..3f1aa76 100644 --- a/lexer.c +++ b/lexer.c @@ -464,8 +464,6 @@ int lex_do(lex_file *lex) case '[': case ']': - case ',': - case '#': return (lex->tok->ttype = ch); @@ -491,12 +489,22 @@ int lex_do(lex_file *lex) case '|': case '^': case '~': + case ',': return ch; default: break; } } + if (ch == ',') { + if (!lex_tokench(lex, ch) || + !lex_endtoken(lex)) + { + return (lex->tok->ttype = TOKEN_FATAL); + } + return (lex->tok->ttype = TOKEN_OPERATOR); + } + if (ch == '+' || ch == '-' || /* ++, --, +=, -= and -> as well! */ ch == '>' || ch == '<' || /* <<, >>, <=, >= */ ch == '=' || /* == */ -- 2.39.2