/* automaton - representation of büchi automaton */
-/* Copyright (c) 2011-2014. The SimGrid Team.
+/* Copyright (c) 2011-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
xbt_automaton_state_t state = NULL;
state = xbt_new0(struct xbt_automaton_state, 1);
state->type = type;
- state->id = strdup(id);
+ state->id = xbt_strdup(id);
state->in = xbt_dynar_new(sizeof(xbt_automaton_transition_t), xbt_automaton_transition_free_voidp);
state->out = xbt_dynar_new(sizeof(xbt_automaton_transition_t), xbt_automaton_transition_free_voidp);
xbt_dynar_push(a->states, &state);
}
case 3 :{
char* p = va_arg(ap, char*);
- label->u.predicat = strdup(p);
+ label->u.predicat = xbt_strdup(p);
break;
}
}
}
void xbt_automaton_display(xbt_automaton_t a){
- unsigned int cursor = 0;
+ unsigned int cursor;
xbt_automaton_state_t state = NULL;
- printf("\n\nEtat courant : %s\n", a->current_state->id);
+ printf("\n\nCurrent state: %s\n", a->current_state->id);
- printf("\nListe des états : %lu\n\n", xbt_dynar_length(a->states));
+ printf("\nStates' List: %lu\n\n", xbt_dynar_length(a->states));
- xbt_dynar_foreach(a->states, cursor, state){
- printf("ID : %s, type : %d\n", state->id, state->type);
- }
+ xbt_dynar_foreach(a->states, cursor, state)
+ printf("ID: %s, type: %d\n", state->id, state->type);
- cursor=0;
- xbt_automaton_transition_t transition = NULL;
- printf("\nListe des transitions : %lu\n\n", xbt_dynar_length(a->transitions));
+ xbt_automaton_transition_t transition;
+ printf("\nTransitions: %lu\n\n", xbt_dynar_length(a->transitions));
xbt_dynar_foreach(a->transitions, cursor, transition){
- printf("label :");
+ printf("label:");
xbt_automaton_exp_label_display(transition->label);
printf(", %s -> %s\n", transition->src->id, transition->dst->id);
}
xbt_automaton_propositional_symbol_t xbt_automaton_propositional_symbol_new(xbt_automaton_t a, const char* id, int(*fct)(void)){
xbt_automaton_propositional_symbol_t prop_symb = NULL;
prop_symb = xbt_new0(struct xbt_automaton_propositional_symbol, 1);
- prop_symb->pred = strdup(id);
+ prop_symb->pred = xbt_strdup(id);
prop_symb->callback = call_simple_function;
prop_symb->data = fct;
prop_symb->free_function = NULL;
{
xbt_automaton_propositional_symbol_t prop_symb = NULL;
prop_symb = xbt_new0(struct xbt_automaton_propositional_symbol, 1);
- prop_symb->pred = strdup(id);
+ prop_symb->pred = xbt_strdup(id);
prop_symb->callback = NULL;
prop_symb->data = value;
prop_symb->free_function = NULL;
{
xbt_automaton_propositional_symbol_t prop_symb = NULL;
prop_symb = xbt_new0(struct xbt_automaton_propositional_symbol, 1);
- prop_symb->pred = strdup(id);
+ prop_symb->pred = xbt_strdup(id);
prop_symb->callback = callback;
prop_symb->data = data;
prop_symb->free_function = free_function;