diff options
| author | Sébastien Dailly <sebastien@chimrod.com> | 2017-01-02 17:56:04 +0100 |
|---|---|---|
| committer | Sébastien Dailly <sebastien@chimrod.com> | 2017-01-10 14:35:04 +0100 |
| commit | 0d1f9ff76aa6df3f17edd2d73c76ab444fec8528 (patch) | |
| tree | e6a628b78a08beb7fd9912c3f4b9bbdcee59c3c4 /expressionParser.mly | |
| parent | 444c0baa87b6edfb21c002bf9e079e10509ee0e9 (diff) | |
Corrected some issues with odf documents
Diffstat (limited to 'expressionParser.mly')
| -rwxr-xr-x | expressionParser.mly | 4 |
1 files changed, 3 insertions, 1 deletions
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) } |