Soc2c : arrays of arrays size were printed in the reverse order.

src/soc2c.ml

-(* Time-stamp: <modified the 12/06/2014 (at 10:40) by Erwan Jahier> *)
+(* Time-stamp: <modified the 13/06/2014 (at 15:36) by Erwan Jahier> *)
 
 
 (* let put (os: out_channel) (fmt:('a, unit, string, unit) format4) : 'a = *)
@@ -6,22 +6,32 @@
 
 open Printf
 open Soc2cIdent
+open Data
 
 let rec (type_to_string : Data.t -> string -> string) = 
   fun v n -> 
-    let str =
+    (* in order to print arrays of arrays type size in the good order, 
+       we accumulate the array size when v of of type array, and
+       we print it otherwise (finish).
+    *)
+    let rec finish acc str =
+      match acc with
+        |[] -> str
+        | s::ts -> Printf.sprintf "%s[%d]" (finish ts str) s 
+    in 
+    let rec aux acc v n =
       match v with
-        | Bool -> "_boolean "^n
-        | Int -> "_integer "^n
-        | Real-> "_real "^n
-        | Extern s -> s^" "^n
-        | Enum  (s, sl) -> id2s s ^" "^n
-        | Struct (sid,_) -> (id2s sid)^" "^n
-        | Array (ty, sz) -> Printf.sprintf "%s[%d]" (type_to_string ty n) sz 
-        | Alpha nb -> "alpha_"^(string_of_int nb)^" "^n
-        | Alias(a,_) -> a^" "^n
+        | Bool -> finish acc ("_boolean "^n)
+        | Int -> finish acc ("_integer "^n)
+        | Real-> finish acc ("_real "^n)
+        | Extern s -> finish acc (s^" "^n)
+        | Enum  (s, sl) -> finish acc (id2s s ^" "^n)
+        | Struct (sid,_) -> finish acc ((id2s sid)^" "^n)
+        | Array (ty, sz) -> aux (sz::acc) ty n
+        | Alpha nb -> finish acc ("alpha_"^(string_of_int nb)^" "^n)
+        | Alias(a,_) -> finish acc (a^" "^n)
     in
-    str
+    aux [] v n
 
 let rec (type_to_string2 : Data.t -> string) = 
   fun v -> 

test/lus2lic.sum

-Test Run By jahier on Fri Jun 13 14:46:06 2014
+Test Run By jahier on Fri Jun 13 15:37:49 2014
 Native configuration is i686-pc-linux-gnu
 
 		=== lus2lic tests ===
@@ -568,10 +568,10 @@ PASS: ./myec2c {-o /tmp/morel4.c /tmp/morel4.ec}
 PASS: ../utils/test_lus2lic_no_node should_work/morel4.lus
 PASS: ./lus2lic {-2c should_work/morel4.lus -n morel4}
 FAIL: Check that the generated C code compiles  : gcc morel4_morel4.c morel4_morel4_loop.c 
-FAIL: without any option: ./lus2lic {-o /tmp/trivial_array.lic should_work/trivial_array.lus}
+PASS: ./lus2lic {-o /tmp/trivial_array.lic should_work/trivial_array.lus}
 FAIL: Generate ec code  : ./lus2lic {-ec -o /tmp/trivial_array.ec should_work/trivial_array.lus}
 FAIL: Try to compare lus2lic -exec and ecexe: ../utils/test_lus2lic_no_node should_work/trivial_array.lus
-FAIL: Generate c code  : ./lus2lic {-2c should_work/trivial_array.lus -n trivial_array}
+PASS: ./lus2lic {-2c should_work/trivial_array.lus -n trivial_array}
 PASS: gcc trivial_array_trivial_array.c trivial_array_trivial_array_loop.c 
 PASS: ./lus2lic {-o /tmp/param_node4.lic should_work/param_node4.lus}
 PASS: ./lus2lic {-ec -o /tmp/param_node4.ec should_work/param_node4.lus}
@@ -1479,9 +1479,9 @@ XPASS: Test bad programs (semantics): lus2lic {-o /tmp/bug.lic should_fail/seman
 
 		=== lus2lic Summary ===
 
-# of expected passes		1171
-# of unexpected failures	238
+# of expected passes		1173
+# of unexpected failures	236
 # of unexpected successes	21
 # of expected failures		37
-testcase ./lus2lic.tests/non-reg.exp completed in 116 seconds
-testcase ./lus2lic.tests/progression.exp completed in 0 seconds
+testcase ./lus2lic.tests/non-reg.exp completed in 118 seconds
+testcase ./lus2lic.tests/progression.exp completed in 1 seconds

test/lus2lic.time

-testcase ./lus2lic.tests/non-reg.exp completed in 116 seconds
-testcase ./lus2lic.tests/progression.exp completed in 0 seconds
+testcase ./lus2lic.tests/non-reg.exp completed in 118 seconds
+testcase ./lus2lic.tests/progression.exp completed in 1 seconds