Further rename the identifiers of flexml to simgrid_parse_*

diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index c27e814..3e170be 100644 (file)
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -313,9 +313,9 @@ void EngineImpl::load_deployment(const std::string& file) const
 {
   sg_platf_parser_finalize();
 
-  surf_parse_open(file);
-  surf_parse();
-  surf_parse_close();
+  simgrid_parse_open(file);
+  simgrid_parse();
+  simgrid_parse_close();
 }
 
 void EngineImpl::register_function(const std::string& name, const actor::ActorCodeFactory& code)

diff --git a/src/kernel/resource/FactorSet.cpp b/src/kernel/resource/FactorSet.cpp
index 1794989..8e42bb9 100644 (file)
--- a/src/kernel/resource/FactorSet.cpp
+++ b/src/kernel/resource/FactorSet.cpp
@@ -16,8 +16,8 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(ker_resource);
 
-extern std::string surf_parsed_filename;
-extern int surf_parse_lineno;
+extern std::string simgrid_parsed_filename;
+extern int simgrid_parse_lineno;
 
 namespace simgrid::kernel::resource {
 
@@ -62,7 +62,7 @@ void FactorSet::parse(const std::string& values)
         }
       } else {
         try {
-          fact.values.push_back(xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, *factor_iter, ""));
+          fact.values.push_back(xbt_parse_get_time(simgrid_parsed_filename, simgrid_parse_lineno, *factor_iter, ""));
         } catch (const std::invalid_argument&) {
           throw std::invalid_argument("Invalid factor value " + std::to_string(iteration) + " in chunk " +
                                       std::to_string(factors_.size() + 1) + ": " + *factor_iter + " for " + name_);

diff --git a/src/kernel/routing/FatTreeZone.cpp b/src/kernel/routing/FatTreeZone.cpp
index 0c33475..0995b81 100644 (file)
--- a/src/kernel/routing/FatTreeZone.cpp
+++ b/src/kernel/routing/FatTreeZone.cpp
@@ -7,7 +7,7 @@
 #include <simgrid/kernel/routing/NetPoint.hpp>
 
 #include "src/kernel/resource/NetworkModel.hpp"
-#include "src/surf/xml/platf.hpp" // surf_parse_error() and surf_parse_assert()
+#include "src/surf/xml/platf.hpp" // simgrid_parse_error() and simgrid_parse_assert()
 
 #include <fstream>
 #include <numeric>
@@ -232,9 +232,10 @@ void FatTreeZone::generate_switches(const s4u::ClusterCallbacks& set_callbacks)
     this->nodes_by_level_[0] *= this->num_children_per_node_[i];
 
   if (this->nodes_by_level_[0] != this->nodes_.size()) {
-    surf_parse_error("The number of provided nodes does not fit with the wanted topology."
-                     " Please check your platform description (We need " +
-                     std::to_string(this->nodes_by_level_[0]) + "nodes, we got " + std::to_string(this->nodes_.size()));
+    simgrid_parse_error("The number of provided nodes does not fit with the wanted topology."
+                        " Please check your platform description (We need " +
+                        std::to_string(this->nodes_by_level_[0]) + "nodes, we got " +
+                        std::to_string(this->nodes_.size()));
   }
 
   for (unsigned int i = 0; i < this->levels_; i++) {
@@ -415,7 +416,7 @@ s4u::FatTreeParams FatTreeZone::parse_topo_parameters(const std::string& topo_pa
   std::vector<unsigned int> count;
   boost::split(parameters, topo_parameters, boost::is_any_of(";"));
 
-  surf_parse_assert(
+  simgrid_parse_assert(
       parameters.size() == 4,
       "Fat trees are defined by the levels number and 3 vectors, see the documentation for more information.");
 
@@ -423,41 +424,41 @@ s4u::FatTreeParams FatTreeZone::parse_topo_parameters(const std::string& topo_pa
   try {
     n_lev = std::stoi(parameters[0]);
   } catch (const std::invalid_argument&) {
-    surf_parse_error("First parameter is not the amount of levels: " + parameters[0]);
+    simgrid_parse_error("First parameter is not the amount of levels: " + parameters[0]);
   }
 
   // Then, a l-sized vector standing for the children number by level
   boost::split(tmp, parameters[1], boost::is_any_of(","));
-  surf_parse_assert(tmp.size() == n_lev, "You specified " + std::to_string(n_lev) +
-                                             " levels but the child count vector (the first one) contains " +
-                                             std::to_string(tmp.size()) + " levels.");
+  simgrid_parse_assert(tmp.size() == n_lev, "You specified " + std::to_string(n_lev) +
+                                                " levels but the child count vector (the first one) contains " +
+                                                std::to_string(tmp.size()) + " levels.");
 
   for (std::string const& level : tmp) {
     try {
       down.push_back(std::stoi(level));
     } catch (const std::invalid_argument&) {
-      surf_parse_error("Invalid child count: " + level);
+      simgrid_parse_error("Invalid child count: " + level);
     }
   }
 
   // Then, a l-sized vector standing for the parents number by level
   boost::split(tmp, parameters[2], boost::is_any_of(","));
-  surf_parse_assert(tmp.size() == n_lev, "You specified " + std::to_string(n_lev) +
-                                             " levels but the parent count vector (the second one) contains " +
-                                             std::to_string(tmp.size()) + " levels.");
+  simgrid_parse_assert(tmp.size() == n_lev, "You specified " + std::to_string(n_lev) +
+                                                " levels but the parent count vector (the second one) contains " +
+                                                std::to_string(tmp.size()) + " levels.");
   for (std::string const& parent : tmp) {
     try {
       up.push_back(std::stoi(parent));
     } catch (const std::invalid_argument&) {
-      surf_parse_error("Invalid parent count: " + parent);
+      simgrid_parse_error("Invalid parent count: " + parent);
     }
   }
 
   // Finally, a l-sized vector standing for the ports number with the lower level
   boost::split(tmp, parameters[3], boost::is_any_of(","));
-  surf_parse_assert(tmp.size() == n_lev, "You specified " + std::to_string(n_lev) +
-                                             " levels but the port count vector (the third one) contains " +
-                                             std::to_string(tmp.size()) + " levels.");
+  simgrid_parse_assert(tmp.size() == n_lev, "You specified " + std::to_string(n_lev) +
+                                                " levels but the port count vector (the third one) contains " +
+                                                std::to_string(tmp.size()) + " levels.");
   for (std::string const& port : tmp) {
     try {
       count.push_back(std::stoi(port));

diff --git a/src/surf/sg_platf.cpp b/src/surf/sg_platf.cpp
index 589285f..16b81d1 100644 (file)
--- a/src/surf/sg_platf.cpp
+++ b/src/surf/sg_platf.cpp
@@ -47,7 +47,7 @@ void sg_platf_parser_finalize()
 {
   simgrid::kernel::routing::on_cluster_creation.disconnect_slots();
 
-  surf_parse_lex_destroy();
+  simgrid_parse_lex_destroy();
 }
 
 /** @brief Add a host to the current NetZone */

diff --git a/src/surf/xml/platf.hpp b/src/surf/xml/platf.hpp
index 203ca09..5d07714 100644 (file)
--- a/src/surf/xml/platf.hpp
+++ b/src/surf/xml/platf.hpp
@@ -13,17 +13,17 @@
 /* Module management functions */
 XBT_PUBLIC void sg_platf_parser_finalize();
 
-XBT_PUBLIC void surf_parse_open(const std::string& file);
-XBT_PUBLIC void surf_parse_close();
-XBT_PUBLIC void surf_parse_assert(bool cond, const std::string& msg);
-XBT_ATTRIB_NORETURN XBT_PUBLIC void surf_parse_error(const std::string& msg);
-XBT_PUBLIC void surf_parse_assert_netpoint(const std::string& hostname, const std::string& pre,
-                                           const std::string& post);
+XBT_PUBLIC void simgrid_parse_open(const std::string& file);
+XBT_PUBLIC void simgrid_parse_close();
+XBT_PUBLIC void simgrid_parse_assert(bool cond, const std::string& msg);
+XBT_ATTRIB_NORETURN XBT_PUBLIC void simgrid_parse_error(const std::string& msg);
+XBT_PUBLIC void simgrid_parse_assert_netpoint(const std::string& hostname, const std::string& pre,
+                                              const std::string& post);
 
-XBT_PUBLIC double surf_parse_get_double(const std::string& s);
-XBT_PUBLIC int surf_parse_get_int(const std::string& s);
+XBT_PUBLIC double simgrid_parse_get_double(const std::string& s);
+XBT_PUBLIC int simgrid_parse_get_int(const std::string& s);
 
-XBT_PUBLIC void surf_parse(); /* Entry-point to the parser */
+XBT_PUBLIC void simgrid_parse(); /* Entry-point to the parser */
 XBT_PUBLIC void parse_platform_file(const std::string& file);
 
 #endif

diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp
index bf3d720..87c3029 100644 (file)
--- a/src/surf/xml/platf_private.hpp
+++ b/src/surf/xml/platf_private.hpp
@@ -1,7 +1,6 @@
 /* platf_private.h - Interface to the SimGrid platforms which visibility should be limited to this directory */
 
-/* Copyright (c) 2004-2023. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2004-2023. 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. */
@@ -207,17 +206,17 @@ XBT_PUBLIC void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs*
 XBT_PRIVATE void sg_platf_trace_connect(simgrid::kernel::routing::TraceConnectCreationArgs* trace_connect);
 
 /* Prototypes of the functions offered by flex */
-XBT_PUBLIC int surf_parse_lex();
-XBT_PUBLIC int surf_parse_get_lineno();
-XBT_PUBLIC FILE* surf_parse_get_in();
-XBT_PUBLIC FILE* surf_parse_get_out();
-XBT_PUBLIC int surf_parse_get_leng();
-XBT_PUBLIC char* surf_parse_get_text();
-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);
-XBT_PUBLIC int surf_parse_get_debug();
-XBT_PUBLIC void surf_parse_set_debug(int bdebug);
-XBT_PUBLIC int surf_parse_lex_destroy();
+XBT_PUBLIC int simgrid_parse_lex();
+XBT_PUBLIC int simgrid_parse_get_lineno();
+XBT_PUBLIC FILE* simgrid_parse_get_in();
+XBT_PUBLIC FILE* simgrid_parse_get_out();
+XBT_PUBLIC int simgrid_parse_get_leng();
+XBT_PUBLIC char* simgrid_parse_get_text();
+XBT_PUBLIC void simgrid_parse_set_lineno(int line_number);
+XBT_PUBLIC void simgrid_parse_set_in(FILE* in_str);
+XBT_PUBLIC void simgrid_parse_set_out(FILE* out_str);
+XBT_PUBLIC int simgrid_parse_get_debug();
+XBT_PUBLIC void simgrid_parse_set_debug(int bdebug);
+XBT_PUBLIC int simgrid_parse_lex_destroy();
 
 #endif                          /* SG_PLATF_H */

diff --git a/src/surf/xml/simgrid_dtd.c b/src/surf/xml/simgrid_dtd.c
index ed4f737..2f4eae1 100644 (file)
--- a/src/surf/xml/simgrid_dtd.c
+++ b/src/surf/xml/simgrid_dtd.c
@@ -3,30 +3,30 @@
 
 /* A lexical scanner generated by flex */
 
-#define yy_create_buffer surf_parse__create_buffer
-#define yy_delete_buffer surf_parse__delete_buffer
-#define yy_scan_buffer surf_parse__scan_buffer
-#define yy_scan_string surf_parse__scan_string
-#define yy_scan_bytes surf_parse__scan_bytes
-#define yy_init_buffer surf_parse__init_buffer
-#define yy_flush_buffer surf_parse__flush_buffer
-#define yy_load_buffer_state surf_parse__load_buffer_state
-#define yy_switch_to_buffer surf_parse__switch_to_buffer
-#define yypush_buffer_state surf_parse_push_buffer_state
-#define yypop_buffer_state surf_parse_pop_buffer_state
-#define yyensure_buffer_stack surf_parse_ensure_buffer_stack
-#define yy_flex_debug surf_parse__flex_debug
-#define yyin surf_parse_in
-#define yyleng surf_parse_leng
-#define yylex surf_parse_lex
-#define yylineno surf_parse_lineno
-#define yyout surf_parse_out
-#define yyrestart surf_parse_restart
-#define yytext surf_parse_text
-#define yywrap surf_parse_wrap
-#define yyalloc surf_parse_alloc
-#define yyrealloc surf_parse_realloc
-#define yyfree surf_parse_free
+#define yy_create_buffer simgrid_parse__create_buffer
+#define yy_delete_buffer simgrid_parse__delete_buffer
+#define yy_scan_buffer simgrid_parse__scan_buffer
+#define yy_scan_string simgrid_parse__scan_string
+#define yy_scan_bytes simgrid_parse__scan_bytes
+#define yy_init_buffer simgrid_parse__init_buffer
+#define yy_flush_buffer simgrid_parse__flush_buffer
+#define yy_load_buffer_state simgrid_parse__load_buffer_state
+#define yy_switch_to_buffer simgrid_parse__switch_to_buffer
+#define yypush_buffer_state simgrid_parse_push_buffer_state
+#define yypop_buffer_state simgrid_parse_pop_buffer_state
+#define yyensure_buffer_stack simgrid_parse_ensure_buffer_stack
+#define yy_flex_debug simgrid_parse__flex_debug
+#define yyin simgrid_parse_in
+#define yyleng simgrid_parse_leng
+#define yylex simgrid_parse_lex
+#define yylineno simgrid_parse_lineno
+#define yyout simgrid_parse_out
+#define yyrestart simgrid_parse_restart
+#define yytext simgrid_parse_text
+#define yywrap simgrid_parse_wrap
+#define yyalloc simgrid_parse_alloc
+#define yyrealloc simgrid_parse_realloc
+#define yyfree simgrid_parse_free
 
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
@@ -37,237 +37,237 @@
 #endif
 
 #ifdef yy_create_buffer
-#define surf_parse__create_buffer_ALREADY_DEFINED
+#define simgrid_parse__create_buffer_ALREADY_DEFINED
 #else
-#define yy_create_buffer surf_parse__create_buffer
+#define yy_create_buffer simgrid_parse__create_buffer
 #endif
 
 #ifdef yy_delete_buffer
-#define surf_parse__delete_buffer_ALREADY_DEFINED
+#define simgrid_parse__delete_buffer_ALREADY_DEFINED
 #else
-#define yy_delete_buffer surf_parse__delete_buffer
+#define yy_delete_buffer simgrid_parse__delete_buffer
 #endif
 
 #ifdef yy_scan_buffer
-#define surf_parse__scan_buffer_ALREADY_DEFINED
+#define simgrid_parse__scan_buffer_ALREADY_DEFINED
 #else
-#define yy_scan_buffer surf_parse__scan_buffer
+#define yy_scan_buffer simgrid_parse__scan_buffer
 #endif
 
 #ifdef yy_scan_string
-#define surf_parse__scan_string_ALREADY_DEFINED
+#define simgrid_parse__scan_string_ALREADY_DEFINED
 #else
-#define yy_scan_string surf_parse__scan_string
+#define yy_scan_string simgrid_parse__scan_string
 #endif
 
 #ifdef yy_scan_bytes
-#define surf_parse__scan_bytes_ALREADY_DEFINED
+#define simgrid_parse__scan_bytes_ALREADY_DEFINED
 #else
-#define yy_scan_bytes surf_parse__scan_bytes
+#define yy_scan_bytes simgrid_parse__scan_bytes
 #endif
 
 #ifdef yy_init_buffer
-#define surf_parse__init_buffer_ALREADY_DEFINED
+#define simgrid_parse__init_buffer_ALREADY_DEFINED
 #else
-#define yy_init_buffer surf_parse__init_buffer
+#define yy_init_buffer simgrid_parse__init_buffer
 #endif
 
 #ifdef yy_flush_buffer
-#define surf_parse__flush_buffer_ALREADY_DEFINED
+#define simgrid_parse__flush_buffer_ALREADY_DEFINED
 #else
-#define yy_flush_buffer surf_parse__flush_buffer
+#define yy_flush_buffer simgrid_parse__flush_buffer
 #endif
 
 #ifdef yy_load_buffer_state
-#define surf_parse__load_buffer_state_ALREADY_DEFINED
+#define simgrid_parse__load_buffer_state_ALREADY_DEFINED
 #else
-#define yy_load_buffer_state surf_parse__load_buffer_state
+#define yy_load_buffer_state simgrid_parse__load_buffer_state
 #endif
 
 #ifdef yy_switch_to_buffer
-#define surf_parse__switch_to_buffer_ALREADY_DEFINED
+#define simgrid_parse__switch_to_buffer_ALREADY_DEFINED
 #else
-#define yy_switch_to_buffer surf_parse__switch_to_buffer
+#define yy_switch_to_buffer simgrid_parse__switch_to_buffer
 #endif
 
 #ifdef yypush_buffer_state
-#define surf_parse_push_buffer_state_ALREADY_DEFINED
+#define simgrid_parse_push_buffer_state_ALREADY_DEFINED
 #else
-#define yypush_buffer_state surf_parse_push_buffer_state
+#define yypush_buffer_state simgrid_parse_push_buffer_state
 #endif
 
 #ifdef yypop_buffer_state
-#define surf_parse_pop_buffer_state_ALREADY_DEFINED
+#define simgrid_parse_pop_buffer_state_ALREADY_DEFINED
 #else
-#define yypop_buffer_state surf_parse_pop_buffer_state
+#define yypop_buffer_state simgrid_parse_pop_buffer_state
 #endif
 
 #ifdef yyensure_buffer_stack
-#define surf_parse_ensure_buffer_stack_ALREADY_DEFINED
+#define simgrid_parse_ensure_buffer_stack_ALREADY_DEFINED
 #else
-#define yyensure_buffer_stack surf_parse_ensure_buffer_stack
+#define yyensure_buffer_stack simgrid_parse_ensure_buffer_stack
 #endif
 
 #ifdef yylex
-#define surf_parse_lex_ALREADY_DEFINED
+#define simgrid_parse_lex_ALREADY_DEFINED
 #else
-#define yylex surf_parse_lex
+#define yylex simgrid_parse_lex
 #endif
 
 #ifdef yyrestart
-#define surf_parse_restart_ALREADY_DEFINED
+#define simgrid_parse_restart_ALREADY_DEFINED
 #else
-#define yyrestart surf_parse_restart
+#define yyrestart simgrid_parse_restart
 #endif
 
 #ifdef yylex_init
-#define surf_parse_lex_init_ALREADY_DEFINED
+#define simgrid_parse_lex_init_ALREADY_DEFINED
 #else
-#define yylex_init surf_parse_lex_init
+#define yylex_init simgrid_parse_lex_init
 #endif
 
 #ifdef yylex_init_extra
-#define surf_parse_lex_init_extra_ALREADY_DEFINED
+#define simgrid_parse_lex_init_extra_ALREADY_DEFINED
 #else
-#define yylex_init_extra surf_parse_lex_init_extra
+#define yylex_init_extra simgrid_parse_lex_init_extra
 #endif
 
 #ifdef yylex_destroy
-#define surf_parse_lex_destroy_ALREADY_DEFINED
+#define simgrid_parse_lex_destroy_ALREADY_DEFINED
 #else
-#define yylex_destroy surf_parse_lex_destroy
+#define yylex_destroy simgrid_parse_lex_destroy
 #endif
 
 #ifdef yyget_debug
-#define surf_parse_get_debug_ALREADY_DEFINED
+#define simgrid_parse_get_debug_ALREADY_DEFINED
 #else
-#define yyget_debug surf_parse_get_debug
+#define yyget_debug simgrid_parse_get_debug
 #endif
 
 #ifdef yyset_debug
-#define surf_parse_set_debug_ALREADY_DEFINED
+#define simgrid_parse_set_debug_ALREADY_DEFINED
 #else
-#define yyset_debug surf_parse_set_debug
+#define yyset_debug simgrid_parse_set_debug
 #endif
 
 #ifdef yyget_extra
-#define surf_parse_get_extra_ALREADY_DEFINED
+#define simgrid_parse_get_extra_ALREADY_DEFINED
 #else
-#define yyget_extra surf_parse_get_extra
+#define yyget_extra simgrid_parse_get_extra
 #endif
 
 #ifdef yyset_extra
-#define surf_parse_set_extra_ALREADY_DEFINED
+#define simgrid_parse_set_extra_ALREADY_DEFINED
 #else
-#define yyset_extra surf_parse_set_extra
+#define yyset_extra simgrid_parse_set_extra
 #endif
 
 #ifdef yyget_in
-#define surf_parse_get_in_ALREADY_DEFINED
+#define simgrid_parse_get_in_ALREADY_DEFINED
 #else
-#define yyget_in surf_parse_get_in
+#define yyget_in simgrid_parse_get_in
 #endif
 
 #ifdef yyset_in
-#define surf_parse_set_in_ALREADY_DEFINED
+#define simgrid_parse_set_in_ALREADY_DEFINED
 #else
-#define yyset_in surf_parse_set_in
+#define yyset_in simgrid_parse_set_in
 #endif
 
 #ifdef yyget_out
-#define surf_parse_get_out_ALREADY_DEFINED
+#define simgrid_parse_get_out_ALREADY_DEFINED
 #else
-#define yyget_out surf_parse_get_out
+#define yyget_out simgrid_parse_get_out
 #endif
 
 #ifdef yyset_out
-#define surf_parse_set_out_ALREADY_DEFINED
+#define simgrid_parse_set_out_ALREADY_DEFINED
 #else
-#define yyset_out surf_parse_set_out
+#define yyset_out simgrid_parse_set_out
 #endif
 
 #ifdef yyget_leng
-#define surf_parse_get_leng_ALREADY_DEFINED
+#define simgrid_parse_get_leng_ALREADY_DEFINED
 #else
-#define yyget_leng surf_parse_get_leng
+#define yyget_leng simgrid_parse_get_leng
 #endif
 
 #ifdef yyget_text
-#define surf_parse_get_text_ALREADY_DEFINED
+#define simgrid_parse_get_text_ALREADY_DEFINED
 #else
-#define yyget_text surf_parse_get_text
+#define yyget_text simgrid_parse_get_text
 #endif
 
 #ifdef yyget_lineno
-#define surf_parse_get_lineno_ALREADY_DEFINED
+#define simgrid_parse_get_lineno_ALREADY_DEFINED
 #else
-#define yyget_lineno surf_parse_get_lineno
+#define yyget_lineno simgrid_parse_get_lineno
 #endif
 
 #ifdef yyset_lineno
-#define surf_parse_set_lineno_ALREADY_DEFINED
+#define simgrid_parse_set_lineno_ALREADY_DEFINED
 #else
-#define yyset_lineno surf_parse_set_lineno
+#define yyset_lineno simgrid_parse_set_lineno
 #endif
 
 #ifdef yywrap
-#define surf_parse_wrap_ALREADY_DEFINED
+#define simgrid_parse_wrap_ALREADY_DEFINED
 #else
-#define yywrap surf_parse_wrap
+#define yywrap simgrid_parse_wrap
 #endif
 
 #ifdef yyalloc
-#define surf_parse_alloc_ALREADY_DEFINED
+#define simgrid_parse_alloc_ALREADY_DEFINED
 #else
-#define yyalloc surf_parse_alloc
+#define yyalloc simgrid_parse_alloc
 #endif
 
 #ifdef yyrealloc
-#define surf_parse_realloc_ALREADY_DEFINED
+#define simgrid_parse_realloc_ALREADY_DEFINED
 #else
-#define yyrealloc surf_parse_realloc
+#define yyrealloc simgrid_parse_realloc
 #endif
 
 #ifdef yyfree
-#define surf_parse_free_ALREADY_DEFINED
+#define simgrid_parse_free_ALREADY_DEFINED
 #else
-#define yyfree surf_parse_free
+#define yyfree simgrid_parse_free
 #endif
 
 #ifdef yytext
-#define surf_parse_text_ALREADY_DEFINED
+#define simgrid_parse_text_ALREADY_DEFINED
 #else
-#define yytext surf_parse_text
+#define yytext simgrid_parse_text
 #endif
 
 #ifdef yyleng
-#define surf_parse_leng_ALREADY_DEFINED
+#define simgrid_parse_leng_ALREADY_DEFINED
 #else
-#define yyleng surf_parse_leng
+#define yyleng simgrid_parse_leng
 #endif
 
 #ifdef yyin
-#define surf_parse_in_ALREADY_DEFINED
+#define simgrid_parse_in_ALREADY_DEFINED
 #else
-#define yyin surf_parse_in
+#define yyin simgrid_parse_in
 #endif
 
 #ifdef yyout
-#define surf_parse_out_ALREADY_DEFINED
+#define simgrid_parse_out_ALREADY_DEFINED
 #else
-#define yyout surf_parse_out
+#define yyout simgrid_parse_out
 #endif
 
 #ifdef yy_flex_debug
-#define surf_parse__flex_debug_ALREADY_DEFINED
+#define simgrid_parse__flex_debug_ALREADY_DEFINED
 #else
-#define yy_flex_debug surf_parse__flex_debug
+#define yy_flex_debug simgrid_parse__flex_debug
 #endif
 
 #ifdef yylineno
-#define surf_parse_lineno_ALREADY_DEFINED
+#define simgrid_parse_lineno_ALREADY_DEFINED
 #else
-#define yylineno surf_parse_lineno
+#define yylineno simgrid_parse_lineno
 #endif
 
 /* First, we deal with  platform-specific or compiler-specific issues. */
@@ -599,7 +599,7 @@ void yyfree ( void *  );
 
 /* Begin user sect3 */
 
-#define surf_parse_wrap() (/*CONSTCOND*/1)
+#define simgrid_parse_wrap() (/*CONSTCOND*/ 1)
 #define YY_SKIP_YYWRAP
 typedef flex_uint8_t YY_CHAR;
 
@@ -7280,10 +7280,28 @@ YY_RULE_SETUP
   if (!AX_simgrid_parse_backbone_latency) FAIL("Required attribute `latency' not set for `backbone' element.");
   LEAVE; STag_simgrid_parse_backbone(); simgrid_parse_pcdata_ix = 0; ETag_simgrid_parse_backbone(); popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_simgrid_parse_AS: case S_simgrid_parse_AS_13: case S_simgrid_parse_AS_14: case S_simgrid_parse_AS_1: case S_simgrid_parse_AS_3: SET(S_simgrid_parse_AS_14); break;
-   case S_simgrid_parse_AS_5: case S_simgrid_parse_AS_6: SET(S_simgrid_parse_AS_6); break;
-   case S_simgrid_parse_zone: case S_simgrid_parse_zone_13: case S_simgrid_parse_zone_14: case S_simgrid_parse_zone_3: SET(S_simgrid_parse_zone_14); break;
-   case S_simgrid_parse_zone_1: case S_simgrid_parse_zone_5: case S_simgrid_parse_zone_6: SET(S_simgrid_parse_zone_6); break;
+    case S_simgrid_parse_AS:
+    case S_simgrid_parse_AS_13:
+    case S_simgrid_parse_AS_14:
+    case S_simgrid_parse_AS_3:
+      SET(S_simgrid_parse_AS_14);
+      break;
+    case S_simgrid_parse_AS_1:
+    case S_simgrid_parse_AS_5:
+    case S_simgrid_parse_AS_6:
+      SET(S_simgrid_parse_AS_6);
+      break;
+    case S_simgrid_parse_zone:
+    case S_simgrid_parse_zone_13:
+    case S_simgrid_parse_zone_14:
+    case S_simgrid_parse_zone_1:
+    case S_simgrid_parse_zone_3:
+      SET(S_simgrid_parse_zone_14);
+      break;
+    case S_simgrid_parse_zone_5:
+    case S_simgrid_parse_zone_6:
+      SET(S_simgrid_parse_zone_6);
+      break;
   }
  }
        YY_BREAK
@@ -7307,10 +7325,28 @@ YY_RULE_SETUP
   ETag_simgrid_parse_backbone();
   popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_simgrid_parse_AS: case S_simgrid_parse_AS_13: case S_simgrid_parse_AS_14: case S_simgrid_parse_AS_1: case S_simgrid_parse_AS_3: SET(S_simgrid_parse_AS_14); break;
-   case S_simgrid_parse_AS_5: case S_simgrid_parse_AS_6: SET(S_simgrid_parse_AS_6); break;
-   case S_simgrid_parse_zone: case S_simgrid_parse_zone_13: case S_simgrid_parse_zone_14: case S_simgrid_parse_zone_3: SET(S_simgrid_parse_zone_14); break;
-   case S_simgrid_parse_zone_1: case S_simgrid_parse_zone_5: case S_simgrid_parse_zone_6: SET(S_simgrid_parse_zone_6); break;
+    case S_simgrid_parse_AS:
+    case S_simgrid_parse_AS_13:
+    case S_simgrid_parse_AS_14:
+    case S_simgrid_parse_AS_3:
+      SET(S_simgrid_parse_AS_14);
+      break;
+    case S_simgrid_parse_AS_1:
+    case S_simgrid_parse_AS_5:
+    case S_simgrid_parse_AS_6:
+      SET(S_simgrid_parse_AS_6);
+      break;
+    case S_simgrid_parse_zone:
+    case S_simgrid_parse_zone_13:
+    case S_simgrid_parse_zone_14:
+    case S_simgrid_parse_zone_1:
+    case S_simgrid_parse_zone_3:
+      SET(S_simgrid_parse_zone_14);
+      break;
+    case S_simgrid_parse_zone_5:
+    case S_simgrid_parse_zone_6:
+      SET(S_simgrid_parse_zone_6);
+      break;
   }
  }
        YY_BREAK
@@ -7796,11 +7832,36 @@ YY_RULE_SETUP
   if (!AX_simgrid_parse_cabinet_suffix) FAIL("Required attribute `suffix' not set for `cabinet' element.");
   LEAVE; STag_simgrid_parse_cabinet(); simgrid_parse_pcdata_ix = 0; ETag_simgrid_parse_cabinet(); popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_simgrid_parse_AS: case S_simgrid_parse_AS_13: case S_simgrid_parse_AS_14: case S_simgrid_parse_AS_1: case S_simgrid_parse_AS_3: SET(S_simgrid_parse_AS_14); break;
-   case S_simgrid_parse_AS_5: case S_simgrid_parse_AS_6: SET(S_simgrid_parse_AS_6); break;
-   case S_simgrid_parse_include: case S_simgrid_parse_include_1: case S_simgrid_parse_include_2: SET(S_simgrid_parse_include_2); break;
-   case S_simgrid_parse_platform: case S_simgrid_parse_platform_1: case S_simgrid_parse_platform_3: case S_simgrid_parse_platform_5: case S_simgrid_parse_platform_6: SET(S_simgrid_parse_platform_6); break;
-   case S_simgrid_parse_zone: case S_simgrid_parse_zone_13: case S_simgrid_parse_zone_14: case S_simgrid_parse_zone_1: case S_simgrid_parse_zone_3: SET(S_simgrid_parse_zone_14); break;
+    case S_simgrid_parse_AS:
+    case S_simgrid_parse_AS_13:
+    case S_simgrid_parse_AS_14:
+    case S_simgrid_parse_AS_3:
+      SET(S_simgrid_parse_AS_14);
+      break;
+    case S_simgrid_parse_AS_1:
+    case S_simgrid_parse_AS_5:
+    case S_simgrid_parse_AS_6:
+      SET(S_simgrid_parse_AS_6);
+      break;
+    case S_simgrid_parse_include:
+    case S_simgrid_parse_include_1:
+    case S_simgrid_parse_include_2:
+      SET(S_simgrid_parse_include_2);
+      break;
+    case S_simgrid_parse_platform:
+    case S_simgrid_parse_platform_1:
+    case S_simgrid_parse_platform_3:
+    case S_simgrid_parse_platform_5:
+    case S_simgrid_parse_platform_6:
+      SET(S_simgrid_parse_platform_6);
+      break;
+    case S_simgrid_parse_zone:
+    case S_simgrid_parse_zone_13:
+    case S_simgrid_parse_zone_14:
+    case S_simgrid_parse_zone_1:
+    case S_simgrid_parse_zone_3:
+      SET(S_simgrid_parse_zone_14);
+      break;
   }
  }
        YY_BREAK
