Réparation du script de test de l'interpréteur

src/mlang/test_framework/irj_lexer.mll

@@ -84,6 +84,9 @@ rule token = parse
   { FLOAT (float_of_string f) } (* DONT KEEP THAT *)
   (* Probably in order to write a specific function for our number format *)
 
+| "indefini"
+  { UNDEFINED }
+
 | ['a'-'z' 'A'-'Z' '0'-'9' '_']+ as s
   { SYMBOL s }
 

src/mlang/test_framework/irj_parser.mly

@@ -24,6 +24,8 @@
 %token<string> SYMBOL NAME
 %token<int> INTEGER
 %token<float> FLOAT
+%token UNDEFINED
+/* The undefined value */
 
 %token SLASH
 /* Used as field separator */
@@ -107,7 +109,7 @@ rappels:
 
 variable_and_value:
 | var = SYMBOL SLASH value = value NL { (Pos.mark var (mk_position $loc(var)), Pos.mark value (mk_position $loc(value))) }
-| var = SYMBOL SLASH? NL { (Pos.mark var (mk_position $loc(var)), Pos.without U) }
+| var = SYMBOL SLASH? NL { (Pos.mark var (mk_position $loc(var)), Pos.mark (I 0) (mk_position $loc(var))) }
 
 calc_error:
 | error = SYMBOL NL { Pos.mark error (mk_position $sloc) }
@@ -153,3 +155,4 @@ integer:
 value:
 | i = INTEGER { I (i) }
 | f = FLOAT   { F (f) }
+| UNDEFINED { U }

src/mlang/test_framework/test_interpreter.ml

@@ -78,8 +78,8 @@ let to_MIR_function_and_inputs (program : Mir.program) (t : Irj_ast.irj_file) :
     in
     let toNum p = Com.Numeric (Com.Float (float p)) in
     let optToNum = function
-      | Some p -> Com.Numeric (Com.Float (float p))
-      | None -> Com.Numeric Com.Undefined
+      | Some p -> Com.(Numeric (Float (float p)))
+      | None -> Com.(Numeric (Float 0.))
     in
     let toEvent (rappel : Irj_ast.rappel) =
       StrMap.empty
@@ -100,12 +100,7 @@ let to_MIR_function_and_inputs (program : Mir.program) (t : Irj_ast.irj_file) :
   in
   let expVars vars_init =
     let fold res (Pos.Mark (var, _), Pos.Mark (value, _)) =
-      let fVal =
-        match value with
-        | Irj_ast.I i -> Com.Float (float i)
-        | Irj_ast.F f -> Com.Float f
-        | Irj_ast.U -> Com.Undefined
-      in
+      let fVal = irj_lit_to_com_lit value in
       StrMap.add var fVal res
     in
     List.fold_left fold StrMap.empty vars_init

tests/cram/ok/arithmetique.t/deux_indef.irj

@@ -1,11 +1,11 @@
 #NOM
 INDEF-INDEF
 #ENTREES-PRIMITIF
-X/
-Y/
+X/indefini
+Y/indefini
 #CONTROLES-PRIMITIF
 #RESULTATS-PRIMITIF
-Z/
+Z/indefini
 #ENTREES-CORRECTIF
 #CONTROLES-CORRECTIF
 #RESULTATS-CORRECTIF

tests/cram/ok/arithmetique.t/div_x_0.irj

@@ -5,7 +5,7 @@ X/1
 Y/0
 #CONTROLES-PRIMITIF
 #RESULTATS-PRIMITIF
-Z/
+Z/indefini
 #ENTREES-CORRECTIF
 #CONTROLES-CORRECTIF
 #RESULTATS-CORRECTIF