aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2013-08-02 17:35:59 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2013-08-02 15:43:31 +0000
commit5d147e125cea69e9a3b12f0ef64c64f42985c65e (patch)
tree0e9611fb64739f094fe0652ff71586c9ad7fd368 /src
parent159e621d1a9c4391b53f3d822109c36931934698 (diff)
Add a unary integer negation operator
This allows saying "-1" instead of "builtins.sub 0 1".
Diffstat (limited to 'src')
-rw-r--r--src/libexpr/parser.y6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index 964527be6..4a59a0875 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -270,11 +270,12 @@ void yyerror(YYLTYPE * loc, yyscan_t scanner, ParseData * data, const char * err
%left AND
%nonassoc EQ NEQ
%right UPDATE
-%left NEG
+%left NOT
%left '+'
%right CONCAT
%nonassoc '?'
%nonassoc '~'
+%nonassoc NEGATE
%%
@@ -306,7 +307,8 @@ expr_if
;
expr_op
- : '!' expr_op %prec NEG { $$ = new ExprOpNot($2); }
+ : '!' expr_op %prec NOT { $$ = new ExprOpNot($2); }
+ | '-' expr_op %prec NEGATE { $$ = new ExprApp(new ExprApp(new ExprVar(data->symbols.create("__sub")), new ExprInt(0)), $2); }
| expr_op EQ expr_op { $$ = new ExprOpEq($1, $3); }
| expr_op NEQ expr_op { $$ = new ExprOpNEq($1, $3); }
| expr_op AND expr_op { $$ = new ExprOpAnd($1, $3); }