@@ -7824,11 +7885,36 @@ YY_RULE_SETUP
   ETag_simgrid_parse_cabinet();
   popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_simgrid_parse_AS: case S_simgrid_parse_AS_13: case S_simgrid_parse_AS_14: case S_simgrid_parse_AS_1: case S_simgrid_parse_AS_3: SET(S_simgrid_parse_AS_14); break;
-   case S_simgrid_parse_AS_5: case S_simgrid_parse_AS_6: SET(S_simgrid_parse_AS_6); break;
-   case S_simgrid_parse_include: case S_simgrid_parse_include_1: case S_simgrid_parse_include_2: SET(S_simgrid_parse_include_2); break;
-   case S_simgrid_parse_platform: case S_simgrid_parse_platform_1: case S_simgrid_parse_platform_3: case S_simgrid_parse_platform_5: case S_simgrid_parse_platform_6: SET(S_simgrid_parse_platform_6); break;
-   case S_simgrid_parse_zone: case S_simgrid_parse_zone_13: case S_simgrid_parse_zone_14: case S_simgrid_parse_zone_1: case S_simgrid_parse_zone_3: SET(S_simgrid_parse_zone_14); break;
+    case S_simgrid_parse_AS:
+    case S_simgrid_parse_AS_13:
+    case S_simgrid_parse_AS_14:
+    case S_simgrid_parse_AS_3:
+      SET(S_simgrid_parse_AS_14);
+      break;
+    case S_simgrid_parse_AS_1:
+    case S_simgrid_parse_AS_5:
+    case S_simgrid_parse_AS_6:
+      SET(S_simgrid_parse_AS_6);
+      break;
+    case S_simgrid_parse_include:
+    case S_simgrid_parse_include_1:
+    case S_simgrid_parse_include_2:
+      SET(S_simgrid_parse_include_2);
+      break;
+    case S_simgrid_parse_platform:
+    case S_simgrid_parse_platform_1:
+    case S_simgrid_parse_platform_3:
+    case S_simgrid_parse_platform_5:
+    case S_simgrid_parse_platform_6:
+      SET(S_simgrid_parse_platform_6);
+      break;
+    case S_simgrid_parse_zone:
+    case S_simgrid_parse_zone_13:
+    case S_simgrid_parse_zone_14:
+    case S_simgrid_parse_zone_1:
+    case S_simgrid_parse_zone_3:
+      SET(S_simgrid_parse_zone_14);
+      break;
   }
  }
        YY_BREAK
