X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/23a620e6c6df0a9023991f607cb93b71ed8f6065..9006d78ba8a08a6500c994bb8141f48376448fc4:/include/xbt/automaton.h

diff --git a/include/xbt/automaton.h b/include/xbt/automaton.h
index 500309d67f..33acf99398 100644
--- a/include/xbt/automaton.h
+++ b/include/xbt/automaton.h
@@ -3,9 +3,9 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include "xbt/dynar.h"
-#include "xbt/sysdep.h"
-#include "xbt/graph.h"
+#include <xbt/dynar.h>
+#include <xbt/sysdep.h>
+#include <xbt/graph.h>
 
 SG_BEGIN_DECL()
 
@@ -14,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;
@@ -29,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;
@@ -42,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;
@@ -101,6 +103,15 @@ XBT_PUBLIC(xbt_propositional_symbol_t) xbt_new_propositional_symbol(xbt_automato
 
 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()
 
 #endif