[paparazzi-commits] [4041] fix bug in exception handling

[Pascal Brisset]

Revision: 4041
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=4041
Author:   hecto
Date:     2009-09-01 12:47:30 +0000 (Tue, 01 Sep 2009)
Log Message:
-----------
 fix bug in exception handling

Modified Paths:
--------------
    paparazzi3/trunk/sw/tools/gen_flight_plan.ml

Modified: paparazzi3/trunk/sw/tools/gen_flight_plan.ml
===================================================================
--- paparazzi3/trunk/sw/tools/gen_flight_plan.ml        2009-09-01 11:31:49 UTC 
(rev 4040)
+++ paparazzi3/trunk/sw/tools/gen_flight_plan.ml        2009-09-01 12:47:30 UTC 
(rev 4041)
@@ -139,14 +139,14 @@
 
 let get_index_block = fun x ->
   try
-    string_of_int (List.assoc x !index_of_blocks)
+    List.assoc x !index_of_blocks
   with
     Not_found -> failwith (sprintf "Unknown block: '%s'" x)
 
 let print_exception = fun x ->
   let i = get_index_block (ExtXml.attrib x "deroute") in
   let c = parsed_attrib x "cond" in
-  lprintf "if ((nav_block != %s) && %s) { GotoBlock(%s); return; }\n" c i i
+  lprintf "if ((nav_block != %d) && %s) { GotoBlock(%d); return; }\n" i c i
 
 let element = fun a b c -> Xml.Element (a, b, c)
 let goto l = element "goto" ["name",l] []
@@ -281,7 +281,7 @@
        lprintf "Goto(%s)\n" (name_of x)
     | "deroute" ->
        stage ();
-       lprintf "GotoBlock(%s);\n" (get_index_block (ExtXml.attrib x "block"));
+       lprintf "GotoBlock(%d);\n" (get_index_block (ExtXml.attrib x "block"));
        lprintf "break;\n"
     | "exit_block" ->
        stage ();