@@ -8693,12 +8779,40 @@ YY_RULE_SETUP
   if (!AX_simgrid_parse_include_file) FAIL("Required attribute `file' not set for `include' element.");
   LEAVE; STag_simgrid_parse_include(); simgrid_parse_pcdata_ix = 0; ETag_simgrid_parse_include(); popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_simgrid_parse_AS: case S_simgrid_parse_AS_13: case S_simgrid_parse_AS_14: case S_simgrid_parse_AS_1: case S_simgrid_parse_AS_3: SET(S_simgrid_parse_AS_14); break;
-   case S_simgrid_parse_AS_5: case S_simgrid_parse_AS_6: SET(S_simgrid_parse_AS_6); break;
-   case S_simgrid_parse_include: case S_simgrid_parse_include_1: case S_simgrid_parse_include_2: SET(S_simgrid_parse_include_2); break;
-   case S_simgrid_parse_platform: case S_simgrid_parse_platform_1: case S_simgrid_parse_platform_3: case S_simgrid_parse_platform_5: case S_simgrid_parse_platform_6: SET(S_simgrid_parse_platform_6); break;
-   case S_simgrid_parse_zone: case S_simgrid_parse_zone_13: case S_simgrid_parse_zone_14: case S_simgrid_parse_zone_3: SET(S_simgrid_parse_zone_14); break;
-   case S_simgrid_parse_zone_1: case S_simgrid_parse_zone_5: case S_simgrid_parse_zone_6: SET(S_simgrid_parse_zone_6); break;
+    case S_simgrid_parse_AS:
+    case S_simgrid_parse_AS_13:
+    case S_simgrid_parse_AS_14:
+    case S_simgrid_parse_AS_3:
+      SET(S_simgrid_parse_AS_14);
+      break;
+    case S_simgrid_parse_AS_1:
+    case S_simgrid_parse_AS_5:
+    case S_simgrid_parse_AS_6:
+      SET(S_simgrid_parse_AS_6);
+      break;
+    case S_simgrid_parse_include:
+    case S_simgrid_parse_include_1:
+    case S_simgrid_parse_include_2:
+      SET(S_simgrid_parse_include_2);
+      break;
+    case S_simgrid_parse_platform:
+    case S_simgrid_parse_platform_1:
+    case S_simgrid_parse_platform_3:
+    case S_simgrid_parse_platform_5:
+    case S_simgrid_parse_platform_6:
+      SET(S_simgrid_parse_platform_6);
+      break;
+    case S_simgrid_parse_zone:
+    case S_simgrid_parse_zone_13:
+    case S_simgrid_parse_zone_14:
+    case S_simgrid_parse_zone_1:
+    case S_simgrid_parse_zone_3:
+      SET(S_simgrid_parse_zone_14);
+      break;
+    case S_simgrid_parse_zone_5:
+    case S_simgrid_parse_zone_6:
+      SET(S_simgrid_parse_zone_6);
+      break;
   }
  }
        YY_BREAK
@@ -8722,12 +8836,40 @@ YY_RULE_SETUP
   ETag_simgrid_parse_include();
   popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_simgrid_parse_AS: case S_simgrid_parse_AS_13: case S_simgrid_parse_AS_14: case S_simgrid_parse_AS_1: case S_simgrid_parse_AS_3: SET(S_simgrid_parse_AS_14); break;
