diff options
Diffstat (limited to 'Source/Parser/wp_parser.l')
| -rw-r--r-- | Source/Parser/wp_parser.l | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/Parser/wp_parser.l b/Source/Parser/wp_parser.l index 9c54ab06c..8e70203cb 100644 --- a/Source/Parser/wp_parser.l +++ b/Source/Parser/wp_parser.l @@ -44,6 +44,12 @@ EXP ([Ee][-+]?[0-9]+) "fabs" { yylval.f1 = WP_ABS; return F1; } "**" { yylval.f2 = WP_POW; return POW;} "^" { yylval.f2 = WP_POW; return POW;} +">=" { yylval.f2 = WP_GEQ; return GEQ;} +"<=" { yylval.f2 = WP_LEQ; return LEQ;} +"==" { yylval.f2 = WP_EQ; return EQ;} +"!=" { yylval.f2 = WP_NEQ; return NEQ;} +"and" { yylval.f2 = WP_AND; return AND;} +"or" { yylval.f2 = WP_OR; return OR;} "pow" { yylval.f2 = WP_POW; return F2; } "heaviside" { yylval.f2 = WP_HEAVISIDE; return F2; } "min" { yylval.f2 = WP_MIN; return F2; } @@ -57,8 +63,8 @@ EXP ([Ee][-+]?[0-9]+) "."?[0-9]+{EXP}? { yylval.d = atof(yytext); return NUMBER; } /* Special characters */ -"//".* -[ \t] /* ignore white space */ +"//".* +[ \t] /* ignore white space */ \\\n /* ignore line continuation */ "\n" { return EOL; } |