catch also some more sensible "nested code block"

diff --git a/src/xbt/automaton/automaton.c b/src/xbt/automaton/automaton.c
index 2813415..8be963d 100644 (file)
--- a/src/xbt/automaton/automaton.c
+++ b/src/xbt/automaton/automaton.c
@@ -60,35 +60,34 @@ xbt_automaton_exp_label_t xbt_automaton_exp_label_new(int type, ...){
   xbt_automaton_exp_label_t label = NULL;
   label = xbt_new0(struct xbt_automaton_exp_label, 1);
   label->type = type;
   xbt_automaton_exp_label_t label = NULL;
   label = xbt_new0(struct xbt_automaton_exp_label, 1);
   label->type = type;

-
+  xbt_automaton_exp_label_t left;
+  xbt_automaton_exp_label_t right;
+  xbt_automaton_exp_label_t exp_not;
+  char *p;

   va_list ap;
   va_start(ap, type);
   switch(type){
   va_list ap;
   va_start(ap, type);
   switch(type){

-  case 0 : {
-    xbt_automaton_exp_label_t left = va_arg(ap, xbt_automaton_exp_label_t);
-    xbt_automaton_exp_label_t right = va_arg(ap, xbt_automaton_exp_label_t);
+  case 0 :
+    left = va_arg(ap, xbt_automaton_exp_label_t);
+    right = va_arg(ap, xbt_automaton_exp_label_t);

     label->u.or_and.left_exp = left;
     label->u.or_and.right_exp = right;
     break;
     label->u.or_and.left_exp = left;
     label->u.or_and.right_exp = right;
     break;

-  }
-  case 1 : {
-    xbt_automaton_exp_label_t left = va_arg(ap, xbt_automaton_exp_label_t);
-    xbt_automaton_exp_label_t right = va_arg(ap, xbt_automaton_exp_label_t);
+  case 1 :
+    left = va_arg(ap, xbt_automaton_exp_label_t);
+    right = va_arg(ap, xbt_automaton_exp_label_t);

     label->u.or_and.left_exp = left;
     label->u.or_and.right_exp = right;
     break;
     label->u.or_and.left_exp = left;
     label->u.or_and.right_exp = right;
     break;

-  }
-  case 2 : {
-    xbt_automaton_exp_label_t exp_not = va_arg(ap, xbt_automaton_exp_label_t);
+  case 2 :
+    exp_not = va_arg(ap, xbt_automaton_exp_label_t);

     label->u.exp_not = exp_not;
     break;
     label->u.exp_not = exp_not;
     break;

-  }
-  case 3 :{
-    char* p = va_arg(ap, char*);
+  case 3 :
+    p = va_arg(ap, char*);

     label->u.predicat = xbt_strdup(p);
     break;
   }
     label->u.predicat = xbt_strdup(p);
     break;
   }

-  }

   va_end(ap);
   return label;
 }
   va_end(ap);
   return label;
 }

diff --git a/src/xbt/automaton/automatonparse_promela.c b/src/xbt/automaton/automatonparse_promela.c
index b86bf6e..3d83df1 100644 (file)
--- a/src/xbt/automaton/automatonparse_promela.c
+++ b/src/xbt/automaton/automatonparse_promela.c
@@ -63,41 +63,40 @@ static void new_transition(char* id, xbt_automaton_exp_label_t label)
 
 static xbt_automaton_exp_label_t new_label(int type, ...){
   xbt_automaton_exp_label_t label = NULL;
 
 static xbt_automaton_exp_label_t new_label(int type, ...){
   xbt_automaton_exp_label_t label = NULL;

+  xbt_automaton_exp_label_t left;
+  xbt_automaton_exp_label_t right;
+  xbt_automaton_exp_label_t exp_not;
+  char *p;
+

   va_list ap;
   va_start(ap,type);
   switch(type){
   va_list ap;
   va_start(ap,type);
   switch(type){

-  case 0 : {
-    xbt_automaton_exp_label_t left = va_arg(ap, xbt_automaton_exp_label_t);
-    xbt_automaton_exp_label_t right = va_arg(ap, xbt_automaton_exp_label_t);
+  case 0 :
+    left = va_arg(ap, xbt_automaton_exp_label_t);
+    right = va_arg(ap, xbt_automaton_exp_label_t);

     label = xbt_automaton_exp_label_new(type, left, right);
     break;
     label = xbt_automaton_exp_label_new(type, left, right);
     break;

-  }
-  case 1 : {
-    xbt_automaton_exp_label_t left = va_arg(ap, xbt_automaton_exp_label_t);
-    xbt_automaton_exp_label_t right = va_arg(ap, xbt_automaton_exp_label_t);
+  case 1 :
+    left = va_arg(ap, xbt_automaton_exp_label_t);
+    right = va_arg(ap, xbt_automaton_exp_label_t);

     label = xbt_automaton_exp_label_new(type, left, right);
     break;
     label = xbt_automaton_exp_label_new(type, left, right);
     break;

-  }
-  case 2 : {
-    xbt_automaton_exp_label_t exp_not = va_arg(ap, xbt_automaton_exp_label_t);
+  case 2 :
+    exp_not = va_arg(ap, xbt_automaton_exp_label_t);

     label = xbt_automaton_exp_label_new(type, exp_not);
     break;
     label = xbt_automaton_exp_label_new(type, exp_not);
     break;

-  }
-  case 3 : {
-    char* p = va_arg(ap, char*);
+  case 3 :
+    p = va_arg(ap, char*);

     label = xbt_automaton_exp_label_new(type, p);
     break;
     label = xbt_automaton_exp_label_new(type, p);
     break;

-  }
-  case 4 : {
+  case 4 :

     label = xbt_automaton_exp_label_new(type);
     break;
   }
     label = xbt_automaton_exp_label_new(type);
     break;
   }

-  }

   va_end(ap);
   return label;
 }
 
   va_end(ap);
   return label;
 }
 

-

 #include "parserPromela.tab.cacc"
 
 void xbt_automaton_load(xbt_automaton_t a, const char *file)
 #include "parserPromela.tab.cacc"
 
 void xbt_automaton_load(xbt_automaton_t a, const char *file)