-   case S_simgrid_parse_AS_5: case S_simgrid_parse_AS_6: SET(S_simgrid_parse_AS_6); break;
-   case S_simgrid_parse_include: case S_simgrid_parse_include_1: case S_simgrid_parse_include_2: SET(S_simgrid_parse_include_2); break;
-   case S_simgrid_parse_platform: case S_simgrid_parse_platform_1: case S_simgrid_parse_platform_3: case S_simgrid_parse_platform_5: case S_simgrid_parse_platform_6: SET(S_simgrid_parse_platform_6); break;
-   case S_simgrid_parse_zone: case S_simgrid_parse_zone_13: case S_simgrid_parse_zone_14: case S_simgrid_parse_zone_3: SET(S_simgrid_parse_zone_14); break;
-   case S_simgrid_parse_zone_1: case S_simgrid_parse_zone_5: case S_simgrid_parse_zone_6: SET(S_simgrid_parse_zone_6); break;
+    case S_simgrid_parse_AS:
+    case S_simgrid_parse_AS_13:
+    case S_simgrid_parse_AS_14:
+    case S_simgrid_parse_AS_3:
+      SET(S_simgrid_parse_AS_14);
+      break;
+    case S_simgrid_parse_AS_1:
+    case S_simgrid_parse_AS_5:
+    case S_simgrid_parse_AS_6:
+      SET(S_simgrid_parse_AS_6);
+      break;
+    case S_simgrid_parse_include:
+    case S_simgrid_parse_include_1:
+    case S_simgrid_parse_include_2:
+      SET(S_simgrid_parse_include_2);
+      break;
+    case S_simgrid_parse_platform:
+    case S_simgrid_parse_platform_1:
+    case S_simgrid_parse_platform_3:
+    case S_simgrid_parse_platform_5:
+    case S_simgrid_parse_platform_6:
+      SET(S_simgrid_parse_platform_6);
+      break;
+    case S_simgrid_parse_zone:
+    case S_simgrid_parse_zone_13:
+    case S_simgrid_parse_zone_14:
+    case S_simgrid_parse_zone_1:
+    case S_simgrid_parse_zone_3:
+      SET(S_simgrid_parse_zone_14);
+      break;
+    case S_simgrid_parse_zone_5:
+    case S_simgrid_parse_zone_6:
+      SET(S_simgrid_parse_zone_6);
+      break;
   }
  }
        YY_BREAK
@@ -8883,10 +9025,28 @@ YY_RULE_SETUP
   if (!AX_simgrid_parse_link_id) FAIL("Required attribute `id' not set for `link' element.");
   LEAVE; STag_simgrid_parse_link(); simgrid_parse_pcdata_ix = 0; ETag_simgrid_parse_link(); popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_simgrid_parse_AS: case S_simgrid_parse_AS_13: case S_simgrid_parse_AS_14: case S_simgrid_parse_AS_1: case S_simgrid_parse_AS_3: SET(S_simgrid_parse_AS_14); break;
-   case S_simgrid_parse_AS_5: case S_simgrid_parse_AS_6: SET(S_simgrid_parse_AS_6); break;
-   case S_simgrid_parse_zone: case S_simgrid_parse_zone_13: case S_simgrid_parse_zone_14: case S_simgrid_parse_zone_3: SET(S_simgrid_parse_zone_14); break;
-   case S_simgrid_parse_zone_1: case S_simgrid_parse_zone_5: case S_simgrid_parse_zone_6: SET(S_simgrid_parse_zone_6); break;
+    case S_simgrid_parse_AS:
+    case S_simgrid_parse_AS_13:
+    case S_simgrid_parse_AS_14:
+    case S_simgrid_parse_AS_3:
+      SET(S_simgrid_parse_AS_14);
+      break;
+    case S_simgrid_parse_AS_1:
+    case S_simgrid_parse_AS_5:
+    case S_simgrid_parse_AS_6:
+      SET(S_simgrid_parse_AS_6);
+      break;
+    case S_simgrid_parse_zone:
+    case S_simgrid_parse_zone_13:
+    case S_simgrid_parse_zone_14:
+    case S_simgrid_parse_zone_1:
+    case S_simgrid_parse_zone_3:
+      SET(S_simgrid_parse_zone_14);
+      break;
+    case S_simgrid_parse_zone_5:
+    case S_simgrid_parse_zone_6:
+      SET(S_simgrid_parse_zone_6);
+      break;
   }
  }
        YY_BREAK
@@ -8910,10 +9070,28 @@ YY_RULE_SETUP
   ETag_simgrid_parse_link();
   popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_simgrid_parse_AS: case S_simgrid_parse_AS_13: case S_simgrid_parse_AS_14: case S_simgrid_parse_AS_1: case S_simgrid_parse_AS_3: SET(S_simgrid_parse_AS_14); break;
-   case S_simgrid_parse_AS_5: case S_simgrid_parse_AS_6: SET(S_simgrid_parse_AS_6); break;
-   case S_simgrid_parse_zone: case S_simgrid_parse_zone_13: case S_simgrid_parse_zone_14: case S_simgrid_parse_zone_3: SET(S_simgrid_parse_zone_14); break;
-   case S_simgrid_parse_zone_1: case S_simgrid_parse_zone_5: case S_simgrid_parse_zone_6: SET(S_simgrid_parse_zone_6); break;
+    case S_simgrid_parse_AS:
+    case S_simgrid_parse_AS_13:
+    case S_simgrid_parse_AS_14:
+    case S_simgrid_parse_AS_3:
+      SET(S_simgrid_parse_AS_14);
+      break;
+    case S_simgrid_parse_AS_1:
+    case S_simgrid_parse_AS_5:
+    case S_simgrid_parse_AS_6:
+      SET(S_simgrid_parse_AS_6);
+      break;
+    case S_simgrid_parse_zone:
+    case S_simgrid_parse_zone_13:
+    case S_simgrid_parse_zone_14:
+    case S_simgrid_parse_zone_1:
+    case S_simgrid_parse_zone_3:
+      SET(S_simgrid_parse_zone_14);
+      break;
+    case S_simgrid_parse_zone_5:
+    case S_simgrid_parse_zone_6:
+      SET(S_simgrid_parse_zone_6);
+      break;
   }
  }
        YY_BREAK
@@ -10534,18 +10712,70 @@ YY_RULE_SETUP
   if (!AX_simgrid_parse_trace_periodicity) FAIL("Required attribute `periodicity' not set for `trace' element.");
   LEAVE; STag_simgrid_parse_trace(); simgrid_parse_pcdata_ix = 0; ETag_simgrid_parse_trace(); popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_simgrid_parse_AS: case S_simgrid_parse_AS_10: case S_simgrid_parse_AS_11: case S_simgrid_parse_AS_3: case S_simgrid_parse_AS_4: case S_simgrid_parse_AS_6: case S_simgrid_parse_AS_7: case S_simgrid_parse_AS_9: SET(S_simgrid_parse_AS_11); break;
-   case S_simgrid_parse_AS_13: case S_simgrid_parse_AS_14: SET(S_simgrid_parse_AS_14); break;
-   case S_simgrid_parse_AS_12: case S_simgrid_parse_AS_15: case S_simgrid_parse_AS_16: case S_simgrid_parse_AS_1: SET(S_simgrid_parse_AS_16); break;
-   case S_simgrid_parse_AS_5: SET(S_simgrid_parse_AS_6); break;
-   case S_simgrid_parse_AS_8: SET(S_simgrid_parse_AS_9); break;
-   case S_simgrid_parse_include: case S_simgrid_parse_include_1: case S_simgrid_parse_include_2: SET(S_simgrid_parse_include_2); break;
-   case S_simgrid_parse_platform: case S_simgrid_parse_platform_1: case S_simgrid_parse_platform_3: case S_simgrid_parse_platform_5: case S_simgrid_parse_platform_6: SET(S_simgrid_parse_platform_6); break;
-   case S_simgrid_parse_zone: case S_simgrid_parse_zone_10: case S_simgrid_parse_zone_11: case S_simgrid_parse_zone_6: case S_simgrid_parse_zone_7: SET(S_simgrid_parse_zone_11); break;
-   case S_simgrid_parse_zone_13: case S_simgrid_parse_zone_14: case S_simgrid_parse_zone_3: SET(S_simgrid_parse_zone_14); break;
-   case S_simgrid_parse_zone_12: case S_simgrid_parse_zone_15: case S_simgrid_parse_zone_16: case S_simgrid_parse_zone_1: SET(S_simgrid_parse_zone_16); break;
-   case S_simgrid_parse_zone_5: SET(S_simgrid_parse_zone_6); break;
-   case S_simgrid_parse_zone_4: case S_simgrid_parse_zone_8: case S_simgrid_parse_zone_9: SET(S_simgrid_parse_zone_9); break;
+    case S_simgrid_parse_AS_10:
+    case S_simgrid_parse_AS_11:
+    case S_simgrid_parse_AS_7:
+      SET(S_simgrid_parse_AS_11);
+      break;
+    case S_simgrid_parse_AS_13:
+    case S_simgrid_parse_AS_3:
+      SET(S_simgrid_parse_AS_14);
+      break;
+    case S_simgrid_parse_AS:
+    case S_simgrid_parse_AS_12:
+    case S_simgrid_parse_AS_14:
+    case S_simgrid_parse_AS_15:
+    case S_simgrid_parse_AS_16:
+      SET(S_simgrid_parse_AS_16);
+      break;
+    case S_simgrid_parse_AS_1:
+    case S_simgrid_parse_AS_5:
+      SET(S_simgrid_parse_AS_6);
+      break;
+    case S_simgrid_parse_AS_4:
+    case S_simgrid_parse_AS_6:
+    case S_simgrid_parse_AS_8:
+    case S_simgrid_parse_AS_9:
+      SET(S_simgrid_parse_AS_9);
+      break;
+    case S_simgrid_parse_include:
+    case S_simgrid_parse_include_1:
+    case S_simgrid_parse_include_2:
+      SET(S_simgrid_parse_include_2);
+      break;
+    case S_simgrid_parse_platform:
+    case S_simgrid_parse_platform_1:
+    case S_simgrid_parse_platform_3:
+    case S_simgrid_parse_platform_5:
+    case S_simgrid_parse_platform_6:
+      SET(S_simgrid_parse_platform_6);
+      break;
+    case S_simgrid_parse_zone:
+    case S_simgrid_parse_zone_10:
+    case S_simgrid_parse_zone_11:
+    case S_simgrid_parse_zone_1:
+    case S_simgrid_parse_zone_4:
+    case S_simgrid_parse_zone_7:
+      SET(S_simgrid_parse_zone_11);
+      break;
+    case S_simgrid_parse_zone_13:
+    case S_simgrid_parse_zone_14:
+    case S_simgrid_parse_zone_3:
+      SET(S_simgrid_parse_zone_14);
+      break;
+    case S_simgrid_parse_zone_12:
+    case S_simgrid_parse_zone_15:
+    case S_simgrid_parse_zone_16:
+      SET(S_simgrid_parse_zone_16);
+      break;
+    case S_simgrid_parse_zone_5:
+    case S_simgrid_parse_zone_6:
+      SET(S_simgrid_parse_zone_6);
+      break;
+    case S_simgrid_parse_zone_8:
+    case S_simgrid_parse_zone_9:
+      SET(S_simgrid_parse_zone_9);
+      break;
   }
  }
        YY_BREAK
@@ -10571,18 +10801,70 @@ YY_RULE_SETUP
   simgrid_parse_pcdata_ix = popbuffer();
   popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_simgrid_parse_AS: case S_simgrid_parse_AS_10: case S_simgrid_parse_AS_11: case S_simgrid_parse_AS_3: case S_simgrid_parse_AS_4: case S_simgrid_parse_AS_6: case S_simgrid_parse_AS_7: case S_simgrid_parse_AS_9: SET(S_simgrid_parse_AS_11); break;
