josh/fart
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added <= and >= operators

Browse Source 
git-svn-id: svn://anubis/fart/trunk@345 7f9b0f55-74a9-4bce-be96-3c2cd072584d
This commit is contained in:
Josh Holtrop 2010-10-06 20:36:48 +00:00
parent 700e47901b
commit c4fc36bb5c
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
parser/nodes.cc
View File

@ -95,9 +95,15 @@ NodeRef BoolExpressionNode::evaluate()
case '<': case '<':
r = o < t ? 0 : 1; r = o < t ? 0 : 1;
break; break;
case 'l':
r = o <= t ? 0 : 1;
break;
case '>': case '>':
r = o > t ? 0 : 1; r = o > t ? 0 : 1;
break; break;
case 'g':
r = o >= t ? 0 : 1;
break;
case '=': case '=':
r = o == t ? 0 : 1; r = o == t ? 0 : 1;
break; break;

3
parser/parser.lex
View File

@ -38,7 +38,8 @@
\( return LPAREN; \( return LPAREN;
\) return RPAREN; \) return RPAREN;
\< return LESS; \< return LESS;
\> return GREATER; \<= return LESSEQ;
\>= return GREATEREQ;
[0-9]+ *yylval = new NumberNode(atof(yytext)); return REAL_NUMBER; [0-9]+ *yylval = new NumberNode(atof(yytext)); return REAL_NUMBER;
[0-9]*\.[0-9]+ *yylval = new NumberNode(atof(yytext)); return REAL_NUMBER; [0-9]*\.[0-9]+ *yylval = new NumberNode(atof(yytext)); return REAL_NUMBER;

8
parser/parser.yy
View File

@ -59,7 +59,9 @@ refptr<Scope> parser_scope;
%token LPAREN; %token LPAREN;
%token RPAREN; %token RPAREN;
%token LESS; %token LESS;
%token LESSEQ;
%token GREATER; %token GREATER;
%token GREATEREQ;
%token REAL_NUMBER; %token REAL_NUMBER;
@ -603,9 +605,15 @@ stmt_expression: assignment { $$ = $1; }
bool_expression: expression LESS expression { bool_expression: expression LESS expression {
$$ = new BoolExpressionNode('<', $1, $3); $$ = new BoolExpressionNode('<', $1, $3);
} }
| expression LESSEQ expression {
$$ = new BoolExpressionNode('l', $1, $3);
}
| expression GREATER expression { | expression GREATER expression {
$$ = new BoolExpressionNode('>', $1, $3); $$ = new BoolExpressionNode('>', $1, $3);
} }
| expression GREATEREQ expression {
$$ = new BoolExpressionNode('g', $1, $3);
}
| expression EQUALS expression { | expression EQUALS expression {
$$ = new BoolExpressionNode('=', $1, $3); $$ = new BoolExpressionNode('=', $1, $3);
} }