X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/076060bb0d2eee4471e64f58203498350f309fb7..a3996e17ef48f52770490734e92ba9bd4109ef83:/include/xbt/automaton.h

diff --git a/include/xbt/automaton.h b/include/xbt/automaton.h
index 56e7e6ee72..49df4630c0 100644
--- a/include/xbt/automaton.h
+++ b/include/xbt/automaton.h
@@ -1,11 +1,3 @@
-/*  xbt/automaton.h -- büchi automaton                                      */
-
-/* Copyright (c) 2011. 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. */
-
 #ifndef _XBT_AUTOMATON_H
 #define _XBT_AUTOMATON_H
 
@@ -36,9 +28,7 @@ typedef struct xbt_automaton {
 typedef struct xbt_automaton* xbt_automaton_t;
 
 typedef struct xbt_exp_label{
-  /* fixme: "or", "and", and "not" are reserved keywords in C++ */
-  /* enum{or=0, and=1, not=2, predicat=3, one=4} type; */
-  int type;
+  enum{or=0, and=1, not=2, predicat=3, one=4} type;
   union{
     struct{
       struct xbt_exp_label* left_exp;
@@ -69,7 +59,8 @@ typedef struct xbt_propositional_symbol{
 typedef struct xbt_propositional_symbol* xbt_propositional_symbol_t;
 
 
-XBT_PUBLIC(xbt_automaton_t) xbt_automaton_new_automaton(void);
+XBT_PUBLIC(xbt_automaton_t) xbt_automaton_new(void);
+XBT_PUBLIC(void) xbt_automaton_load(xbt_automaton_t automaton, const char *file);
 
 XBT_PUBLIC(xbt_state_t) xbt_automaton_new_state(xbt_automaton_t a, int type, char* id);