-   case S_simgrid_parse_AS_13: case S_simgrid_parse_AS_14: SET(S_simgrid_parse_AS_14); break;
-   case S_simgrid_parse_AS_12: case S_simgrid_parse_AS_15: case S_simgrid_parse_AS_16: case S_simgrid_parse_AS_1: SET(S_simgrid_parse_AS_16); break;
-   case S_simgrid_parse_AS_5: SET(S_simgrid_parse_AS_6); break;
-   case S_simgrid_parse_AS_8: SET(S_simgrid_parse_AS_9); break;
-   case S_simgrid_parse_include: case S_simgrid_parse_include_1: case S_simgrid_parse_include_2: SET(S_simgrid_parse_include_2); break;
-   case S_simgrid_parse_platform: case S_simgrid_parse_platform_1: case S_simgrid_parse_platform_3: case S_simgrid_parse_platform_5: case S_simgrid_parse_platform_6: SET(S_simgrid_parse_platform_6); break;
-   case S_simgrid_parse_zone: case S_simgrid_parse_zone_10: case S_simgrid_parse_zone_11: case S_simgrid_parse_zone_6: case S_simgrid_parse_zone_7: SET(S_simgrid_parse_zone_11); break;
-   case S_simgrid_parse_zone_13: case S_simgrid_parse_zone_14: case S_simgrid_parse_zone_3: SET(S_simgrid_parse_zone_14); break;
-   case S_simgrid_parse_zone_12: case S_simgrid_parse_zone_15: case S_simgrid_parse_zone_16: case S_simgrid_parse_zone_1: SET(S_simgrid_parse_zone_16); break;
-   case S_simgrid_parse_zone_5: SET(S_simgrid_parse_zone_6); break;
-   case S_simgrid_parse_zone_4: case S_simgrid_parse_zone_8: case S_simgrid_parse_zone_9: SET(S_simgrid_parse_zone_9); break;
+    case S_simgrid_parse_AS_10:
+    case S_simgrid_parse_AS_11:
+    case S_simgrid_parse_AS_7:
+      SET(S_simgrid_parse_AS_11);
+      break;
+    case S_simgrid_parse_AS_13:
+    case S_simgrid_parse_AS_3:
+      SET(S_simgrid_parse_AS_14);
+      break;
+    case S_simgrid_parse_AS:
+    case S_simgrid_parse_AS_12:
+    case S_simgrid_parse_AS_14:
+    case S_simgrid_parse_AS_15:
+    case S_simgrid_parse_AS_16:
+      SET(S_simgrid_parse_AS_16);
+      break;
+    case S_simgrid_parse_AS_1:
+    case S_simgrid_parse_AS_5:
+      SET(S_simgrid_parse_AS_6);
+      break;
+    case S_simgrid_parse_AS_4:
+    case S_simgrid_parse_AS_6:
+    case S_simgrid_parse_AS_8:
+    case S_simgrid_parse_AS_9:
+      SET(S_simgrid_parse_AS_9);
+      break;
+    case S_simgrid_parse_include:
+    case S_simgrid_parse_include_1:
+    case S_simgrid_parse_include_2:
+      SET(S_simgrid_parse_include_2);
+      break;
+    case S_simgrid_parse_platform:
+    case S_simgrid_parse_platform_1:
+    case S_simgrid_parse_platform_3:
+    case S_simgrid_parse_platform_5:
+    case S_simgrid_parse_platform_6:
+      SET(S_simgrid_parse_platform_6);
+      break;
+    case S_simgrid_parse_zone:
+    case S_simgrid_parse_zone_10:
+    case S_simgrid_parse_zone_11:
+    case S_simgrid_parse_zone_1:
+    case S_simgrid_parse_zone_4:
+    case S_simgrid_parse_zone_7:
+      SET(S_simgrid_parse_zone_11);
+      break;
+    case S_simgrid_parse_zone_13:
+    case S_simgrid_parse_zone_14:
+    case S_simgrid_parse_zone_3:
+      SET(S_simgrid_parse_zone_14);
+      break;
+    case S_simgrid_parse_zone_12:
+    case S_simgrid_parse_zone_15:
+    case S_simgrid_parse_zone_16:
+      SET(S_simgrid_parse_zone_16);
+      break;
+    case S_simgrid_parse_zone_5:
+    case S_simgrid_parse_zone_6:
+      SET(S_simgrid_parse_zone_6);
+      break;
+    case S_simgrid_parse_zone_8:
+    case S_simgrid_parse_zone_9:
+      SET(S_simgrid_parse_zone_9);
+      break;
   }
  }
        YY_BREAK
@@ -10684,18 +10966,70 @@ YY_RULE_SETUP
   if (!AX_simgrid_parse_trace___connect_trace) FAIL("Required attribute `trace' not set for `trace_connect' element.");
   LEAVE; STag_simgrid_parse_trace___connect(); simgrid_parse_pcdata_ix = 0; ETag_simgrid_parse_trace___connect(); popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_simgrid_parse_AS: case S_simgrid_parse_AS_10: case S_simgrid_parse_AS_11: case S_simgrid_parse_AS_3: case S_simgrid_parse_AS_4: case S_simgrid_parse_AS_6: case S_simgrid_parse_AS_7: case S_simgrid_parse_AS_9: SET(S_simgrid_parse_AS_11); break;
-   case S_simgrid_parse_AS_13: case S_simgrid_parse_AS_14: SET(S_simgrid_parse_AS_14); break;
-   case S_simgrid_parse_AS_12: case S_simgrid_parse_AS_15: case S_simgrid_parse_AS_16: case S_simgrid_parse_AS_1: SET(S_simgrid_parse_AS_16); break;
-   case S_simgrid_parse_AS_5: SET(S_simgrid_parse_AS_6); break;
-   case S_simgrid_parse_AS_8: SET(S_simgrid_parse_AS_9); break;
-   case S_simgrid_parse_include: case S_simgrid_parse_include_1: case S_simgrid_parse_include_2: SET(S_simgrid_parse_include_2); break;
-   case S_simgrid_parse_platform: case S_simgrid_parse_platform_1: case S_simgrid_parse_platform_3: case S_simgrid_parse_platform_5: case S_simgrid_parse_platform_6: SET(S_simgrid_parse_platform_6); break;
-   case S_simgrid_parse_zone: case S_simgrid_parse_zone_10: case S_simgrid_parse_zone_11: case S_simgrid_parse_zone_6: case S_simgrid_parse_zone_7: SET(S_simgrid_parse_zone_11); break;
-   case S_simgrid_parse_zone_13: case S_simgrid_parse_zone_14: case S_simgrid_parse_zone_3: SET(S_simgrid_parse_zone_14); break;
-   case S_simgrid_parse_zone_12: case S_simgrid_parse_zone_15: case S_simgrid_parse_zone_16: case S_simgrid_parse_zone_1: SET(S_simgrid_parse_zone_16); break;
-   case S_simgrid_parse_zone_5: SET(S_simgrid_parse_zone_6); break;
-   case S_simgrid_parse_zone_4: case S_simgrid_parse_zone_8: case S_simgrid_parse_zone_9: SET(S_simgrid_parse_zone_9); break;
+    case S_simgrid_parse_AS_10:
+    case S_simgrid_parse_AS_11:
+    case S_simgrid_parse_AS_7:
+      SET(S_simgrid_parse_AS_11);
+      break;
+    case S_simgrid_parse_AS_13:
+    case S_simgrid_parse_AS_3:
+      SET(S_simgrid_parse_AS_14);
+      break;
+    case S_simgrid_parse_AS:
+    case S_simgrid_parse_AS_12:
+    case S_simgrid_parse_AS_14:
+    case S_simgrid_parse_AS_15:
+    case S_simgrid_parse_AS_16:
+      SET(S_simgrid_parse_AS_16);
+      break;
+    case S_simgrid_parse_AS_1:
+    case S_simgrid_parse_AS_5:
+      SET(S_simgrid_parse_AS_6);
+      break;
+    case S_simgrid_parse_AS_4:
+    case S_simgrid_parse_AS_6:
+    case S_simgrid_parse_AS_8:
+    case S_simgrid_parse_AS_9:
+      SET(S_simgrid_parse_AS_9);
+      break;
+    case S_simgrid_parse_include:
+    case S_simgrid_parse_include_1:
+    case S_simgrid_parse_include_2:
+      SET(S_simgrid_parse_include_2);
+      break;
+    case S_simgrid_parse_platform:
+    case S_simgrid_parse_platform_1:
+    case S_simgrid_parse_platform_3:
+    case S_simgrid_parse_platform_5:
+    case S_simgrid_parse_platform_6:
+      SET(S_simgrid_parse_platform_6);
+      break;
+    case S_simgrid_parse_zone:
+    case S_simgrid_parse_zone_10:
+    case S_simgrid_parse_zone_11:
+    case S_simgrid_parse_zone_1:
+    case S_simgrid_parse_zone_4:
+    case S_simgrid_parse_zone_7:
+      SET(S_simgrid_parse_zone_11);
+      break;
+    case S_simgrid_parse_zone_13:
+    case S_simgrid_parse_zone_14:
+    case S_simgrid_parse_zone_3:
+      SET(S_simgrid_parse_zone_14);
+      break;
+    case S_simgrid_parse_zone_12:
+    case S_simgrid_parse_zone_15:
+    case S_simgrid_parse_zone_16:
+      SET(S_simgrid_parse_zone_16);
+      break;
+    case S_simgrid_parse_zone_5:
+    case S_simgrid_parse_zone_6:
+      SET(S_simgrid_parse_zone_6);
+      break;
+    case S_simgrid_parse_zone_8:
+    case S_simgrid_parse_zone_9:
+      SET(S_simgrid_parse_zone_9);
+      break;
   }
  }
        YY_BREAK
@@ -10719,18 +11053,70 @@ YY_RULE_SETUP
   ETag_simgrid_parse_trace___connect();
   popbuffer(); /* attribute */
   switch (YY_START) {
-   case S_simgrid_parse_AS: case S_simgrid_parse_AS_10: case S_simgrid_parse_AS_11: case S_simgrid_parse_AS_3: case S_simgrid_parse_AS_4: case S_simgrid_parse_AS_6: case S_simgrid_parse_AS_7: case S_simgrid_parse_AS_9: SET(S_simgrid_parse_AS_11); break;
-   case S_simgrid_parse_AS_13: case S_simgrid_parse_AS_14: SET(S_simgrid_parse_AS_14); break;
-   case S_simgrid_parse_AS_12: case S_simgrid_parse_AS_15: case S_simgrid_parse_AS_16: case S_simgrid_parse_AS_1: SET(S_simgrid_parse_AS_16); break;
-   case S_simgrid_parse_AS_5: SET(S_simgrid_parse_AS_6); break;
-   case S_simgrid_parse_AS_8: SET(S_simgrid_parse_AS_9); break;
-   case S_simgrid_parse_include: case S_simgrid_parse_include_1: case S_simgrid_parse_include_2: SET(S_simgrid_parse_include_2); break;
-   case S_simgrid_parse_platform: case S_simgrid_parse_platform_1: case S_simgrid_parse_platform_3: case S_simgrid_parse_platform_5: case S_simgrid_parse_platform_6: SET(S_simgrid_parse_platform_6); break;
-   case S_simgrid_parse_zone: case S_simgrid_parse_zone_10: case S_simgrid_parse_zone_11: case S_simgrid_parse_zone_6: case S_simgrid_parse_zone_7: SET(S_simgrid_parse_zone_11); break;
-   case S_simgrid_parse_zone_13: case S_simgrid_parse_zone_14: case S_simgrid_parse_zone_3: SET(S_simgrid_parse_zone_14); break;
-   case S_simgrid_parse_zone_12: case S_simgrid_parse_zone_15: case S_simgrid_parse_zone_16: case S_simgrid_parse_zone_1: SET(S_simgrid_parse_zone_16); break;
-   case S_simgrid_parse_zone_5: SET(S_simgrid_parse_zone_6); break;
-   case S_simgrid_parse_zone_4: case S_simgrid_parse_zone_8: case S_simgrid_parse_zone_9: SET(S_simgrid_parse_zone_9); break;
+    case S_simgrid_parse_AS_10:
+    case S_simgrid_parse_AS_11:
+    case S_simgrid_parse_AS_7:
+      SET(S_simgrid_parse_AS_11);
+      break;
+    case S_simgrid_parse_AS_13:
+    case S_simgrid_parse_AS_3:
+      SET(S_simgrid_parse_AS_14);
+      break;
+    case S_simgrid_parse_AS:
+    case S_simgrid_parse_AS_12:
+    case S_simgrid_parse_AS_14:
+    case S_simgrid_parse_AS_15:
+    case S_simgrid_parse_AS_16:
+      SET(S_simgrid_parse_AS_16);
+      break;
+    case S_simgrid_parse_AS_1:
+    case S_simgrid_parse_AS_5:
+      SET(S_simgrid_parse_AS_6);
+      break;
+    case S_simgrid_parse_AS_4:
+    case S_simgrid_parse_AS_6:
+    case S_simgrid_parse_AS_8:
+    case S_simgrid_parse_AS_9:
+      SET(S_simgrid_parse_AS_9);
+      break;
+    case S_simgrid_parse_include:
+    case S_simgrid_parse_include_1:
+    case S_simgrid_parse_include_2:
+      SET(S_simgrid_parse_include_2);
+      break;
+    case S_simgrid_parse_platform:
+    case S_simgrid_parse_platform_1:
+    case S_simgrid_parse_platform_3:
+    case S_simgrid_parse_platform_5:
+    case S_simgrid_parse_platform_6:
+      SET(S_simgrid_parse_platform_6);
+      break;
+    case S_simgrid_parse_zone:
+    case S_simgrid_parse_zone_10:
+    case S_simgrid_parse_zone_11:
+    case S_simgrid_parse_zone_1:
+    case S_simgrid_parse_zone_4:
+    case S_simgrid_parse_zone_7:
+      SET(S_simgrid_parse_zone_11);
+      break;
+    case S_simgrid_parse_zone_13:
+    case S_simgrid_parse_zone_14:
+    case S_simgrid_parse_zone_3:
+      SET(S_simgrid_parse_zone_14);
+      break;
+    case S_simgrid_parse_zone_12:
+    case S_simgrid_parse_zone_15:
+    case S_simgrid_parse_zone_16:
+      SET(S_simgrid_parse_zone_16);
+      break;
+    case S_simgrid_parse_zone_5:
+    case S_simgrid_parse_zone_6:
+      SET(S_simgrid_parse_zone_6);
+      break;
+    case S_simgrid_parse_zone_8:
+    case S_simgrid_parse_zone_9:
+      SET(S_simgrid_parse_zone_9);
+      break;
   }
  }
        YY_BREAK
@@ -12272,7 +12658,7 @@ static int fail(const char* fmt, ...)
 
 #ifndef FLEXML_quiet_parser
     /* print directly to sdterr */
-    surf_parse_error(flexml_err_msg);
+    simgrid_parse_error(flexml_err_msg);
     flexml_err_msg[0] = '\0';
 #endif
 

diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp
index 86d89c0..bab333f 100644 (file)
--- a/src/surf/xml/surfxml_parseplatf.cpp
+++ b/src/surf/xml/surfxml_parseplatf.cpp
@@ -22,9 +22,9 @@ static std::unordered_map<std::string, std::string> trace_connect_list_link_lat;
 
 void sg_platf_trace_connect(simgrid::kernel::routing::TraceConnectCreationArgs* trace_connect)
 {
-  surf_parse_assert(traces_set_list.find(trace_connect->trace) != traces_set_list.end(),
-                    "Cannot connect trace " + trace_connect->trace + " to " + trace_connect->element +
-                        ": trace unknown");
+  simgrid_parse_assert(traces_set_list.find(trace_connect->trace) != traces_set_list.end(),
+                       "Cannot connect trace " + trace_connect->trace + " to " + trace_connect->element +
+                           ": trace unknown");
 
   switch (trace_connect->kind) {
     case simgrid::kernel::routing::TraceConnectKind::HOST_AVAIL:
@@ -43,8 +43,8 @@ void sg_platf_trace_connect(simgrid::kernel::routing::TraceConnectCreationArgs*
       trace_connect_list_link_lat.try_emplace(trace_connect->trace, trace_connect->element);
       break;
     default:
-      surf_parse_error("Cannot connect trace " + trace_connect->trace + " to " + trace_connect->element +
-                       ": unknown kind of trace");
+      simgrid_parse_error("Cannot connect trace " + trace_connect->trace + " to " + trace_connect->element +
+                          ": unknown kind of trace");
   }
 }
 
@@ -52,64 +52,64 @@ void sg_platf_trace_connect(simgrid::kernel::routing::TraceConnectCreationArgs*
 void parse_platform_file(const std::string& file)
 {
   /* init the flex parser */
-  surf_parse_open(file);
+  simgrid_parse_open(file);
 
   /* Do the actual parsing */
-  surf_parse();
+  simgrid_parse();
 
   /* Get the Engine singleton once and for all*/
   const auto engine = simgrid::s4u::Engine::get_instance();
 
   /* connect all profiles relative to hosts */
   for (auto const& [trace, name] : trace_connect_list_host_avail) {
-    surf_parse_assert(traces_set_list.find(trace) != traces_set_list.end(),
-                      "<trace_connect kind=\"HOST_AVAIL\">: Trace " + trace + " undefined.");
+    simgrid_parse_assert(traces_set_list.find(trace) != traces_set_list.end(),
+                         "<trace_connect kind=\"HOST_AVAIL\">: Trace " + trace + " undefined.");
     auto profile = traces_set_list.at(trace);
 
     auto host = engine->host_by_name_or_null(name);
-    surf_parse_assert(host, "<trace_connect kind=\"HOST_AVAIL\">: Host " + name + " undefined.");
+    simgrid_parse_assert(host, "<trace_connect kind=\"HOST_AVAIL\">: Host " + name + " undefined.");
     host->set_state_profile(profile);
   }
 
   for (auto const& [trace, name] : trace_connect_list_host_speed) {
-    surf_parse_assert(traces_set_list.find(trace) != traces_set_list.end(),
-                      "<trace_connect kind=\"SPEED\">: Trace " + trace + " undefined.");
+    simgrid_parse_assert(traces_set_list.find(trace) != traces_set_list.end(),
+                         "<trace_connect kind=\"SPEED\">: Trace " + trace + " undefined.");
     auto profile = traces_set_list.at(trace);
 
     auto host = engine->host_by_name_or_null(name);
-    surf_parse_assert(host, "<trace_connect kind=\"SPEED\">: Host " + name + " undefined.");
+    simgrid_parse_assert(host, "<trace_connect kind=\"SPEED\">: Host " + name + " undefined.");
     host->set_speed_profile(profile);
   }
 
   for (auto const& [trace, name] : trace_connect_list_link_avail) {
-    surf_parse_assert(traces_set_list.find(trace) != traces_set_list.end(),
-                      "<trace_connect kind=\"LINK_AVAIL\">: Trace " + trace + " undefined.");
+    simgrid_parse_assert(traces_set_list.find(trace) != traces_set_list.end(),
+                         "<trace_connect kind=\"LINK_AVAIL\">: Trace " + trace + " undefined.");
     auto profile = traces_set_list.at(trace);
 
     auto link = engine->link_by_name_or_null(name);
-    surf_parse_assert(link, "<trace_connect kind=\"LINK_AVAIL\">: Link " + name + " undefined.");
+    simgrid_parse_assert(link, "<trace_connect kind=\"LINK_AVAIL\">: Link " + name + " undefined.");
     link->set_state_profile(profile);
   }
 
   for (auto const& [trace, name] : trace_connect_list_link_bw) {
-    surf_parse_assert(traces_set_list.find(trace) != traces_set_list.end(),
-                      "<trace_connect kind=\"BANDWIDTH\">: Trace " + trace + " undefined.");
+    simgrid_parse_assert(traces_set_list.find(trace) != traces_set_list.end(),
+                         "<trace_connect kind=\"BANDWIDTH\">: Trace " + trace + " undefined.");
     auto profile = traces_set_list.at(trace);
 
     auto link = engine->link_by_name_or_null(name);
-    surf_parse_assert(link, "<trace_connect kind=\"BANDWIDTH\">: Link " + name + " undefined.");
+    simgrid_parse_assert(link, "<trace_connect kind=\"BANDWIDTH\">: Link " + name + " undefined.");
     link->set_bandwidth_profile(profile);
   }
 
   for (auto const& [trace, name] : trace_connect_list_link_lat) {
-    surf_parse_assert(traces_set_list.find(trace) != traces_set_list.end(),
-                      "<trace_connect kind=\"LATENCY\">: Trace " + trace + " undefined.");
+    simgrid_parse_assert(traces_set_list.find(trace) != traces_set_list.end(),
+                         "<trace_connect kind=\"LATENCY\">: Trace " + trace + " undefined.");
     auto profile = traces_set_list.at(trace);
 
     auto link = engine->link_by_name_or_null(name);
-    surf_parse_assert(link, "<trace_connect kind=\"LATENCY\">: Link " + name + " undefined.");
+    simgrid_parse_assert(link, "<trace_connect kind=\"LATENCY\">: Link " + name + " undefined.");
     link->set_latency_profile(profile);
   }
 
-  surf_parse_close();
+  simgrid_parse_close();
 }

diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/surf/xml/surfxml_sax_cb.cpp
index fc566c5..3238ec8 100644 (file)
--- a/src/surf/xml/surfxml_sax_cb.cpp
+++ b/src/surf/xml/surfxml_sax_cb.cpp
@@ -27,22 +27,22 @@
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(platf_parse, ker_platform, "Logging specific to the parsing of platform files");
 
-std::string surf_parsed_filename; // Currently parsed file (for the error messages)
+std::string simgrid_parsed_filename;                            // Currently parsed file (for the error messages)
 static std::vector<simgrid::s4u::LinkInRoute> parsed_link_list; /* temporary store of current link list of a route */
 
 /* Helping functions */
-void surf_parse_assert(bool cond, const std::string& msg)
+void simgrid_parse_assert(bool cond, const std::string& msg)
 {
   if (not cond)
-    surf_parse_error(msg);
+    simgrid_parse_error(msg);
 }
 
-void surf_parse_error(const std::string& msg)
+void simgrid_parse_error(const std::string& msg)
 {
-  throw simgrid::ParseError(surf_parsed_filename, surf_parse_lineno, msg);
+  throw simgrid::ParseError(simgrid_parsed_filename, simgrid_parse_lineno, msg);
 }
 
-void surf_parse_assert_netpoint(const std::string& hostname, const std::string& pre, const std::string& post)
+void simgrid_parse_assert_netpoint(const std::string& hostname, const std::string& pre, const std::string& post)
 {
   if (simgrid::s4u::Engine::get_instance()->netpoint_by_name_or_null(hostname) != nullptr) // found
     return;
@@ -70,24 +70,24 @@ void surf_parse_assert_netpoint(const std::string& hostname, const std::string&
       break;
     }
   }
-  surf_parse_error(msg);
+  simgrid_parse_error(msg);
 }
 
-double surf_parse_get_double(const std::string& s)
+double simgrid_parse_get_double(const std::string& s)
 {
   try {
     return std::stod(s);
   } catch (const std::invalid_argument&) {
-    surf_parse_error(s + " is not a double");
+    simgrid_parse_error(s + " is not a double");
   }
 }
 
-int surf_parse_get_int(const std::string& s)
+int simgrid_parse_get_int(const std::string& s)
 {
   try {
     return std::stoi(s);
   } catch (const std::invalid_argument&) {
-    surf_parse_error(s + " is not an int");
+    simgrid_parse_error(s + " is not an int");
   }
 }
 
@@ -100,7 +100,7 @@ static void explodesRadical(const std::string& radicals, std::vector<int>* explo
   for (auto const& group : radical_elements) {
     std::vector<std::string> radical_ends;
     boost::split(radical_ends, group, boost::is_any_of("-"));
-    int start = surf_parse_get_int(radical_ends.front());
+    int start = simgrid_parse_get_int(radical_ends.front());
     int end   = 0;
 
     switch (radical_ends.size()) {
@@ -108,10 +108,10 @@ static void explodesRadical(const std::string& radicals, std::vector<int>* explo
         end = start;
         break;
       case 2:
-        end = surf_parse_get_int(radical_ends.back());
+        end = simgrid_parse_get_int(radical_ends.back());
         break;
       default:
-        surf_parse_error("Malformed radical: " + group);
+        simgrid_parse_error("Malformed radical: " + group);
     }
     for (int i = start; i <= end; i++)
       exploded->push_back(i);
@@ -173,26 +173,26 @@ void ETag_simgrid_parse_include()
 void STag_simgrid_parse_platform() {
   /* Use fixed point arithmetic to avoid rounding errors ("4.1" for example cannot be represented exactly as a floating
    * point number) */
-  const long int version           = lround(100.0 * surf_parse_get_double(A_simgrid_parse_platform_version));
+  const long int version           = lround(100.0 * simgrid_parse_get_double(A_simgrid_parse_platform_version));
   const std::string version_string = std::to_string(version / 100) + "." + std::to_string(version % 100);
 
-  surf_parse_assert(version >= 100L, "******* BIG FAT WARNING *********\n "
-                                     "You're using an ancient XML file.\n"
-                                     "Since SimGrid 3.1, units are Bytes, Flops, and seconds "
-                                     "instead of MBytes, MFlops and seconds.\n"
-
-                                     "Use simgrid_update_xml to update your file automatically. "
-                                     "This program is installed automatically with SimGrid, or "
-                                     "available in the tools/ directory of the source archive.\n"
-
-                                     "Please check also out the SURF section of the ChangeLog for "
-                                     "the 3.1 version for more information.");
-  surf_parse_assert(version >= 300L, "******* BIG FAT WARNING *********\n "
-                                     "You're using an old XML file.\n"
-                                     "Use simgrid_update_xml to update your file automatically. "
-                                     "This program is installed automatically with SimGrid, or "
-                                     "available in the tools/ directory of the source archive.");
-  surf_parse_assert(
+  simgrid_parse_assert(version >= 100L, "******* BIG FAT WARNING *********\n "
+                                        "You're using an ancient XML file.\n"
+                                        "Since SimGrid 3.1, units are Bytes, Flops, and seconds "
+                                        "instead of MBytes, MFlops and seconds.\n"
+
+                                        "Use simgrid_update_xml to update your file automatically. "
+                                        "This program is installed automatically with SimGrid, or "
+                                        "available in the tools/ directory of the source archive.\n"
+
+                                        "Please check also out the SURF section of the ChangeLog for "
+                                        "the 3.1 version for more information.");
+  simgrid_parse_assert(version >= 300L, "******* BIG FAT WARNING *********\n "
+                                        "You're using an old XML file.\n"
+                                        "Use simgrid_update_xml to update your file automatically. "
+                                        "This program is installed automatically with SimGrid, or "
+                                        "available in the tools/ directory of the source archive.");
+  simgrid_parse_assert(
       version >= 400L,
       "******* THIS FILE IS TOO OLD (v:" + version_string +
           ") *********\n "
@@ -211,12 +211,13 @@ void STag_simgrid_parse_platform() {
              "Use simgrid_update_xml to update your file automatically to get rid of this warning. "
              "This program is installed automatically with SimGrid, or "
              "available in the tools/ directory of the source archive.",
-             version_string.c_str(), surf_parsed_filename.c_str());
+             version_string.c_str(), simgrid_parsed_filename.c_str());
   }
-  surf_parse_assert(version <= 410L, "******* THIS FILE COMES FROM THE FUTURE (v:" + version_string +
-                                         ") *********\n "
-                                         "The most recent formalism that this version of SimGrid understands is v4.1.\n"
-                                         "Please update your code, or use another, more adapted, file.");
+  simgrid_parse_assert(version <= 410L,
+                       "******* THIS FILE COMES FROM THE FUTURE (v:" + version_string +
+                           ") *********\n "
+                           "The most recent formalism that this version of SimGrid understands is v4.1.\n"
+                           "Please update your code, or use another, more adapted, file.");
 }
 void ETag_simgrid_parse_platform(){
   simgrid::s4u::Engine::on_platform_created();
@@ -235,11 +236,11 @@ void STag_simgrid_parse_host()
   property_sets.emplace_back();
   host.id = A_simgrid_parse_host_id;
 
-  host.speed_per_pstate = xbt_parse_get_all_speeds(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_host_speed,
-                                                   "speed of host " + host.id);
+  host.speed_per_pstate = xbt_parse_get_all_speeds(simgrid_parsed_filename, simgrid_parse_lineno,
+                                                   A_simgrid_parse_host_speed, "speed of host " + host.id);
 
   XBT_DEBUG("pstate: %s", A_simgrid_parse_host_pstate);
-  host.core_amount = surf_parse_get_int(A_simgrid_parse_host_core);
+  host.core_amount = simgrid_parse_get_int(A_simgrid_parse_host_core);
 
   if (A_simgrid_parse_host_availability___file[0] != '\0') {
     XBT_WARN("The availability_file attribute in <host> is now deprecated. Please, use 'speed_file' instead.");
@@ -260,7 +261,7 @@ void ETag_simgrid_parse_host()
   sg_platf_new_host_set_properties(property_sets.back());
   property_sets.pop_back();
 
-  sg_platf_new_host_seal(surf_parse_get_int(A_simgrid_parse_host_pstate));
+  sg_platf_new_host_seal(simgrid_parse_get_int(A_simgrid_parse_host_pstate));
 }
 
 void STag_simgrid_parse_disk() {
@@ -273,10 +274,10 @@ void ETag_simgrid_parse_disk() {
   property_sets.pop_back();
 
   disk.id       = A_simgrid_parse_disk_id;
-  disk.read_bw  = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_disk_read___bw,
-                                         "read_bw of disk " + disk.id);
-  disk.write_bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_disk_write___bw,
-                                          "write_bw of disk " + disk.id);
+  disk.read_bw  = xbt_parse_get_bandwidth(simgrid_parsed_filename, simgrid_parse_lineno, A_simgrid_parse_disk_read___bw,
+                                          "read_bw of disk " + disk.id);
+  disk.write_bw = xbt_parse_get_bandwidth(simgrid_parsed_filename, simgrid_parse_lineno,
+                                          A_simgrid_parse_disk_write___bw, "write_bw of disk " + disk.id);
 
   sg_platf_new_disk(&disk);
 }
@@ -305,30 +306,31 @@ void ETag_simgrid_parse_cluster(){
   cluster.suffix      = A_simgrid_parse_cluster_suffix;
   explodesRadical(A_simgrid_parse_cluster_radical, &cluster.radicals);
 
-  cluster.speeds = xbt_parse_get_all_speeds(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_cluster_speed,
-                                            "speed of cluster " + cluster.id);
-  cluster.core_amount = surf_parse_get_int(A_simgrid_parse_cluster_core);
-  cluster.bw          = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_cluster_bw,
-                                       "bw of cluster " + cluster.id);
-  cluster.lat = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_cluster_lat,
+  cluster.speeds      = xbt_parse_get_all_speeds(simgrid_parsed_filename, simgrid_parse_lineno,
+                                                 A_simgrid_parse_cluster_speed, "speed of cluster " + cluster.id);
+  cluster.core_amount = simgrid_parse_get_int(A_simgrid_parse_cluster_core);
+  cluster.bw  = xbt_parse_get_bandwidth(simgrid_parsed_filename, simgrid_parse_lineno, A_simgrid_parse_cluster_bw,
+                                        "bw of cluster " + cluster.id);
+  cluster.lat = xbt_parse_get_time(simgrid_parsed_filename, simgrid_parse_lineno, A_simgrid_parse_cluster_lat,
                                    "lat of cluster " + cluster.id);
   if(strcmp(A_simgrid_parse_cluster_bb___bw,""))
-    cluster.bb_bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_cluster_bb___bw,
-                                            "bb_bw of cluster " + cluster.id);
+    cluster.bb_bw = xbt_parse_get_bandwidth(simgrid_parsed_filename, simgrid_parse_lineno,
+                                            A_simgrid_parse_cluster_bb___bw, "bb_bw of cluster " + cluster.id);
   if(strcmp(A_simgrid_parse_cluster_bb___lat,""))
-    cluster.bb_lat = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_cluster_bb___lat,
+    cluster.bb_lat = xbt_parse_get_time(simgrid_parsed_filename, simgrid_parse_lineno, A_simgrid_parse_cluster_bb___lat,
                                         "bb_lat of cluster " + cluster.id);
   if(strcmp(A_simgrid_parse_cluster_limiter___link,""))
     cluster.limiter_link =
-        xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_cluster_limiter___link,
+        xbt_parse_get_bandwidth(simgrid_parsed_filename, simgrid_parse_lineno, A_simgrid_parse_cluster_limiter___link,
                                 "limiter_link of cluster " + cluster.id);
   if(strcmp(A_simgrid_parse_cluster_loopback___bw,""))
     cluster.loopback_bw =
-        xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_cluster_loopback___bw,
+        xbt_parse_get_bandwidth(simgrid_parsed_filename, simgrid_parse_lineno, A_simgrid_parse_cluster_loopback___bw,
                                 "loopback_bw of cluster " + cluster.id);
   if(strcmp(A_simgrid_parse_cluster_loopback___lat,""))
-    cluster.loopback_lat = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_cluster_loopback___lat,
-                                              "loopback_lat of cluster " + cluster.id);
+    cluster.loopback_lat =
+        xbt_parse_get_time(simgrid_parsed_filename, simgrid_parse_lineno, A_simgrid_parse_cluster_loopback___lat,
+                           "loopback_lat of cluster " + cluster.id);
 
   switch(AX_simgrid_parse_cluster_topology){
   case A_simgrid_parse_cluster_topology_FLAT:
@@ -344,7 +346,7 @@ void ETag_simgrid_parse_cluster(){
     cluster.topology = simgrid::kernel::routing::ClusterTopology::DRAGONFLY;
     break;
   default:
-    surf_parse_error("Invalid cluster topology for cluster " + cluster.id);
+    simgrid_parse_error("Invalid cluster topology for cluster " + cluster.id);
   }
   cluster.topo_parameters = A_simgrid_parse_cluster_topo___parameters;
   cluster.router_id = A_simgrid_parse_cluster_router___id;
@@ -364,7 +366,7 @@ void ETag_simgrid_parse_cluster(){
     cluster.sharing_policy = simgrid::s4u::Link::SharingPolicy::FATPIPE;
     break;
   default:
-    surf_parse_error("Invalid cluster sharing policy for cluster " + cluster.id);
+    simgrid_parse_error("Invalid cluster sharing policy for cluster " + cluster.id);
   }
   switch (AX_simgrid_parse_cluster_bb___sharing___policy) {
   case A_simgrid_parse_cluster_bb___sharing___policy_FATPIPE:
@@ -374,7 +376,7 @@ void ETag_simgrid_parse_cluster(){
     cluster.bb_sharing_policy = simgrid::s4u::Link::SharingPolicy::SHARED;
     break;
   default:
-    surf_parse_error("Invalid bb sharing policy in cluster " + cluster.id);
+    simgrid_parse_error("Invalid bb sharing policy in cluster " + cluster.id);
   }
 
   sg_platf_new_tag_cluster(&cluster);
@@ -389,12 +391,12 @@ void STag_simgrid_parse_cabinet(){
   cabinet.id      = A_simgrid_parse_cabinet_id;
   cabinet.prefix  = A_simgrid_parse_cabinet_prefix;
   cabinet.suffix  = A_simgrid_parse_cabinet_suffix;
-  cabinet.speed   = xbt_parse_get_speed(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_cabinet_speed,
-                                      "speed of cabinet " + cabinet.id);
-  cabinet.bw = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_cabinet_bw,
-                                       "bw of cabinet " + cabinet.id);
-  cabinet.lat = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_cabinet_lat,
-                                   "lat of cabinet " + cabinet.id);
+  cabinet.speed   = xbt_parse_get_speed(simgrid_parsed_filename, simgrid_parse_lineno, A_simgrid_parse_cabinet_speed,
+                                        "speed of cabinet " + cabinet.id);
+  cabinet.bw      = xbt_parse_get_bandwidth(simgrid_parsed_filename, simgrid_parse_lineno, A_simgrid_parse_cabinet_bw,
+                                            "bw of cabinet " + cabinet.id);
+  cabinet.lat     = xbt_parse_get_time(simgrid_parsed_filename, simgrid_parse_lineno, A_simgrid_parse_cabinet_lat,
+                                       "lat of cabinet " + cabinet.id);
   explodesRadical(A_simgrid_parse_cabinet_radical, &cabinet.radicals);
 
   sg_platf_new_cabinet(&cabinet);
@@ -404,11 +406,11 @@ void STag_simgrid_parse_peer(){
   simgrid::kernel::routing::PeerCreationArgs peer;
 
   peer.id = A_simgrid_parse_peer_id;
-  peer.speed =
-      xbt_parse_get_speed(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_peer_speed, "speed of peer " + peer.id);
-  peer.bw_in = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_peer_bw___in,
-                                       "bw_in of peer " + peer.id);
-  peer.bw_out = xbt_parse_get_bandwidth(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_peer_bw___out,
+  peer.speed  = xbt_parse_get_speed(simgrid_parsed_filename, simgrid_parse_lineno, A_simgrid_parse_peer_speed,
+                                    "speed of peer " + peer.id);
+  peer.bw_in  = xbt_parse_get_bandwidth(simgrid_parsed_filename, simgrid_parse_lineno, A_simgrid_parse_peer_bw___in,
+                                        "bw_in of peer " + peer.id);
+  peer.bw_out = xbt_parse_get_bandwidth(simgrid_parsed_filename, simgrid_parse_lineno, A_simgrid_parse_peer_bw___out,
                                         "bw_out of peer " + peer.id);
   peer.coord       = A_simgrid_parse_peer_coordinates;
   peer.speed_trace = nullptr;
@@ -440,13 +442,13 @@ void ETag_simgrid_parse_link(){
   property_sets.pop_back();
 
   link.id                  = A_simgrid_parse_link_id;
-  link.bandwidths          = xbt_parse_get_bandwidths(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_link_bandwidth,
-                                             "bandwidth of link " + link.id);
+  link.bandwidths          = xbt_parse_get_bandwidths(simgrid_parsed_filename, simgrid_parse_lineno,
+                                                      A_simgrid_parse_link_bandwidth, "bandwidth of link " + link.id);
   link.bandwidth_trace     = A_simgrid_parse_link_bandwidth___file[0]
                              ? simgrid::kernel::profile::ProfileBuilder::from_file(A_simgrid_parse_link_bandwidth___file)
                              : nullptr;
-  link.latency =
-      xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_link_latency, "latency of link " + link.id);
+  link.latency = xbt_parse_get_time(simgrid_parsed_filename, simgrid_parse_lineno, A_simgrid_parse_link_latency,
+                                    "latency of link " + link.id);
   link.latency_trace       = A_simgrid_parse_link_latency___file[0]
                            ? simgrid::kernel::profile::ProfileBuilder::from_file(A_simgrid_parse_link_latency___file)
                            : nullptr;
@@ -472,7 +474,7 @@ void ETag_simgrid_parse_link(){
     link.policy = simgrid::s4u::Link::SharingPolicy::WIFI;
     break;
   default:
-    surf_parse_error("Invalid sharing policy in link " + link.id);
+    simgrid_parse_error("Invalid sharing policy in link " + link.id);
   }
 
   sg_platf_new_link(&link);
@@ -497,7 +499,7 @@ void STag_simgrid_parse_link___ctn()
     direction = simgrid::s4u::LinkInRoute::Direction::DOWN;
     break;
   default:
-    surf_parse_error(std::string("Invalid direction for link ") + A_simgrid_parse_link___ctn_id);
+    simgrid_parse_error(std::string("Invalid direction for link ") + A_simgrid_parse_link___ctn_id);
   }
 
   const char* dirname;
@@ -511,7 +513,7 @@ void STag_simgrid_parse_link___ctn()
     default:
       dirname = "";
   }
-  surf_parse_assert(link != nullptr, std::string("No such link: '") + A_simgrid_parse_link___ctn_id + "'" + dirname);
+  simgrid_parse_assert(link != nullptr, std::string("No such link: '") + A_simgrid_parse_link___ctn_id + "'" + dirname);
   parsed_link_list.emplace_back(link, direction);
 }
 
@@ -520,9 +522,10 @@ void ETag_simgrid_parse_backbone()
   auto link = std::make_unique<simgrid::kernel::routing::LinkCreationArgs>();
 
   link->id = A_simgrid_parse_backbone_id;
-  link->bandwidths.push_back(xbt_parse_get_bandwidth(
-      surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_backbone_bandwidth, "bandwidth of backbone " + link->id));
-  link->latency = xbt_parse_get_time(surf_parsed_filename, surf_parse_lineno, A_simgrid_parse_backbone_latency,
+  link->bandwidths.push_back(xbt_parse_get_bandwidth(simgrid_parsed_filename, simgrid_parse_lineno,
+                                                     A_simgrid_parse_backbone_bandwidth,
+                                                     "bandwidth of backbone " + link->id));
+  link->latency = xbt_parse_get_time(simgrid_parsed_filename, simgrid_parse_lineno, A_simgrid_parse_backbone_latency,
                                      "latency of backbone " + link->id);
   link->policy  = simgrid::s4u::Link::SharingPolicy::SHARED;
 
@@ -530,40 +533,44 @@ void ETag_simgrid_parse_backbone()
 }
 
 void STag_simgrid_parse_route(){
-  surf_parse_assert_netpoint(A_simgrid_parse_route_src, "Route src='", "' does name a node.");
-  surf_parse_assert_netpoint(A_simgrid_parse_route_dst, "Route dst='", "' does name a node.");
+  simgrid_parse_assert_netpoint(A_simgrid_parse_route_src, "Route src='", "' does name a node.");
+  simgrid_parse_assert_netpoint(A_simgrid_parse_route_dst, "Route dst='", "' does name a node.");
 }
 
 void STag_simgrid_parse_ASroute(){
-  surf_parse_assert_netpoint(A_simgrid_parse_ASroute_src, "ASroute src='", "' does name a node.");
-  surf_parse_assert_netpoint(A_simgrid_parse_ASroute_dst, "ASroute dst='", "' does name a node.");
+  simgrid_parse_assert_netpoint(A_simgrid_parse_ASroute_src, "ASroute src='", "' does name a node.");
+  simgrid_parse_assert_netpoint(A_simgrid_parse_ASroute_dst, "ASroute dst='", "' does name a node.");
 
-  surf_parse_assert_netpoint(A_simgrid_parse_ASroute_gw___src, "ASroute gw_src='", "' does name a node.");
-  surf_parse_assert_netpoint(A_simgrid_parse_ASroute_gw___dst, "ASroute gw_dst='", "' does name a node.");
+  simgrid_parse_assert_netpoint(A_simgrid_parse_ASroute_gw___src, "ASroute gw_src='", "' does name a node.");
+  simgrid_parse_assert_netpoint(A_simgrid_parse_ASroute_gw___dst, "ASroute gw_dst='", "' does name a node.");
 }
 void STag_simgrid_parse_zoneRoute(){
-  surf_parse_assert_netpoint(A_simgrid_parse_zoneRoute_src, "zoneRoute src='", "' does name a node.");
-  surf_parse_assert_netpoint(A_simgrid_parse_zoneRoute_dst, "zoneRoute dst='", "' does name a node.");
-  surf_parse_assert_netpoint(A_simgrid_parse_zoneRoute_gw___src, "zoneRoute gw_src='", "' does name a node.");
-  surf_parse_assert_netpoint(A_simgrid_parse_zoneRoute_gw___dst, "zoneRoute gw_dst='", "' does name a node.");
+  simgrid_parse_assert_netpoint(A_simgrid_parse_zoneRoute_src, "zoneRoute src='", "' does name a node.");
+  simgrid_parse_assert_netpoint(A_simgrid_parse_zoneRoute_dst, "zoneRoute dst='", "' does name a node.");
+  simgrid_parse_assert_netpoint(A_simgrid_parse_zoneRoute_gw___src, "zoneRoute gw_src='", "' does name a node.");
+  simgrid_parse_assert_netpoint(A_simgrid_parse_zoneRoute_gw___dst, "zoneRoute gw_dst='", "' does name a node.");
 }
 
 void STag_simgrid_parse_bypassRoute(){
-  surf_parse_assert_netpoint(A_simgrid_parse_bypassRoute_src, "bypassRoute src='", "' does name a node.");
-  surf_parse_assert_netpoint(A_simgrid_parse_bypassRoute_dst, "bypassRoute dst='", "' does name a node.");
+  simgrid_parse_assert_netpoint(A_simgrid_parse_bypassRoute_src, "bypassRoute src='", "' does name a node.");
+  simgrid_parse_assert_netpoint(A_simgrid_parse_bypassRoute_dst, "bypassRoute dst='", "' does name a node.");
 }
 
 void STag_simgrid_parse_bypassASroute(){
-  surf_parse_assert_netpoint(A_simgrid_parse_bypassASroute_src, "bypassASroute src='", "' does name a node.");
-  surf_parse_assert_netpoint(A_simgrid_parse_bypassASroute_dst, "bypassASroute dst='", "' does name a node.");
-  surf_parse_assert_netpoint(A_simgrid_parse_bypassASroute_gw___src, "bypassASroute gw_src='", "' does name a node.");
-  surf_parse_assert_netpoint(A_simgrid_parse_bypassASroute_gw___dst, "bypassASroute gw_dst='", "' does name a node.");
+  simgrid_parse_assert_netpoint(A_simgrid_parse_bypassASroute_src, "bypassASroute src='", "' does name a node.");
+  simgrid_parse_assert_netpoint(A_simgrid_parse_bypassASroute_dst, "bypassASroute dst='", "' does name a node.");
+  simgrid_parse_assert_netpoint(A_simgrid_parse_bypassASroute_gw___src, "bypassASroute gw_src='",
+                                "' does name a node.");
+  simgrid_parse_assert_netpoint(A_simgrid_parse_bypassASroute_gw___dst, "bypassASroute gw_dst='",
+                                "' does name a node.");
 }
 void STag_simgrid_parse_bypassZoneRoute(){
-  surf_parse_assert_netpoint(A_simgrid_parse_bypassZoneRoute_src, "bypassZoneRoute src='", "' does name a node.");
-  surf_parse_assert_netpoint(A_simgrid_parse_bypassZoneRoute_dst, "bypassZoneRoute dst='", "' does name a node.");
-  surf_parse_assert_netpoint(A_simgrid_parse_bypassZoneRoute_gw___src, "bypassZoneRoute gw_src='", "' does name a node.");
-  surf_parse_assert_netpoint(A_simgrid_parse_bypassZoneRoute_gw___dst, "bypassZoneRoute gw_dst='", "' does name a node.");
+  simgrid_parse_assert_netpoint(A_simgrid_parse_bypassZoneRoute_src, "bypassZoneRoute src='", "' does name a node.");
+  simgrid_parse_assert_netpoint(A_simgrid_parse_bypassZoneRoute_dst, "bypassZoneRoute dst='", "' does name a node.");
+  simgrid_parse_assert_netpoint(A_simgrid_parse_bypassZoneRoute_gw___src, "bypassZoneRoute gw_src='",
+                                "' does name a node.");
+  simgrid_parse_assert_netpoint(A_simgrid_parse_bypassZoneRoute_gw___dst, "bypassZoneRoute gw_dst='",
+                                "' does name a node.");
 }
 
 void ETag_simgrid_parse_route(){
@@ -649,7 +656,7 @@ void ETag_simgrid_parse_trace(){
 
   trace.id = A_simgrid_parse_trace_id;
   trace.file = A_simgrid_parse_trace_file;
-  trace.periodicity = surf_parse_get_double(A_simgrid_parse_trace_periodicity);
+  trace.periodicity = simgrid_parse_get_double(A_simgrid_parse_trace_periodicity);
   trace.pc_data = simgrid_parse_pcdata;
 
   sg_platf_new_trace(&trace);
@@ -680,7 +687,7 @@ void STag_simgrid_parse_trace___connect()
       trace_connect.kind = simgrid::kernel::routing::TraceConnectKind::LINK_AVAIL;
       break;
     default:
-      surf_parse_error("Invalid trace kind");
+      simgrid_parse_error("Invalid trace kind");
   }
   sg_platf_trace_connect(&trace_connect);
 }
@@ -718,8 +725,9 @@ void STag_simgrid_parse_config()
   property_sets.emplace_back();
   XBT_DEBUG("START configuration name = %s",A_simgrid_parse_config_id);
   if (_sg_cfg_init_status == 2) {
-    surf_parse_error("All <config> tags must be given before any platform elements (such as <zone>, <host>, <cluster>, "
-                     "<link>, etc).");
+    simgrid_parse_error(
+        "All <config> tags must be given before any platform elements (such as <zone>, <host>, <cluster>, "
+        "<link>, etc).");
   }
 }
 
