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

diff --git a/src/xbt/automaton/automatonparse_promela.c b/src/xbt/automaton/automatonparse_promela.c
index 104630c791..6763a2e901 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-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2011-2022. 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,24 +12,24 @@
 #if HAVE_UNISTD_H
 # include <unistd.h>   /* isatty */
 #endif
-#include <xbt/log.h>
 #include <xbt/sysdep.h>
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_automaton);
+#include "parserPromela.tab.cacc"
 
 static xbt_automaton_t parsed_automaton;
 char* state_id_src;
 
-static void new_state(char* id, int src){
+static void new_state(const char* id, int src)
+{
   char* saveptr = NULL; // for strtok_r()
   char* id_copy = xbt_strdup(id);
-  char* first_part = strtok_r(id_copy, "_", &saveptr);
+  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_r(NULL, "_", &saveptr);
+    const char* second_part = strtok_r(NULL, "_", &saveptr);
     if(strcmp(second_part,"init")==0){
       type = -1;
     }
@@ -50,7 +50,7 @@ static void new_state(char* id, int src){
   }
 }
 
-static void new_transition(char* id, xbt_automaton_exp_label_t label)
+static void new_transition(const char* id, xbt_automaton_exp_label_t label)
 {
   new_state(id, 0);
   xbt_automaton_state_t state_dst = xbt_automaton_state_exists(parsed_automaton, id);
@@ -60,13 +60,11 @@ static void new_transition(char* id, xbt_automaton_exp_label_t label)
 
 }
 
-#include "parserPromela.tab.cacc"
-
 void xbt_automaton_load(xbt_automaton_t a, const char *file)
 {
   parsed_automaton = a;
   yyin = fopen(file, "r");
-  if (yyin == NULL)
-    xbt_die("Failed to open automaton file `%s': %s", file, strerror(errno));
+  xbt_assert(yyin != NULL, "Failed to open automaton file `%s': %s", file, strerror(errno));
   yyparse();
+  fclose(yyin);
 }