examples: d: fix the handling of unary +

It was interpreting "+exp" as "-exp".

* examples/d/calc.y: Fix.
* examples/d/calc.test: Check it.

2 files changed, 11 insertions, 1 deletions

diff --git a/examples/d/calc.test b/examples/d/calc.test
index cf4f80a8..6b237592 100644
--- a/examples/d/calc.test
+++ b/examples/d/calc.test
@@ -21,6 +21,16 @@ EOF
 run 0 7
 
 cat >input <<EOF
++1 + +2 * +3
+EOF
+run 0 7
+
+cat >input <<EOF
+-1 + -2 * -3
+EOF
+run 0 5
+
+cat >input <<EOF
 1 + 2 * * 3
 EOF
 run 1 "err: syntax error, unexpected *, expecting + or - or ( or number"
diff --git a/examples/d/calc.y b/examples/d/calc.y
index b0dee929..15b4f7c7 100644
--- a/examples/d/calc.y
+++ b/examples/d/calc.y
@@ -61,7 +61,7 @@ exp:
 | exp "-" exp          { $$ = $1 - $3; }
 | exp "*" exp          { $$ = $1 * $3; }
 | exp "/" exp          { $$ = $1 / $3; }
-| "+" exp  %prec UNARY { $$ = -$2; }
+| "+" exp  %prec UNARY { $$ = $2; }
 | "-" exp  %prec UNARY { $$ = -$2; }
 | "(" exp ")"          { $$ = $2; }
 ;