X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4386010688d60bea7f54c2383aa9c923f2980948..5c14275ba09456406ec4b8bf1ef2ca76e18fb32e:/src/xbt/automaton/automatonparse_promela.c

diff --git a/src/xbt/automaton/automatonparse_promela.c b/src/xbt/automaton/automatonparse_promela.c
index dffb34e9e9..84cb5838e1 100644
--- a/src/xbt/automaton/automatonparse_promela.c
+++ b/src/xbt/automaton/automatonparse_promela.c
@@ -1,6 +1,6 @@
 /* methods for implementation of automaton from promela description */
 
-/* Copyright (c) 2011-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2011-2019. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -12,25 +12,28 @@
 #if HAVE_UNISTD_H
 # include <unistd.h>   /* isatty */
 #endif
+#include <xbt/sysdep.h>
+
+#include "parserPromela.tab.cacc"
 
 static xbt_automaton_t parsed_automaton;
 char* state_id_src;
 
 static void new_state(char* id, int src){
-
+  char* saveptr = NULL; // for strtok_r()
   char* id_copy = xbt_strdup(id);
-  char* first_part = strtok(id_copy,"_");
+  const char* first_part = strtok_r(id_copy, "_", &saveptr);
   int type = 0 ; // -1=initial state; 0=intermediate state; 1=final state
 
   if(strcmp(first_part,"accept")==0){
     type = 1;
   }else{
-    char* second_part = strtok(NULL,"_");
+    const char* second_part = strtok_r(NULL, "_", &saveptr);
     if(strcmp(second_part,"init")==0){
       type = -1;
     }
   }
-  free(id_copy);
+  xbt_free(id_copy);
 
   xbt_automaton_state_t state = xbt_automaton_state_exists(parsed_automaton, id);
   if(state == NULL){
@@ -41,8 +44,7 @@ static void new_state(char* id, int src){
     parsed_automaton->current_state = state;
 
   if(src) {
-    if (state_id_src)
-      free(state_id_src);
+    xbt_free(state_id_src);
     state_id_src = xbt_strdup(id);
   }
 }
@@ -53,49 +55,10 @@ static void new_transition(char* id, xbt_automaton_exp_label_t label)
   xbt_automaton_state_t 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;
   xbt_automaton_transition_new(parsed_automaton, state_src, state_dst, 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 :
-    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 :
-    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 :
-    exp_not = va_arg(ap, xbt_automaton_exp_label_t);
-    label = xbt_automaton_exp_label_new(type, exp_not);
-    break;
-  case 3 :
-    p = va_arg(ap, char*);
-    label = xbt_automaton_exp_label_new(type, p);
-    break;
-  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)
 {
   parsed_automaton = a;