Don't use reserved keywords.

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

diff --git a/include/xbt/automaton.h b/include/xbt/automaton.h
index a91f8ab..33acf99 100644 (file)
--- a/include/xbt/automaton.h
+++ b/include/xbt/automaton.h
@@ -3,8 +3,9 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "xbt/dynar.h"
-#include "xbt/sysdep.h"
+#include <xbt/dynar.h>
+#include <xbt/sysdep.h>
+#include <xbt/graph.h>
 
 SG_BEGIN_DECL()
 
@@ -13,7 +14,6 @@ typedef struct xbt_state {
   int type; /* -1 = init, 0 = inter, 1 = final */
   xbt_dynar_t in;
   xbt_dynar_t out;
-  int visited;
 } s_xbt_state;
 
 typedef struct xbt_state* xbt_state_t;
@@ -28,7 +28,9 @@ typedef struct xbt_automaton {
 typedef struct xbt_automaton* xbt_automaton_t;
 
 typedef struct xbt_exp_label{
-  enum{or=0, and=1, not=2, predicat=3, one=4} type;
+  /* fixme: "or", "and", and "not" are reserved keywords in C++ */
+  /* enum{or=0, and=1, not=2, predicat=3, one=4} type; */
+  int type;
   union{
     struct{
       struct xbt_exp_label* left_exp;
@@ -41,15 +43,16 @@ typedef struct xbt_exp_label{
 
 typedef struct xbt_exp_label* xbt_exp_label_t;
 
+
 typedef struct xbt_transition {
   xbt_state_t src;
   xbt_state_t dst;
   xbt_exp_label_t label;
 } s_xbt_transition;
 
-
 typedef struct xbt_transition* xbt_transition_t;
 
+
 typedef struct xbt_propositional_symbol{
   char* pred;
   void* function;
@@ -58,7 +61,7 @@ typedef struct xbt_propositional_symbol{
 typedef struct xbt_propositional_symbol* xbt_propositional_symbol_t;
 
 
-XBT_PUBLIC(xbt_automaton_t) xbt_automaton_new_automaton();
+XBT_PUBLIC(xbt_automaton_t) xbt_automaton_new_automaton(void);
 
 XBT_PUBLIC(xbt_state_t) xbt_automaton_new_state(xbt_automaton_t a, int type, char* id);
 
@@ -96,7 +99,18 @@ XBT_PUBLIC(void) xbt_automaton_display(xbt_automaton_t a);
 
 XBT_PUBLIC(void) xbt_automaton_display_exp(xbt_exp_label_t l);
 
-XBT_PUBLIC(xbt_propositional_symbol_t) xbt_new_propositional_symbol(xbt_automaton_t a, char* id, void* fct);
+XBT_PUBLIC(xbt_propositional_symbol_t) xbt_new_propositional_symbol(xbt_automaton_t a, const char* id, void* fct);
+
+XBT_PUBLIC(xbt_state_t) xbt_automaton_get_current_state(xbt_automaton_t a);
+
+XBT_PUBLIC(int) automaton_state_compare(xbt_state_t s1, xbt_state_t s2);
+
+XBT_PUBLIC(int) propositional_symbols_compare_value(xbt_dynar_t s1, xbt_dynar_t s2);
+
+XBT_PUBLIC(int) automaton_transition_compare(const void *t1, const void *t2);
+
+XBT_PUBLIC(int) automaton_label_transition_compare(xbt_exp_label_t l1, xbt_exp_label_t l2);
+
 
 SG_END_DECL()