X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/421aa4b3efd1134af2afa1ebb920bb562ee58973..c415c91f074a3047abd92a7d63b59baf1c61f51a:/src/include/surf/surf_parse.h

diff --git a/src/include/surf/surf_parse.h b/src/include/surf/surf_parse.h
index 284224fc05..32e810e22c 100644
--- a/src/include/surf/surf_parse.h
+++ b/src/include/surf/surf_parse.h
@@ -10,37 +10,32 @@
 
 #include "xbt/misc.h"
 #include "surf/trace_mgr.h"
+#include "surfxml.h"
+
+typedef   void (*void_f_void_t)(void);
+
+extern void_f_void_t STag_platform_description_fun;
+extern void_f_void_t ETag_platform_description_fun;
+extern void_f_void_t STag_cpu_fun;
+extern void_f_void_t ETag_cpu_fun;
+extern void_f_void_t STag_network_link_fun;
+extern void_f_void_t ETag_network_link_fun;
+extern void_f_void_t STag_route_fun;
+extern void_f_void_t ETag_route_fun;
+extern void_f_void_t STag_route_element_fun;
+extern void_f_void_t ETag_route_element_fun;
+extern void_f_void_t STag_process_fun;
+extern void_f_void_t ETag_process_fun;
+extern void_f_void_t STag_argument_fun;
+extern void_f_void_t ETag_argument_fun;
+
 
-typedef enum {
-  TOKEN_EMPTY = 0,
-  TOKEN_LP = 512,
-  TOKEN_RP,
-  TOKEN_BEGIN_SECTION,
-  TOKEN_END_SECTION,
-  TOKEN_CLOSURE,
-  TOKEN_WORD,
-  TOKEN_NEWLINE,
-  TOKEN_ERROR
-} e_surf_token_t;
-
-#define MAX_STR_CONST 1024
-
-extern char *surf_parse_text;
-extern int surf_line_pos;
-extern int surf_char_pos;
-extern int surf_tok_num;
-
-e_surf_token_t surf_parse(void);
-void find_section(const char *file, const char *section_name);
-void close_section(const char *section_name);
-void surf_parse_double(double *value);
-void surf_parse_trace(tmgr_trace_t * trace);
-void surf_parse_deployment_line(char **host, int *argc, char ***argv);
-
-
-/* Should not be called if you use the previous "section" functions */
 void surf_parse_open(const char *file);
 void surf_parse_close(void);
+int  surf_parse(void);
+void surf_parse_reset_parser(void);
+void surf_parse_get_double(double *value,const char *string);
+void surf_parse_get_trace(tmgr_trace_t *trace, const char *string);
 
 /* Prototypes of the functions offered by flex */
 int surf_parse_lex(void);
@@ -56,5 +51,4 @@ int surf_parse_get_debug(void);
 void surf_parse_set_debug(int bdebug);
 int surf_parse_lex_destroy(void);
 
-
 #endif