Update fold syntax #730
Update fold syntax #730
Conversation
There was a problem hiding this comment.
OK, but shouldn't the new keywords be updated in all the syntax highlighting grammars (https://github.com/CatalaLang/catala/tree/master/syntax_highlighting) as well as the Catala syntax sheat cheet ? I'm using this PR as an exercise to train you to add new syntactic features to Catala @vincent-botbol :)
| @@ -194,7 +197,8 @@ let rec lazy_eval : decl_ctx -> Env.t -> laziness_level -> expr -> expr * Env.t | |||
| | ELit (LInt i) -> Runtime.o_eq_int_int one i | |||
| | ELit (LRat r) -> Runtime.o_eq_rat_rat (Runtime.decimal_of_integer one) r | |||
| | ELit (LMoney m) -> Runtime.o_eq_mon_mon (Runtime.money_of_units_int 1) m | |||
| | ELit (LDuration dt) -> Runtime.duration_to_years_months_days dt = (0, 0, 1) | |||
| | ELit (LDuration dt) -> | |||
| Runtime.duration_to_years_months_days dt = (0, 0, 1) | |||
There was a problem hiding this comment.
These look look like formatting changes, is it that @AltGr didn't use ocamlformaton this file when he merged a previous PR?
There was a problem hiding this comment.
I suppose so
vincent-botbol
force-pushed
the
vbot@update-syntax
branch
2 times, most recently
from
f3d8d4b
to
5d79e34
Compare
vincent-botbol
force-pushed
the
vbot@update-syntax
branch
from
5d79e34
to
ce91795
Compare
Did just that. As agreed, we will remove outdated/unmaintained tooling in a follow-up PR. |
vincent-botbol
force-pushed
the
vbot@update-syntax
branch
from
ce91795
to
22f8e85
Compare
This PR updates the fold syntax to what has been decided during the syntax committee, i.e., #647 (comment)
Warning: reusing the
WITH_Vtoken leads to a shift/reduce conflict in the parser which I can't grasp my head around. Following @denismerigoux suggestion, we'll merge this PR first and address the issue in a follow-up PR.In particular, the last commit removes conflicting error messages which have to be reverted when the issue gets a resolution.