diff options
| -rw-r--r-- | src/libexpr/parser.y | 6 | ||||
| -rw-r--r-- | tests/lang/eval-okay-arithmetic.exp | 2 | ||||
| -rw-r--r-- | tests/lang/eval-okay-arithmetic.nix | 7 |
3 files changed, 11 insertions, 4 deletions
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index 964527be67..4a59a0875e 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); } diff --git a/tests/lang/eval-okay-arithmetic.exp b/tests/lang/eval-okay-arithmetic.exp index 861c12661a..f625eb6ab6 100644 --- a/tests/lang/eval-okay-arithmetic.exp +++ b/tests/lang/eval-okay-arithmetic.exp @@ -1 +1 @@ -1854 +1843 diff --git a/tests/lang/eval-okay-arithmetic.nix b/tests/lang/eval-okay-arithmetic.nix index 1f45b122a2..76bef919bd 100644 --- a/tests/lang/eval-okay-arithmetic.nix +++ b/tests/lang/eval-okay-arithmetic.nix @@ -16,6 +16,11 @@ let { range = range_ []; */ - body = sum (range 1 50) + 123 + 456; + x = 12; + body = sum + [ (sum (range 1 50)) + (123 + 456) + (0 + -10 + -(-11) + -x) + ]; } |