From 5d147e125cea69e9a3b12f0ef64c64f42985c65e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 2 Aug 2013 17:35:59 +0200 Subject: Add a unary integer negation operator This allows saying "-1" instead of "builtins.sub 0 1". --- src/libexpr/parser.y | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/libexpr/parser.y') diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index 964527be6763..4a59a0875eb8 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); } -- cgit 1.4.1