kill (for real) an obscure obsolete way of bypassing the XML parser

[simgrid.git] / include / surf / surfxml_parse.h

diff --git a/include/surf/surfxml_parse.h b/include/surf/surfxml_parse.h
index 0d69e6a..eca8e27 100644 (file)
--- a/include/surf/surfxml_parse.h
+++ b/include/surf/surfxml_parse.h
@@ -1,6 +1,5 @@
-/*     $Id$     */
-
-/* Copyright (c) 2005 Arnaud Legrand. All rights reserved.                  */
+/* Copyright (c) 2006-2014. 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. */
@@ -8,49 +7,39 @@
 #ifndef _SURF_SURFXML_PARSE_H
 #define _SURF_SURFXML_PARSE_H
 
-#include <stdio.h> /* to have FILE */
-#include "surf/surfxml.h"
+#include <stdio.h>              /* to have FILE */
+#include "xbt/misc.h"
 #include "xbt/function_types.h"
 #include "xbt/dict.h"
 
-/* Entry-point of the surfxml parser. */
-XBT_PUBLIC_DATA(int_f_void_t) surf_parse;
-
-/* Hook for the different tags. They can be redefined at will whereas
-   the versions without the _fun can't. */
-/*
-XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_platform_description_fun;
-XBT_PUBLIC_DATA(void_f_void_t) ETag_surfxml_platform_description_fun;
-XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_cpu_fun;
-XBT_PUBLIC_DATA(void_f_void_t) ETag_surfxml_cpu_fun;
-XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_router_fun;
-XBT_PUBLIC_DATA(void_f_void_t) ETag_surfxml_router_fun;
-XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_network_link_fun;
-XBT_PUBLIC_DATA(void_f_void_t) ETag_surfxml_network_link_fun;
-XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_route_fun;
-XBT_PUBLIC_DATA(void_f_void_t) ETag_surfxml_route_fun;
-XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_route_element_fun;
-XBT_PUBLIC_DATA(void_f_void_t) ETag_surfxml_route_element_fun;
-XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_process_fun;
-XBT_PUBLIC_DATA(void_f_void_t) ETag_surfxml_process_fun;
-XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_argument_fun;
-XBT_PUBLIC_DATA(void_f_void_t) ETag_surfxml_argument_fun;
-XBT_PUBLIC_DATA(void_f_void_t) STag_surfxml_prop_fun;
-XBT_PUBLIC_DATA(void_f_void_t) ETag_surfxml_prop_fun;
-*/
+SG_BEGIN_DECL()
+#include "surf/simgrid_dtd.h"
+
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
 
 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_get_double(double *value,const char *string);
+XBT_PUBLIC(void) surf_parse_assert(bool cond, const char *fmt, ...) XBT_ATTRIB_PRINTF(2,3);
+XBT_PUBLIC(void) XBT_ATTRIB_NORETURN surf_parse_error(const char *msg,...) XBT_ATTRIB_PRINTF(1,2);
+XBT_PUBLIC(void) surf_parse_warn(const char *msg,...) XBT_ATTRIB_PRINTF(1,2);
+
+XBT_PUBLIC(double) surf_parse_get_double(const char *string);
+XBT_PUBLIC(int) surf_parse_get_int(const char *string);
+XBT_PUBLIC(double) surf_parse_get_time(const char *string, const char *entity_kind, const char *name);
+XBT_PUBLIC(double) surf_parse_get_size(const char *string, const char *entity_kind, const char *name);
+XBT_PUBLIC(double) surf_parse_get_bandwidth(const char *string, const char *entity_kind, const char *name);
+XBT_PUBLIC(double) surf_parse_get_speed(const char *string, const char *entity_kind, const char *name);
 
 /* Prototypes of the functions offered by flex */
 XBT_PUBLIC(int) surf_parse_lex(void);
 XBT_PUBLIC(int) surf_parse_get_lineno(void);
-XBT_PUBLIC(FILE*) surf_parse_get_in(void);
-XBT_PUBLIC(FILE*) surf_parse_get_out(void);
-XBT_PUBLIC(int) surf_parse_get_leng(void);
-XBT_PUBLIC(char*) surf_parse_get_text(void);
+XBT_PUBLIC(FILE *) surf_parse_get_in(void);
+XBT_PUBLIC(FILE *) surf_parse_get_out(void);
+XBT_PUBLIC(yy_size_t) surf_parse_get_leng(void);
+XBT_PUBLIC(char *) surf_parse_get_text(void);
 XBT_PUBLIC(void) surf_parse_set_lineno(int line_number);
 XBT_PUBLIC(void) surf_parse_set_in(FILE * in_str);
 XBT_PUBLIC(void) surf_parse_set_out(FILE * out_str);
@@ -58,4 +47,8 @@ XBT_PUBLIC(int) surf_parse_get_debug(void);
 XBT_PUBLIC(void) surf_parse_set_debug(int bdebug);
 XBT_PUBLIC(int) surf_parse_lex_destroy(void);
 
+/* What is needed to bypass the parser. */
+XBT_PUBLIC_DATA(int_f_void_t) surf_parse;       /* Entry-point to the parser. Set this to your function. */
+
+SG_END_DECL()
 #endif