The -exec mode now supports the merge statement.
In order to do that, I've generalised the type of merge : now the clock argument can be any expression. Some assert false still prevent its use, but it should be easy to get rid of them (I'll do that latter).
Showing
- src/ast2lic.ml 11 additions, 7 deletionssrc/ast2lic.ml
- src/astCore.ml 4 additions, 4 deletionssrc/astCore.ml
- src/astV6Dump.ml 5 additions, 5 deletionssrc/astV6Dump.ml
- src/evalClock.ml 7 additions, 5 deletionssrc/evalClock.ml
- src/evalType.ml 16 additions, 12 deletionssrc/evalType.ml
- src/l2lCheckLoops.ml 2 additions, 2 deletionssrc/l2lCheckLoops.ml
- src/lic.ml 3 additions, 6 deletionssrc/lic.ml
- src/lic2soc.ml 80 additions, 33 deletionssrc/lic2soc.ml
- src/licDump.ml 4 additions, 4 deletionssrc/licDump.ml
- src/parserUtils.ml 28 additions, 22 deletionssrc/parserUtils.ml
- src/socExecEvalPredef.ml 24 additions, 8 deletionssrc/socExecEvalPredef.ml
- src/socPredef.ml 27 additions, 2 deletionssrc/socPredef.ml
- src/socPredef.mli 2 additions, 1 deletionsrc/socPredef.mli
- test/lus2lic.sum 1 addition, 1 deletiontest/lus2lic.sum
- test/lus2lic.time 2 additions, 2 deletionstest/lus2lic.time
- test/should_work/merge.lus 1 addition, 1 deletiontest/should_work/merge.lus
Loading
Please register or sign in to comment