From 0d1f9ff76aa6df3f17edd2d73c76ab444fec8528 Mon Sep 17 00:00:00 2001 From: Sébastien Dailly Date: Mon, 2 Jan 2017 17:56:04 +0100 Subject: Corrected some issues with odf documents --- expressionParser.mly | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'expressionParser.mly') diff --git a/expressionParser.mly b/expressionParser.mly index a4d0716..ac3f71d 100755 --- a/expressionParser.mly +++ b/expressionParser.mly @@ -48,6 +48,7 @@ content: basic: | num {Num ((snd $1), Some (u(fst $1)))} | MINUS num {Num (Num.minus_num (snd $2), Some (u("-" ^(fst $2)) ))} + | PLUS num {Num ((snd $2), Some (u(fst $2)))} | NUM DIVIDE NUM DIVIDE NUM { Date (Tools.Date.get_julian_day (Num.int_of_num @@ snd $1) @@ -57,7 +58,8 @@ basic: expr: | num {Value (Num ((snd $1), Some (u(fst $1))))} - | MINUS num {Value (Num (Num.minus_num (snd $2), Some (u("-" ^(fst $2)) )))} + | MINUS expr {Call (F.sub, [$2])} + | PLUS expr {Call (F.add, [$2])} | LETTERS ident LPAREN separated_list(SEMICOLON, expr) RPAREN { Call (u($1 ^ $2), $4) } -- cgit v1.2.3