#define _SURF_SURFXML_PARSE_H
#include <stdio.h> /* to have FILE */
-#include "surf/surfxml.h"
+#include "surf/simgrid_dtd.h"
#include "xbt/function_types.h"
#include "xbt/dict.h"
/* Hook for the different tags. All the functions which pointer to are push into here are run when the tag is encountered */
-XBT_PUBLIC(xbt_dynar_t) STag_surfxml_platform_description_cb_list;
-XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_platform_description_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_platform_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_platform_cb_list;
XBT_PUBLIC(xbt_dynar_t) STag_surfxml_host_cb_list;
XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_host_cb_list;
XBT_PUBLIC(xbt_dynar_t) STag_surfxml_router_cb_list;
XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_argument_cb_list;
XBT_PUBLIC(xbt_dynar_t) STag_surfxml_prop_cb_list;
XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_prop_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_set_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_set_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_foreach_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_foreach_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_route_c_multi_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_route_c_multi_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_cluster_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_cluster_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_trace_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_trace_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_trace_c_connect_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_trace_c_connect_cb_list;
+XBT_PUBLIC(xbt_dynar_t) STag_surfxml_random_cb_list;
+XBT_PUBLIC(xbt_dynar_t) ETag_surfxml_random_cb_list;
XBT_PUBLIC(void) surf_parse_open(const char *file);
XBT_PUBLIC(void) surf_parse_close(void);
XBT_PUBLIC(void) surf_parse_reset_parser(void);
+XBT_PUBLIC(void) surf_parse_free_callbacks(void);
XBT_PUBLIC(void) surf_parse_get_double(double *value,const char *string);
+XBT_PUBLIC(void) surf_parse_get_int(int *value,const char *string);
/* Prototypes of the functions offered by flex */
XBT_PUBLIC(int) surf_parse_lex(void);
#define SURFXML_BUFFER_SET(key,val) do { \
AX_surfxml_##key=AX_ptr; \
strcpy(A_surfxml_##key,val); \
- AX_ptr+=strlen(val)+1; } while(0)
+ AX_ptr+=(int)strlen(val)+1; } while(0)
#define SURFXML_BUFFER_RESET() do { \
AX_ptr = 0; \
#define SURFXML_START_TAG(tag) STag_surfxml_##tag()
#define SURFXML_END_TAG(tag) do { ETag_surfxml_##tag(); SURFXML_BUFFER_RESET(); } while(0)
+XBT_PUBLIC(void) surfxml_add_callback(xbt_dynar_t cb_list, void_f_void_t function);
#endif