Implement all operators specified for GLSL #if expressions (with tests).

The operator coverage here is quite complete. The one big thing
missing is that we are not yet doing macro expansion in #if
lines. This makes the whole support fairly useless, so we plan to fix
that shortcoming right away.

1 files changed, 45 insertions, 0 deletions

diff --git a/glcpp-lex.l b/glcpp-lex.l
index 825ce3d370..84166fb76f 100644
--- a/glcpp-lex.l
+++ b/glcpp-lex.l
@@ -66,6 +66,51 @@ TOKEN		[^[:space:](),]+
 	return INTEGER;
 }
 
+<ST_IF>"defined" {
+	return DEFINED;
+}
+
+<ST_IF>"<<" {
+	return LEFT_SHIFT;
+}
+
+<ST_IF>">>" {
+	return RIGHT_SHIFT;
+}
+
+<ST_IF>"<=" {
+	return LESS_OR_EQUAL;
+}
+
+<ST_IF>">=" {
+	return GREATER_OR_EQUAL;
+}
+
+<ST_IF>"==" {
+	return EQUAL;
+}
+
+<ST_IF>"!=" {
+	return NOT_EQUAL;
+}
+
+<ST_IF>"&&" {
+	return AND;
+}
+
+<ST_IF>"||" {
+	return OR;
+}
+
+<ST_IF>[-+*/%<>&^|()] {
+	return yytext[0];
+}
+
+<ST_IF>{IDENTIFIER} {
+	yylval.str = xtalloc_strdup (yyextra, yytext);
+	return IDENTIFIER;
+}
+
 <ST_IF>{HSPACE}+
 
 <ST_IF>\n {