X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6fdd1cc92413cd4c176f51b41ba2f723ee5ba50f..999c6ca0248ff66351ef2ebd0901622384212bc6:/src/xbt/automaton/automatonparse_promela.c

diff --git a/src/xbt/automaton/automatonparse_promela.c b/src/xbt/automaton/automatonparse_promela.c
index 64d5813472..3d83df1cf3 100644
--- a/src/xbt/automaton/automatonparse_promela.c
+++ b/src/xbt/automaton/automatonparse_promela.c
@@ -42,17 +42,18 @@ static void new_state(char* id, int src){
   if(type==-1)
     parsed_automaton->current_state = state;
 
-  if(src)
+  if(src) {
+    if (state_id_src)
+      free(state_id_src);
     state_id_src = xbt_strdup(id);
-    
+  }
 }
 
-static void new_transition(char* id, xbt_automaton_exp_label_t label){
-
-  char* id_state = xbt_strdup(id);
+static void new_transition(char* id, xbt_automaton_exp_label_t label)
+{
   xbt_automaton_state_t state_dst = NULL;
   new_state(id, 0);
-  state_dst = xbt_automaton_state_exists(parsed_automaton, id_state);
+  state_dst = xbt_automaton_state_exists(parsed_automaton, id);
   xbt_automaton_state_t state_src = xbt_automaton_state_exists(parsed_automaton, state_id_src);
   
   //xbt_transition_t trans = NULL;
@@ -62,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;
+  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){
-  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;
-  }
-  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;
-  }
-  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;
-  }
-  case 3 : {
-    char* p = va_arg(ap, char*);
+  case 3 :
+    p = va_arg(ap, char*);
     label = xbt_automaton_exp_label_new(type, p);
     break;
-  }
-  case 4 : {
+  case 4 :
     label = xbt_automaton_exp_label_new(type);
     break;
   }
-  }
   va_end(ap);
   return label;
 }
 
-
 #include "parserPromela.tab.cacc"
 
 void xbt_automaton_load(xbt_automaton_t a, const char *file)