Change most mcmini tests to odpor reduction; the unchanged one fails to find the...

[simgrid.git] / src / xbt / automaton / automatonparse_promela.c

diff --git a/src/xbt/automaton/automatonparse_promela.c b/src/xbt/automaton/automatonparse_promela.c
index 84cb583..4fad698 100644 (file)
--- 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-2023. 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. */
@@ -19,7 +19,8 @@
 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);
   const char* first_part = strtok_r(id_copy, "_", &saveptr);
@@ -49,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);
@@ -62,8 +63,8 @@ static void new_transition(char* id, xbt_automaton_exp_label_t label)
 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));
-  yyparse();
+  xbt_automaton_parser_in = fopen(file, "r");
+  xbt_assert(xbt_automaton_parser_in != NULL, "Failed to open automaton file `%s': %s", file, strerror(errno));
+  xbt_automaton_parser_parse();
+  fclose(xbt_automaton_parser_in);
 }