Clifford Wolf:

	Another cleanup in expression handling



git-svn-id: http://svn.clifford.at/openscad/trunk@43 b57f626f-c46c-0410-a088-ec61d464b74c

1 files changed, 8 insertions, 19 deletions

diff --git a/lexer.l b/lexer.l
index dd35aa1..4ec72b7 100644
--- a/lexer.l
+++ b/lexer.l
@@ -55,29 +55,18 @@ extern const char *parser_input_buffer;
 "$"?[a-zA-Z0-9_]+ { parserlval.text = strdup(yytext); return TOK_ID; }
 \"[^"]*\" { parserlval.text = strdup(yytext); return TOK_STRING; }
 
-"."	return '.';
-","	return ',';
-";"	return ';';
-"?"	return '?';
-":"	return ':';
-"="	return '=';
-"*"	return '*';
-"/"	return '/';
-"%"	return '%';
-"+"	return '+';
-"-"	return '-';
-"("	return '(';
-")"	return ')';
-"{"	return '{';
-"}"	return '}';
-"["	return '[';
-"]"	return ']';
-
 [\n\r\t ]
 \/\/[^\n]*\n
 "/*" BEGIN(comment);
 <comment>"*/" BEGIN(INITIAL);
 <comment>.|\n
 
-. { fprintf(stderr, "Unrecognized input character in line %d: %s\n", lexerget_lineno(), yytext); exit(1); }
+"<="	return LE;
+">="	return GE;
+"=="	return EQ;
+"!="	return NE;
+"&&"	return AND;
+"||"	return OR;
+
+. { return yytext[0]; }