[mc] Extend xbt_propositional_symbols

[simgrid.git] / include / xbt / automaton.h

diff --git a/include/xbt/automaton.h b/include/xbt/automaton.h
index c24453f..ade3328 100644 (file)
--- a/include/xbt/automaton.h
+++ b/include/xbt/automaton.h
@@ -57,10 +57,7 @@ typedef struct xbt_automaton_transition {
 typedef struct xbt_automaton_transition* xbt_automaton_transition_t;
 
 
-typedef struct xbt_automaton_propositional_symbol{
-  char* pred;
-  void* function;
-} s_xbt_automaton_propositional_symbol;
+typedef struct xbt_automaton_propositional_symbol s_xbt_automaton_propositional_symbol;
 
 typedef struct xbt_automaton_propositional_symbol* xbt_automaton_propositional_symbol_t;
 
@@ -99,7 +96,11 @@ XBT_PUBLIC(void) xbt_automaton_display(xbt_automaton_t a);
 
 XBT_PUBLIC(void) xbt_automaton_exp_label_display(xbt_automaton_exp_label_t l);
 
-XBT_PUBLIC(xbt_automaton_propositional_symbol_t) xbt_automaton_propositional_symbol_new(xbt_automaton_t a, const char* id, void* fct);
+XBT_PUBLIC(xbt_automaton_propositional_symbol_t) xbt_automaton_propositional_symbol_new(xbt_automaton_t a, const char* id, int(*fct)(void));
+
+XBT_PUBLIC(int) xbt_automaton_propositional_symbol_evaluate(xbt_automaton_propositional_symbol_t symbol);
+
+char* xbt_automaton_propositional_symbol_get_name(xbt_automaton_propositional_symbol_t symbol);
 
 XBT_PUBLIC(xbt_automaton_state_t) xbt_automaton_get_current_state(xbt_automaton_t a);