lurette 0.92 Mon, 23 Sep 2002 15:58:36 +0200 by jahier

Parent-Version:      0.91
Version-Log:

source/parse_env.ml:
    Allow expr a the lhs of comparison operators.

    Make comparison operators prefix instead on infix as
    it considerably simplifies the parsing.

    Also introduce a == keyword that operates over bool
    to disambiguate things (= is the equality for nums,
    and == the one for bool. Now the lucky grammar
    is truely LL(1), which is nice.

Project-Description: Lurette

demo/chaudiere/chaudiere.ima

@@ -7,14 +7,15 @@ start_node  = 0,
 arcs_nb = 0,
 nodes_nb = 0,
 arcs = 
-  From 0 To 1 With  1:((U = 17.5) && (Dudt = 0.1)) ;
+  From 0 To 1 With  1:(&& (= U  17.5)  (= Dudt 0.1)) ;
   From 1 To 1 With
     1:
-    ((U = pre(1,U) + pre(1, Dudt)) 
-       && 
-       ( Dudt + 1. > (IfThenElseNum Heat_on 0. (- 5.)))
-       && 
-       ( Dudt < (IfThenElseNum Heat_on 2. 0.)))  .
+    (  && (= U  pre(1,U) + pre(1, Dudt))
+       && ( > Dudt  (IfThenElseNum Heat_on 0. (- 5.)))
+          ( < Dudt  (IfThenElseNum Heat_on 2. 0.) )
+    )  .
+
+
 
   
 

ihm/xlurette/xlurette_glade_main.ml

@@ -526,9 +526,11 @@ let main () =
   (* To turn around a bug in mlglade which searches the pixmaps dir
      in the current dir instead of the xlurette one.  *)
   let _ = 
-    Unix.symlink 
-      (Filename.concat (Unix.getenv "LURETTE_PATH") "ihm/xlurette/pixmaps")
-      "pixmaps"
+    if not (Sys.file_exists "pixmaps")
+    then
+      Unix.symlink 
+	(Filename.concat (Unix.getenv "LURETTE_PATH") "ihm/xlurette/pixmaps")
+	"pixmaps";
   in
 
   let callbacks = new customized_callbacks in

lurette.prj

 ;; -*- Prcs -*-
 (Created-By-Prcs-Version 1 3 3)
 (Project-Description "Lurette")
-(Project-Version lurette 0 91)
-(Parent-Version lurette 0 90)
+(Project-Version lurette 0 92)
+(Parent-Version lurette 0 91)
 (Version-Log "
 source/parse_env.ml:
-    Allow a space between a '-' and a numeric value.
+    Allow expr a the lhs of comparison operators.
+
+    Make comparison operators prefix instead on infix as
+    it considerably simplifies the parsing.
+
+    Also introduce a == keyword that operates over bool
+    to disambiguate things (= is the equality for nums,
+    and == the one for bool. Now the lucky grammar 
+    is truely LL(1), which is nice.
+    
+
 ")
 (New-Version-Log ""
 )
-(Checkin-Time "Fri, 20 Sep 2002 16:34:48 +0200")
+(Checkin-Time "Mon, 23 Sep 2002 15:58:36 +0200")
 (Checkin-Login jahier)
 (Populate-Ignore ())
 (Project-Keywords)
@@ -49,7 +59,7 @@ source/parse_env.ml:
   (source/rnumsolver.ml (lurette/b/27_rnumsolver 1.7 644))
 
   (source/parse_env.mli (lurette/40_parse_env. 1.9 644))
-  (source/parse_env.ml (lurette/41_parse_env. 1.26 644))
+  (source/parse_env.ml (lurette/41_parse_env. 1.27 644))
 
   (source/show_env.mli (lurette/42_show_env.m 1.7 644))
   (source/show_env.ml (lurette/43_show_env.m 1.12 644))
@@ -112,12 +122,12 @@ source/parse_env.ml:
   (test/time.res (lurette/b/49_time.res 1.6 644))
 
 ;; Various files used for testing purposes
-  (test/usager.ima (lurette/b/14_usager.env 1.8 644))
-  (test/tram.ima (lurette/b/15_tram.env 1.7 644))
-  (test/porte.ima (lurette/b/16_porte.env 1.7 644))
-  (test/passerelle.ima (lurette/b/17_passerelle 1.7 644))
-  (test/temp_int.ima (lurette/b/50_temp_int.e 1.1 644))
-  (test/temp_float.ima (lurette/b/51_temp_float 1.2 644))
+  (test/usager.ima (lurette/b/14_usager.env 1.9 644))
+  (test/tram.ima (lurette/b/15_tram.env 1.8 644))
+  (test/porte.ima (lurette/b/16_porte.env 1.8 644))
+  (test/passerelle.ima (lurette/b/17_passerelle 1.8 644))
+  (test/temp_int.ima (lurette/b/50_temp_int.e 1.2 644))
+  (test/temp_float.ima (lurette/b/51_temp_float 1.3 644))
 
   (test/ControleurPorte.h (lurette/b/18_Controleur 1.1 644))
   (test/ControleurPorte.c (lurette/b/19_Controleur 1.1 644))
@@ -128,7 +138,7 @@ source/parse_env.ml:
   (test/tram_simple.h (lurette/b/25_tram_simpl 1.1 644))
 
   (test/heater_int.rif.exp (lurette/b/28_heater_int 1.6 644))
-  (test/ControleurPorte.rif.exp (lurette/b/29_Controleur 1.8 644))
+  (test/ControleurPorte.rif.exp (lurette/b/29_Controleur 1.9 644))
   (test/heater_float.rif.exp (lurette/b/30_heater_flo 1.7 644))
   (test/heater_int.lus (lurette/b/43_heater_int 1.1 644))
   (test/heater_float.lus (lurette/b/44_heater_flo 1.1 644))
@@ -137,7 +147,7 @@ source/parse_env.ml:
   (test/Makefile (lurette/c/0_Makefile 1.4 644))
 
 ;; xlurette
-  (ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.5 644))
+  (ihm/xlurette/xlurette_glade_main.ml (lurette/c/12_xlurette_g 1.6 644))
   (ihm/xlurette/xlurette.glade (lurette/c/13_xlurette.g 1.4 644))
   (ihm/xlurette/xlurette_glade_interface.ml (lurette/c/15_xlurette_g 1.3 644))
   (ihm/xlurette/makefile (lurette/c/16_makefile 1.1 644))
@@ -147,7 +157,7 @@ source/parse_env.ml:
 ;; to version 0.83(w), by jahier:
 
   (test/giro/allocator.lus (lurette/c/5_allocator. 1.1 644))
-  (test/giro/giro.ima (lurette/c/6_giro.ima 1.1 644))
+  (test/giro/giro.ima (lurette/c/6_giro.ima 1.2 644))
   (test/giro/onlyroll.lus (lurette/c/7_onlyroll.l 1.1 644))
 
 ;; Files added by populate at Wed, 04 Sep 2002 09:47:29 +0200,
@@ -156,7 +166,7 @@ source/parse_env.ml:
   (demo/chaudiere/chaudiere_oracle.lus (lurette/c/8_chaudiere_ 1.1 644))
   (demo/chaudiere/chaudiere_ctrl.lus (lurette/c/9_chaudiere_ 1.1 644))
   (demo/chaudiere/buggy_chaudiere_ctrl.lus (lurette/c/10_buggy_chau 1.1 644))
-  (demo/chaudiere/chaudiere.ima (lurette/c/11_chaudiere. 1.4 644))
+  (demo/chaudiere/chaudiere.ima (lurette/c/11_chaudiere. 1.5 644))
 
 
 

test/ControleurPorte.rif.exp

@@ -18,202 +18,202 @@ debut_ramassage:bool
 fin_ramassage:bool
 @#
 #step 1
-f f f f t #outs f f f f t t f f t 
+f f f f t #outs f f f f f f f t f 
 #step 2
-f f f f t #outs t f f f f t f t f 
+t f f f f #outs t f f f t f f f f 
 #step 3
-f t f f t #outs t f f f f t t f t 
+f f t f f #outs t t t f f f f f f 
 #step 4
-t t f f f #outs f t f t t t f t f 
+f f f f f #outs f t f f f f f f t 
 #step 5
-f f f f f #outs t t t t f f t f f 
+f f f f f #outs t f f f t f f f f 
 #step 6
-f f f f f #outs f t t f t t f f f 
+f f f f f #outs t f f f f f f f f 
 #step 7
-t t f t t #outs t t f t f t t t t 
+f f f f f #outs t f f f f f f f f 
 #step 8
-f f f t t #outs t t f f f f t f t 
+f f f f f #outs t f f t f f f f f 
 #step 9
-f f f t t #outs t t f t f f t t t 
+f t f f t #outs f f f f f t f f f 
 #step 10
-f f f f t #outs f f f f f f f f f 
+f f f f t #outs f t t f t f t f f 
 #step 11
-f f f f t #outs t f f t f t t t t 
+f f t f f #outs f t t f f f f t f 
 #step 12
-t t f f f #outs t f f f f t t t f 
+f f f f f #outs t f f f f f f f t 
 #step 13
-f t t f f #outs f t t t f t f f f 
+f f f f f #outs f t f f t f f f f 
 #step 14
-f f f f t #outs t f f t f f f t f 
+f f f f f #outs t t f f f f f f f 
 #step 15
-f t f f t #outs t f f t t t f f f 
+f f f f f #outs t t f f f f f f f 
 #step 16
-f f f f t #outs f t t t t t t t f 
+f f f f f #outs f f f f f f f f f 
 #step 17
-f f f t t #outs f t f f f t t f t 
+f f f f f #outs t f f f f f f f f 
 #step 18
-f f f f t #outs f t f f t t t f f 
+f f f f f #outs f f f f f f f f f 
 #step 19
-f f t f f #outs f t f t f f t t t 
+f f f f f #outs t t f f f f f f f 
 #step 20
-f f f f t #outs t t f t f t f t f 
+f f f f f #outs t f f f f f f f f 
 #step 21
-f f f f t #outs t f f f f t f f f 
+f f f f f #outs t t f f t f f f f 
 #step 22
-f f f f t #outs f t f t f f t t t 
+f f f f f #outs f t f t f f f f f 
 #step 23
-f f t f f #outs f t f t t f f t f 
+f f f f f #outs f t t f f f f f f 
 #step 24
-f f f f f #outs t t t t f t t f t 
+f f f f f #outs f t f t f f f f f 
 #step 25
-f f f f f #outs t f t t t t t f t 
+f f f f f #outs t f f f f f f f f 
 #step 26
-f f f f t #outs t t f f t t t t t 
+f f f f f #outs t f f f f f f f f 
 #step 27
-f f f f t #outs f t f t t t f t f 
+f f f f f #outs t t f f f f f f f 
 #step 28
-f f f f t #outs t f f t f t f f f 
+f f f f t #outs t t f f f t f f f 
 #step 29
-f f f f t #outs f f f t t t t t t 
+f f f f t #outs f t f f f t t f f 
 #step 30
-f f t f f #outs f t t f f t f t f 
+f f f f t #outs t f f f t f t f f 
 #step 31
-f f f f t #outs f t f t f f f t f 
+f f t f f #outs f t t f t f t f f 
 #step 32
-f f f f t #outs f f f f t t t t f 
+f t f f t #outs t f f t f t t f f 
 #step 33
-t t f f f #outs t f f f f t t t f 
+f f t f f #outs f f t f f f t f f 
 #step 34
-f f f f t #outs t f f t f f f t f 
+t t f f t #outs t f f t f t f t f 
 #step 35
-f f f f t #outs f t f t f t t f f 
+f f f f t #outs f t f t f f f f t 
 #step 36
-f t f f t #outs t f f t f t t f f 
+f f f f t #outs t f f f f f t f f 
 #step 37
-f f t f f #outs f t t t f f f f t 
+f f f f t #outs f f t f f f f t f 
 #step 38
-f f f f f #outs f t f f f t t f t 
+f f t f f #outs f t f f f f f f f 
 #step 39
-f f f f f #outs t t f t t t f t t 
+f f f f t #outs t f f t f f f f f 
 #step 40
-f t t f f #outs t f t t f t t f f 
+f f f f t #outs t t f f t f f f f 
 #step 41
-f t f f f #outs t f f f t t t f f 
+f f f f t #outs t t f f f f f f f 
 #step 42
-t f f f f #outs t t f f f f t t f 
+f f f f t #outs f t f t t f f f f 
 #step 43
-f f f f f #outs t t f t f f f f f 
+f f f t t #outs t f f f t f f f t 
 #step 44
-f t t f f #outs f t t t f t f t f 
+f f f f t #outs t f f t t f t f f 
 #step 45
-f f f f t #outs f t f t f f f f f 
+f f f f t #outs f f f f f f t f f 
 #step 46
-f f f f t #outs t f t t f t t f t 
+f f f f t #outs f t f f f f t f f 
 #step 47
-f f t f f #outs f t f t f f t t f 
+f f f f t #outs f f f f t f t f f 
 #step 48
-f f f f f #outs f t t t f t t f t 
+t f f f f #outs f t f f f f f t f 
 #step 49
-f f f f t #outs t f f t f t t t f 
+f t f f t #outs t f f f f t f f f 
 #step 50
-f f f f t #outs f t f f f f t t f 
+f f t f f #outs t f t f f f f f t 
 #step 51
-f f f f t #outs t f f t f t t t t 
+f f f f f #outs f t f t t f f f f 
 #step 52
-f f f f t #outs t t f t f f t f f 
+f t t f f #outs t t t f f t f f f 
 #step 53
-f f f f t #outs f t f t f t t f f 
+f f f f f #outs f t f f f f f f f 
 #step 54
-f f f t t #outs t t f t t f t t t 
+f f f f f #outs f f f t t f f f f 
 #step 55
-f f f f t #outs t f f t f f t f f 
+f f t f f #outs f t t f f f f f f 
 #step 56
-f f f f t #outs t t f f t t f t f 
+f f f f f #outs t f f f t f f f f 
 #step 57
-f f f f t #outs f t f t f t f t f 
+f f f f f #outs t t f f f f f f f 
 #step 58
-f f f t t #outs t t f t f t f t t 
+f f f f f #outs f t f f f f f f f 
 #step 59
-f f f f t #outs f t f f f f t f t 
+f f f f f #outs t t f f f f f f f 
 #step 60
-f f f f t #outs f t f f f f t t t 
+f f t f f #outs f f t f f f f f f 
 #step 61
-f f f f t #outs f t f t f f t f f 
+f f f f f #outs t f f f f f f f f 
 #step 62
-f f f f t #outs t f f t f f t t t 
+f f t f f #outs f t t f t f f f f 
 #step 63
-f f f f t #outs t t f f f f t t t 
+f t f f f #outs t f f f f t f f f 
 #step 64
-f f f f t #outs t f f t f t t t f 
+f f t t f #outs f t t f t f f f f 
 #step 65
-f f f f t #outs t t f f f t f t f 
+f f f f f #outs f t f f f f f f f 
 #step 66
-f f f f t #outs t f f t f f t f t 
+f t f f f #outs f t f f f t f f f 
 #step 67
-f t t f f #outs t f t t f t t f f 
+f f t f f #outs f f t f f f f f f 
 #step 68
-f t f f f #outs f t f f f t t f f 
+f f f f t #outs f f f t f f f f f 
 #step 69
-f t f f f #outs t t f f f t t f f 
+f f f f t #outs f t f f t f t f f 
 #step 70
-f t f t f #outs f t f f t t t f t 
+t f t f f #outs t f t f f f f t f 
 #step 71
-t t t f t #outs f t t t f t t t t 
+f f f f f #outs f t t f t f f f f 
 #step 72
-f t f t t #outs f t f f t t t f t 
+f f f f f #outs t t f f f f f f f 
 #step 73
-f f f f t #outs f t f t f f t f f 
+f f f f f #outs t f f f f f f f f 
 #step 74
-f t f t t #outs t f f f f t t t t 
+f f f t f #outs f t f f f f f f t 
 #step 75
-f t f f t #outs t t f f f t t t f 
+f f f f f #outs t t f f t f f f f 
 #step 76
-f f f t t #outs t f f t f f t t t 
+f f t f f #outs f f t f f f f f f 
 #step 77
-f f f f t #outs t f f f f f f f f 
+f f f f f #outs f t f f f f f f f 
 #step 78
-f f f f t #outs f t f f f t t f f 
+f f f f f #outs f t f f t f f f f 
 #step 79
-f t f f t #outs t f f t f t t f f 
+f f f f f #outs t f f t t f f f f 
 #step 80
-t f t f f #outs t f t f f f t t t 
+f f t f f #outs t t t f f f f f f 
 #step 81
-f f f f f #outs t f f f f f t t t 
+f f f f f #outs t t t f f f f f f 
 #step 82
-f f f f t #outs t t f t f f t f f 
+f f f f f #outs f t f f t f f f f 
 #step 83
-f f f f t #outs f t f t f f t t f 
+f f f f f #outs f t f t f f f f f 
 #step 84
-f t f f t #outs f t f t f t t f f 
+f f f f f #outs f t f f f f f f f 
 #step 85
-f t f f t #outs t f f f f t f f f 
+f f t f f #outs f t t f f f f f f 
 #step 86
-f t t t f #outs t t t t t t f t t 
+f f f f f #outs f t f f t f f f f 
 #step 87
-f t f t t #outs t f f t t t f t t 
+f f f f f #outs f t f f f f f f f 
 #step 88
-f f f f t #outs t f f t f f t t t 
+f f f f f #outs f t f f f f f f f 
 #step 89
-f f f f t #outs f t f t f t f f f 
+f f f f f #outs t f f t f f f f f 
 #step 90
-f f f f t #outs t f f t f t t f t 
+f t t f f #outs f f t f f t f f f 
 #step 91
-f f f f t #outs f t f t f f t f f 
+f f f f f #outs f f t f f f f f f 
 #step 92
-f f f f t #outs t f f f f t t f t 
+f f f f f #outs f t t f t f f f f 
 #step 93
-f f f f t #outs t f f t f t f f t 
+f f f f f #outs f t t f f f f f f 
 #step 94
-f f t f f #outs f t f t f f t t f 
+f f f f f #outs t f f f f f f f f 
 #step 95
-f f f f t #outs f t f f f t t t t 
+f f f f f #outs f f f f f f f f f 
 #step 96
-f f f f t #outs t t f f f t t t f 
+f f f f f #outs t t f f f f f f f 
 #step 97
-f f f f t #outs f t f t t t f f f 
+f f t t f #outs t f t f t f f f f 
 #step 98
-f f f f t #outs t f t f t t f f f 
+f f f f f #outs t f t f f f f f f 
 #step 99
-f f f f t #outs t f f t f f t f f 
+f f f f f #outs f t f f t f f f f 
 #step 100
-f t f t t #outs t f f f t t t f t 
+f f f f f #outs t f f f f f f f f 

test/giro/giro.ima

@@ -52,34 +52,34 @@ arcs_nb = 0,
 nodes_nb = 0,
 arcs = 
     From 0 To 1 With  1: 
-           (! ongroundreset) && (! inairreset)
+          && (! ongroundreset) && (! inairreset)
           && (!disc1) && (!disc2)  && (!disc3) && (!disc4)
           && (!choff1) && (!choff2)  && (!choff3) && (!choff4)
-          && x_god = 4. && x_move = 0.
-          && xa1 = 4.  && xb1 = 4.
-          && xa2 = 4.  && xb2 = 4.
-          && xa3 = 4.  && xb3 = 4.
-          && xa4 = 4.  && xb4 = 4.
+          && = x_god  4. && = x_move  0.
+          && = xa1  4.  && = xb1  4.
+          && = xa2  4.  && = xb2  4.
+          && = xa3  4.  && = xb3  4.
+          && = xa4  4.   = xb4  4.
         ;
 
     From 1 To 1 With  1: 
-           (! ongroundreset) && (! inairreset)
+          && (! ongroundreset) && (! inairreset)
           && (!disc1)  && (!disc2)   && (!disc3)  && (!disc4)
           && (!choff1) && (!choff2)  && (!choff3) && (!choff4)
 
-          && (IfThenElse (pre(1, x_god) < 0.) 
-                    ((-0.1 < x_move) && (x_move < 0.2)) 
-                    ((-0.2 < x_move) && (x_move < 0.1)) )
-          && x_god = pre(1,x_god) + pre(1, x_move)
-          && xa1 = pre(1, x_god) + pre(1, err1) 
-          && xb1 = pre(1, x_god) + pre(1, err1) + pre(1, err2)
+          && (IfThenElse (< pre(1, x_god)  0.) 
+                    (&& (< -0.1  x_move)  (< x_move  0.2)) 
+                    (&& (< -0.2  x_move)  (< x_move  0.1)) )
+          && = x_god  pre(1,x_god) + pre(1, x_move)
+          && = xa1  pre(1, x_god) + pre(1, err1) 
+          && = xb1  pre(1, x_god) + pre(1, err1) + pre(1, err2)
 
-          && xa2 = pre(1, x_god) + pre(1, err3) 
-          && xb2 = pre(1, x_god) + pre(1, err3) + pre(1, err4)
+          && = xa2  pre(1, x_god) + pre(1, err3) 
+          && = xb2  pre(1, x_god) + pre(1, err3) + pre(1, err4)
 
-          && xa3 = pre(1, x_god) + pre(1, err5) 
-          && xb3 = pre(1, x_god) + pre(1, err5) + pre(1, err6)
+          && = xa3  pre(1, x_god) + pre(1, err5) 
+          && = xb3  pre(1, x_god) + pre(1, err5) + pre(1, err6)
 
-          && xa4 = pre(1, x_god) + pre(1, err7) 
-          && xb4 = pre(1, x_god) + pre(1, err7) + pre(1, err8)
+          && = xa4  pre(1, x_god) + pre(1, err7) 
+             = xb4  pre(1, x_god) + pre(1, err7) + pre(1, err8)
       .
\ No newline at end of file

test/passerelle.ima

@@ -15,19 +15,19 @@ start_node =  0,
 arcs_nb = 0,
 nodes_nb = 0,
 arcs =
-  From 0 To 1 With 1: (! pass_rentree && ! pass_baissee );
+  From 0 To 1 With 1: (&& ! pass_rentree  ! pass_baissee );
   From 1 To 2 With 1: eps;
   From 2 To 3 With 1: eps;
-  From 3 To 2 With 1: (! pass_baissee && ! pass_rentree && ! baisser_pass && ! rentrer_pass);
+  From 3 To 2 With 1: (&& ! pass_baissee (&& ! pass_rentree (&& ! baisser_pass ! rentrer_pass)));
   From 2 To 4 With 1: eps;
   From 4 To 5 With 1: eps;
   From 5 To 6 With 1: eps;
-  From 6 To 5 With 1: (! pass_baissee && ! pass_rentree && baisser_pass);
+  From 6 To 5 With 1: (&& ! pass_baissee (&& ! pass_rentree  baisser_pass));
   From 5 To 7 With 1: eps;
-  From 7 To 1 With 1: (! pass_rentree && pass_baissee);
+  From 7 To 1 With 1: (&& ! pass_rentree  pass_baissee);
   From 4 To 8 With 1: eps;
   From 8 To 9 With 1: eps;
-  From 9 To 8 With 1: (! pass_baissee && ! pass_rentree && rentrer_pass);
+  From 9 To 8 With 1: (&& ! pass_baissee (&& ! pass_rentree rentrer_pass));
   From 8 To 10 With 1: eps;   
-  From 10 To 1 With 1: (pass_rentree && ! pass_baissee)
+  From 10 To 1 With 1: (&& pass_rentree  ! pass_baissee)
 .

test/porte.ima

@@ -16,19 +16,19 @@ start_node = 0,
 arcs_nb = 0,
 nodes_nb = 0,
 arcs =
-  From 0 To 1  With 1 : ! porte_fermee && ! porte_ouverte  ;
+  From 0 To 1  With 1 : && ! porte_fermee  ! porte_ouverte  ;
   From 1 To 2  With 1 :  eps ;
   From 2 To 3  With 1 :  eps ;
-  From 3 To 2  With 1 :  ! porte_ouverte && ! porte_fermee && ! ouvrir_porte && ! fermer_porte ;
+  From 3 To 2  With 1 :  && ! porte_ouverte (&& (! porte_fermee) (&& (! ouvrir_porte)  (! fermer_porte))) ;
   From 2 To 4  With 1 :  eps ;
   From 4 To 5  With 1 :  eps ;
   From 5 To 6  With 1 :  eps ;
-  From 6 To 5  With 1 :  ! porte_ouverte && ! porte_fermee && ouvrir_porte ;
+  From 6 To 5  With 1 :  && (! porte_ouverte) (&& (! porte_fermee)  ouvrir_porte) ;
   From 5 To 7  With 1 :  eps ;
-  From 7 To 1  With 1 :  ! porte_fermee && porte_ouverte ;
+  From 7 To 1  With 1 :  && (! porte_fermee)  porte_ouverte ;
   From 4 To 8  With 1 :  eps ;
   From 8 To 9  With 1 :  eps ;
-  From 9 To 8  With 1 :  ! porte_ouverte && ! porte_fermee && fermer_porte ;
+  From 9 To 8  With 1 :  && (! porte_ouverte) (&& (! porte_fermee)  fermer_porte) ;
   From 8 To 10 With 1 :  eps ;  
-  From 10 To 1 With 1 :   porte_fermee && ! porte_ouverte
+  From 10 To 1 With 1 :  && porte_fermee  ! porte_ouverte
 .

test/temp_float.ima

@@ -9,16 +9,15 @@ start_node  = 0,
 arcs_nb = 0,
 nodes_nb = 0,
 arcs = 
-  From 0 To 1 With  1:((U = 17.) && (Dudt = 0.)) ;
+  From 0 To 1 With  1:(&& (= U  17.)  (= Dudt 0.)) ;
   From 1 To 1 With
     1:
-    ((U = pre(1,U) + pre(1, Dudt)) 
+    (&& (= U pre(1,U) + pre(1, Dudt)) 
        && 
-       ( Dudt > %"toto":"this is a pragma "; 
+       ( > Dudt  %"toto":"this is a pragma "; 
 	         "titi": "this is an other one"% 
-		(IfThenElseNum Heat_on 0. -5.))
-       && 
-       ( 1. * Dudt + 0. < (IfThenElseNum Heat_on 2. 0.)))  .
+		(IfThenElseNum Heat_on 0. -5.)) 
+       ( < (1. * Dudt + 0.)  (IfThenElseNum Heat_on 2. 0.)))  .
 
   
 

test/temp_int.ima

@@ -6,21 +6,24 @@ ctrl_expr   =
 	     (w1, Draw_between titi 2 10);
              (w2, Draw_gauss titi 10. 1.; 
                    Dec titi;
-                   IfThenElse titi > 0 ( Set toto 0) ( Set toto 1 ))
+                   IfThenElse (> titi  0) ( Set toto 0) ( Set toto 1 ))
 ,
 start_node  = 0,
 arcs_nb = 0,
 nodes_nb = 0,
 arcs = 
     From 0 To 1 With  
-      1:((U = 17) && (Dudt = 0)) : w1  ;
+      1:(&& (= U 17)  (= Dudt 0)) : w1  ;
     From 1 To 1 With 
-      1: ((U = pre(1, U) + pre(1,Dudt)) &&
-	    ( IfThenElse
+      1: && 
+          (= U pre(1, U) + pre(1,Dudt)) 
+	  && 
+           ( IfThenElse
 		Heat_on 
-		((Dudt >= 0) && (Dudt <= 2))
-		((Dudt >= -5) && (Dudt <= 0))
-	    ) && (Toto = Heat_on))
+		(&& (>= Dudt 0)  (<= Dudt 2))
+		(&& (>= Dudt -5)  (<= Dudt 0))
+	   )  
+           (== Toto Heat_on)
 .
       
 

test/tram.ima

@@ -18,15 +18,15 @@ nodes_nb = 0,
 arcs = 
   From 0 To 1 With 1:eps;
   From 1 To 2 With 1:eps;
-  From 2 To 1 With 1:(en_marche && ! debut_ramassage && ! fin_ramassage);
+  From 2 To 1 With 1:(&& en_marche (&& (! debut_ramassage) (! fin_ramassage)));
   From 1 To 3 With 1:eps;
-  From 3 To 4 With 1:(! fin_ramassage && debut_ramassage && ! en_marche);
+  From 3 To 4 With 1:(&& (! fin_ramassage) (&& debut_ramassage (! en_marche)));
   From 4 To 5 With 1:eps;
-  From 5 To 4 With 1:(! fin_ramassage && ! debut_ramassage && ! en_marche);
+  From 5 To 4 With 1:(&& (! fin_ramassage) (&& (! debut_ramassage) ! en_marche));
   From 4 To 6 With 1:eps;
-  From 6 To 7 With 1:(fin_ramassage && ! debut_ramassage && ! en_marche);
+  From 6 To 7 With 1:(&& fin_ramassage (&& (! debut_ramassage)  ! en_marche));
   From 7 To 8 With 1:eps;
-  From 8 To 7 With 1:(! fin_ramassage && ! debut_ramassage && ! en_marche && ! porte_et_pass_ok);
+  From 8 To 7 With 1:(&& (! fin_ramassage) (&& (! debut_ramassage) (&& (! en_marche)  ! porte_et_pass_ok)));
   From 7 To 9 With 1:eps;
-  From 9 To 0 With 1:(! fin_ramassage && ! debut_ramassage && en_marche && porte_et_pass_ok)  
+  From 9 To 0 With 1:(&& (! fin_ramassage) (&& (! debut_ramassage) (&& en_marche  porte_et_pass_ok)))
 .

test/usager.ima

@@ -13,7 +13,7 @@ nodes_nb = 0,
 arcs =
   From 0 To 1 With 1:  eps;
   From 1 To 2 With 1: eps;
-  From 2 To 0 With 1: demande_porte || demande_pass;
+  From 2 To 0 With 1: || demande_porte  demande_pass;
   From 1 To 3 With 1: eps ;