@@ -780,8 +788,8 @@ void ETag_simgrid_parse_actor()
   actor.args.swap(arguments);
   actor.host       = A_simgrid_parse_actor_host;
   actor.function   = A_simgrid_parse_actor_function;
-  actor.start_time = surf_parse_get_double(A_simgrid_parse_actor_start___time);
-  actor.kill_time  = surf_parse_get_double(A_simgrid_parse_actor_kill___time);
+  actor.start_time = simgrid_parse_get_double(A_simgrid_parse_actor_start___time);
+  actor.kill_time  = simgrid_parse_get_double(A_simgrid_parse_actor_kill___time);
 
   switch (A_simgrid_parse_actor_on___failure) {
   case AU_simgrid_parse_actor_on___failure:
@@ -792,7 +800,7 @@ void ETag_simgrid_parse_actor()
     actor.restart_on_failure = true;
     break;
   default:
-    surf_parse_error("Invalid on failure behavior");
+    simgrid_parse_error("Invalid on failure behavior");
   }
 
   sg_platf_new_actor(&actor);
@@ -827,9 +835,9 @@ void ETag_simgrid_parse_model___prop(){/* Nothing to do */}
 /* Open and Close parse file */
 static YY_BUFFER_STATE surf_input_buffer;
 
-void surf_parse_open(const std::string& file)
+void simgrid_parse_open(const std::string& file)
 {
-  surf_parsed_filename = file;
+  simgrid_parsed_filename = file;
   std::string dir      = simgrid::xbt::Path(file).get_dir_name();
   simgrid::xbt::path_push(dir);
 
@@ -837,25 +845,25 @@ void surf_parse_open(const std::string& file)
   if (surf_file_to_parse == nullptr)
     throw std::invalid_argument("Unable to open '" + file + "' from '" + simgrid::xbt::Path().get_name() +
                                 "'. Does this file exist?");
-  surf_input_buffer = surf_parse__create_buffer(surf_file_to_parse, YY_BUF_SIZE);
-  surf_parse__switch_to_buffer(surf_input_buffer);
-  surf_parse_lineno = 1;
+  surf_input_buffer = simgrid_parse__create_buffer(surf_file_to_parse, YY_BUF_SIZE);
+  simgrid_parse__switch_to_buffer(surf_input_buffer);
+  simgrid_parse_lineno = 1;
 }
 
