/* 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. */
#if HAVE_UNISTD_H
# include <unistd.h> /* isatty */
#endif
+#include <xbt/log.h>
+#include <xbt/sysdep.h>
+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(xbt_automaton);
static xbt_automaton_t parsed_automaton;
char* state_id_src;
static void new_state(char* id, int src){
- char* saveptr; // for strtok_r()
+ char* saveptr = NULL; // for strtok_r()
char* id_copy = xbt_strdup(id);
char* first_part = strtok_r(id_copy, "_", &saveptr);
int type = 0 ; // -1=initial state; 0=intermediate state; 1=final state
type = -1;
}
}
- free(id_copy);
+ xbt_free(id_copy);
xbt_automaton_state_t state = xbt_automaton_state_exists(parsed_automaton, id);
if(state == NULL){
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);
}
}
}
-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)