diff --git a/src/socPredef2c.ml b/src/socPredef2c.ml index 878973805db676f3f0c6384f2e56356dcbbcb29f..a74903e31de84d836aac89ba16dba02b3ca06a38 100644 --- a/src/socPredef2c.ml +++ b/src/socPredef2c.ml @@ -1,4 +1,4 @@ -(* Time-stamp: <modified the 24/06/2014 (at 15:22) by Erwan Jahier> *) +(* Time-stamp: <modified the 24/06/2014 (at 18:16) by Erwan Jahier> *) open Data open Soc @@ -172,7 +172,7 @@ let (get_key: Soc.key -> string) = | "Lustre::eq" -> lustre_binop sk "==" | "Lustre::and" -> lustre_binop sk "&&" - | "Lustre::neq" -> lustre_binop sk "<>" + | "Lustre::neq" -> lustre_binop sk "!=" | "Lustre::or" -> lustre_binop sk "||" | "Lustre::xor" -> lustre_binop sk "^" diff --git a/test/lus2lic.sum b/test/lus2lic.sum index e35d0496e980bd3e58d2058b22fb243917211b96..8e8c079305e03236e26b78b034d24acb0efb02de 100644 --- a/test/lus2lic.sum +++ b/test/lus2lic.sum @@ -1,4 +1,4 @@ -Test Run By jahier on Tue Jun 24 18:01:59 2014 +Test Run By jahier on Tue Jun 24 18:18:03 2014 Native configuration is i686-pc-linux-gnu === lus2lic tests === @@ -738,7 +738,7 @@ PASS: ./lus2lic {-ec -o /tmp/carV2.ec should_work/carV2.lus} PASS: ./myec2c {-o /tmp/carV2.c /tmp/carV2.ec} PASS: ../utils/test_lus2lic_no_node should_work/carV2.lus PASS: ./lus2lic {-2c should_work/carV2.lus -n carV2} -FAIL: Check that the generated C code compiles : gcc carV2_carV2.c carV2_carV2_loop.c +PASS: gcc carV2_carV2.c carV2_carV2_loop.c PASS: ./lus2lic {-o /tmp/test_merge.lic should_work/test_merge.lus} PASS: ./lus2lic {-ec -o /tmp/test_merge.ec should_work/test_merge.lus} FAIL: Try ec2c on the result: ./myec2c {-o /tmp/test_merge.c /tmp/test_merge.ec} @@ -914,7 +914,7 @@ PASS: ./lus2lic {-ec -o /tmp/bob.ec should_work/bob.lus} PASS: ./myec2c {-o /tmp/bob.c /tmp/bob.ec} FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/bob.lus PASS: ./lus2lic {-2c should_work/bob.lus -n bob} -FAIL: Check that the generated C code compiles : gcc bob_bob.c bob_bob_loop.c +PASS: gcc bob_bob.c bob_bob_loop.c PASS: ./lus2lic {-o /tmp/notTwo.lic should_work/notTwo.lus} PASS: ./lus2lic {-ec -o /tmp/notTwo.ec should_work/notTwo.lus} PASS: ./myec2c {-o /tmp/notTwo.c /tmp/notTwo.ec} @@ -1482,9 +1482,9 @@ XPASS: Test bad programs (semantics): lus2lic {-o /tmp/bug.lic should_fail/seman === lus2lic Summary === -# of expected passes 1292 -# of unexpected failures 120 +# of expected passes 1294 +# of unexpected failures 118 # of unexpected successes 21 # of expected failures 37 -testcase ./lus2lic.tests/non-reg.exp completed in 132 seconds +testcase ./lus2lic.tests/non-reg.exp completed in 134 seconds testcase ./lus2lic.tests/progression.exp completed in 0 seconds diff --git a/test/lus2lic.time b/test/lus2lic.time index 240fd8215bc6a0f6ebda49e4256f4eee3b89f869..4e047922dcaaf2796f59fbb605071958ed93fdb5 100644 --- a/test/lus2lic.time +++ b/test/lus2lic.time @@ -1,2 +1,2 @@ -testcase ./lus2lic.tests/non-reg.exp completed in 132 seconds +testcase ./lus2lic.tests/non-reg.exp completed in 134 seconds testcase ./lus2lic.tests/progression.exp completed in 0 seconds diff --git a/todo.org b/todo.org index e7ad543c3d77029d1c68d303dad2c1db7ccdc4a9..25c0992812fa2e56e3810b52a9b22f5761c3c9b7 100644 --- a/todo.org +++ b/todo.org @@ -57,31 +57,28 @@ http://www.di.ens.fr/~pouzet/bib/lctes12.pdf pb de types polymorphes 4. file:test/should_work/matrice2.lus lus2lic -2c should_work/matrice2.lus -n matrice2 5. file:test/should_work/ply02.lus lus2lic -2c should_work/ply02.lus -n ply02 -6. file:test/should_work/morel3.lus lus2lic -2c should_work/morel3.lus -n morel3 -7. file:test/should_work/ply03.lus lus2lic -2c should_work/ply03.lus -n ply03 -8. file:test/should_work/xx.lus lus2lic -2c should_work/xx.lus -n xx -11. file:test/should_work/bad.lus lus2lic -2c should_work/bad.lus -n bad -12. file:test/should_work/mapinf.lus lus2lic -2c should_work/mapinf.lus -n mapinf -13. file:test/should_work/over2.lus lus2lic -2c should_work/over2.lus -n over2 -14. file:test/should_work/over3.lus lus2lic -2c should_work/over3.lus -n over3 -15. file:test/should_work/carV2.lus lus2lic -2c should_work/carV2.lus -n carV2 -16. file:test/should_work/test.lus lus2lic -2c should_work/test.lus -n test -17. file:test/should_work/left.lus lus2lic -2c should_work/left.lus -n left -18. file:test/should_work/morel.lus lus2lic -2c should_work/morel.lus -n morel -19. file:test/should_work/matrice.lus lus2lic -2c should_work/matrice.lus -n matrice -20. file:test/should_work/exclusion.lus lus2lic -2c should_work/exclusion.lus -n exclusion -21. file:test/should_work/bob.lus lus2lic -2c should_work/bob.lus -n bob -22. file:test/should_work/morel2.lus lus2lic -2c should_work/morel2.lus -n morel2 -23. file:test/should_work/xxx.lus lus2lic -2c should_work/xxx.lus -n xxx -24. file:test/should_work/mapdeRed.lus lus2lic -2c should_work/mapdeRed.lus -n mapdeRed -25. file:test/should_work/simpleRed.lus lus2lic -2c should_work/simpleRed.lus -n simpleRed -26. file:test/should_work/redoptest.lus lus2lic -2c should_work/redoptest.lus -n redoptest -27. file:test/should_work/cond01.lus lus2lic -2c should_work/cond01.lus -n cond01 -28. file:test/should_work/overload.lus lus2lic -2c should_work/overload.lus -n overload -29. file:test/should_work/simple.lus lus2lic -2c should_work/simple.lus -n simple +6. file:test/should_work/ply03.lus lus2lic -2c should_work/ply03.lus -n ply03 +7. file:test/should_work/xx.lus lus2lic -2c should_work/xx.lus -n xx +8. file:test/should_work/mapinf.lus lus2lic -2c should_work/mapinf.lus -n mapinf +9. file:test/should_work/over2.lus lus2lic -2c should_work/over2.lus -n over2 +10. file:test/should_work/over3.lus lus2lic -2c should_work/over3.lus -n over3 +11. file:test/should_work/matrice.lus lus2lic -2c should_work/matrice.lus -n matrice +12. file:test/should_work/exclusion.lus lus2lic -2c should_work/exclusion.lus -n exclusion +13. file:test/should_work/xxx.lus lus2lic -2c should_work/xxx.lus -n xxx +14. file:test/should_work/mapdeRed.lus lus2lic -2c should_work/mapdeRed.lus -n mapdeRed +15. file:test/should_work/simpleRed.lus lus2lic -2c should_work/simpleRed.lus -n simpleRed +16. file:test/should_work/redoptest.lus lus2lic -2c should_work/redoptest.lus -n redoptest +17. file:test/should_work/cond01.lus lus2lic -2c should_work/cond01.lus -n cond01 +18. file:test/should_work/overload.lus lus2lic -2c should_work/overload.lus -n overload +19. file:test/should_work/simple.lus lus2lic -2c should_work/simple.lus -n simple type externe -10. file:test/should_work/morel4.lus lus2lic -2c should_work/morel4.lus -n morel4 +20. file:test/should_work/morel.lus lus2lic -2c should_work/morel.lus -n morel +21. file:test/should_work/morel2.lus lus2lic -2c should_work/morel2.lus -n morel2 +22. file:test/should_work/morel3.lus lus2lic -2c should_work/morel3.lus -n morel3 +23. file:test/should_work/morel4.lus lus2lic -2c should_work/morel4.lus -n morel4 +24. file:test/should_work/left.lus lus2lic -2c should_work/left.lus -n left slice en partie gauche +25. file:test/should_work/test.lus lus2lic -2c should_work/test.lus -n test * Packages, modeles, etc.