-void surf_parse_close()
+void simgrid_parse_close()
 {
-  simgrid::xbt::path_pop(); // remove the dirname of the opened file, that was added in surf_parse_open()
+  simgrid::xbt::path_pop(); // remove the dirname of the opened file, that was added in simgrid_parse_open()
 
   if (surf_file_to_parse) {
-    surf_parse__delete_buffer(surf_input_buffer);
+    simgrid_parse__delete_buffer(surf_input_buffer);
     fclose(surf_file_to_parse);
     surf_file_to_parse = nullptr; //Must be reset for Bypass
   }
 }
 
 /* Call the lexer to parse the currently opened file */
-void surf_parse()
+void simgrid_parse()
 {
-  bool err = surf_parse_lex();
-  surf_parse_assert(not err, "Flex returned an error code");
+  bool err = simgrid_parse_lex();
+  simgrid_parse_assert(not err, "Flex returned an error code");
 }

diff --git a/tools/cmake/MaintainerMode.cmake b/tools/cmake/MaintainerMode.cmake
index 56f5d95..810f67f 100644 (file)
--- a/tools/cmake/MaintainerMode.cmake
+++ b/tools/cmake/MaintainerMode.cmake
@@ -176,7 +176,7 @@ if(enable_maintainer_mode)
 
       #surf/xml/simgrid_dtd.c: surf/xml/simgrid_dtd.l
       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid_dtd.c
-      COMMAND ${FLEX_EXE} -o src/surf/xml/simgrid_dtd.c -Psurf_parse_ --noline src/surf/xml/simgrid_dtd.l
+      COMMAND ${FLEX_EXE} -o src/surf/xml/simgrid_dtd.c -Psimgrid_parse_ --noline src/surf/xml/simgrid_dtd.l
       COMMAND ${CMAKE_COMMAND} -E echo "       Generated surf/xml/simgrid_dtd.c"
 
       #dag/dax_dtd.c: dag/dax_dtd.l

diff --git a/tools/cmake/scripts/fixup_simgrid_dtd_l.pl b/tools/cmake/scripts/fixup_simgrid_dtd_l.pl
index bbf0c17..7a2d251 100755 (executable)
--- a/tools/cmake/scripts/fixup_simgrid_dtd_l.pl
+++ b/tools/cmake/scripts/fixup_simgrid_dtd_l.pl
@@ -15,7 +15,7 @@ while (<>) {
 
     # Completely rewrite the error handling mechanism to use exceptions instead of printing to stderr
     if (/fprintf.stderr, .*? flexml_err_msg.;/) {
-       print('    surf_parse_error(flexml_err_msg);'."\n");
+       print('    simgrid_parse_error(flexml_err_msg);'."\n");
        next;
     }