Change the syntax of merge (and adopt the one of heptagon).
Also, force the merge to operate over an ident rather than on any val_exp.
Showing
- src/ast2lic.ml 4 additions, 5 deletionssrc/ast2lic.ml
- src/astCore.ml 4 additions, 5 deletionssrc/astCore.ml
- src/astRecognizePredef.ml 1 addition, 2 deletionssrc/astRecognizePredef.ml
- src/astV6Dump.ml 3 additions, 7 deletionssrc/astV6Dump.ml
- src/evalClock.ml 8 additions, 5 deletionssrc/evalClock.ml
- src/evalConst.ml 2 additions, 4 deletionssrc/evalConst.ml
- src/evalType.ml 5 additions, 5 deletionssrc/evalType.ml
- src/l2lCheckLoops.ml 3 additions, 3 deletionssrc/l2lCheckLoops.ml
- src/l2lExpandNodes.ml 2 additions, 2 deletionssrc/l2lExpandNodes.ml
- src/l2lRmPoly.ml 2 additions, 2 deletionssrc/l2lRmPoly.ml
- src/lic.ml 2 additions, 2 deletionssrc/lic.ml
- src/licDump.ml 2 additions, 2 deletionssrc/licDump.ml
- src/lxm.ml 2 additions, 2 deletionssrc/lxm.ml
- src/parser.mly 4 additions, 6 deletionssrc/parser.mly
- src/parserUtils.ml 13 additions, 17 deletionssrc/parserUtils.ml
- src/unifyClock.ml 2 additions, 2 deletionssrc/unifyClock.ml
- test/lus2lic.log.ref 5 additions, 5 deletionstest/lus2lic.log.ref
- test/lus2lic.sum 1 addition, 1 deletiontest/lus2lic.sum
- test/should_fail/type/merge_bad_clk.lus 3 additions, 3 deletionstest/should_fail/type/merge_bad_clk.lus
- test/should_fail/type/merge_bad_enum.lus 6 additions, 5 deletionstest/should_fail/type/merge_bad_enum.lus
Loading
Please register or sign in to comment