From: Martin Quinson <martin.quinson@ens-rennes.fr>
Date: Sat, 18 Feb 2023 17:45:08 +0000 (+0100)
Subject: Move the files related to the platform parsing to kernel/xml
X-Git-Tag: v3.34~501
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/78d426efd0d78380e29df1c1496897d2bc62f596

Move the files related to the platform parsing to kernel/xml
---

diff --git a/.gitignore b/.gitignore
index bd7820dd19..c4b7ab787b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,7 +35,7 @@ CTestResults.xml
 
 ### Maintainer mode
 src/dag/dax_dtd.l
-src/surf/xml/simgrid_dtd.l
+src/kernel/xml/simgrid_dtd.l
 ### Libraries links
 [Ss]im[Gg]rid-*.tar.gz
 ### Generated files
diff --git a/COPYING b/COPYING
index 51835866d8..220071217c 100644
--- a/COPYING
+++ b/COPYING
@@ -67,8 +67,8 @@ License: other
 Files:
  src/dag/dax_dtd.c
  src/dag/dax_dtd.h
- src/surf/xml/simgrid_dtd.c
- src/surf/xml/simgrid_dtd.h
+ src/kernel/xml/simgrid_dtd.c
+ src/kernel/xml/simgrid_dtd.h
 Copyright:
  FleXML is Copyright (C) 1999-2005 Kristoffer Rose.  All rights reserved.
  FleXML is Copyright (C) 2003-2013 Martin Quinson.  All rights reserved.
diff --git a/MANIFEST.in b/MANIFEST.in
index ff0a062cb7..51456755b5 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -2125,6 +2125,13 @@ include src/kernel/routing/TorusZone_test.cpp
 include src/kernel/routing/VivaldiZone.cpp
 include src/kernel/routing/WifiZone.cpp
 include src/kernel/timer/Timer.cpp
+include src/kernel/xml/platf.hpp
+include src/kernel/xml/platf_private.hpp
+include src/kernel/xml/simgrid.dtd
+include src/kernel/xml/simgrid_dtd.c
+include src/kernel/xml/simgrid_dtd.h
+include src/kernel/xml/surfxml_parseplatf.cpp
+include src/kernel/xml/surfxml_sax_cb.cpp
 include src/mc/AddressSpace.hpp
 include src/mc/ModelChecker.cpp
 include src/mc/ModelChecker.hpp
@@ -2437,13 +2444,6 @@ include src/sthread/sthread.h
 include src/sthread/sthread_impl.cpp
 include src/surf/sg_platf.cpp
 include src/surf/surf_interface.hpp
-include src/surf/xml/platf.hpp
-include src/surf/xml/platf_private.hpp
-include src/surf/xml/simgrid.dtd
-include src/surf/xml/simgrid_dtd.c
-include src/surf/xml/simgrid_dtd.h
-include src/surf/xml/surfxml_parseplatf.cpp
-include src/surf/xml/surfxml_sax_cb.cpp
 include src/xbt/OsSemaphore.hpp
 include src/xbt/PropertyHolder.cpp
 include src/xbt/automaton/automaton.c
diff --git a/examples/cpp/comm-pingpong/s4u-comm-pingpong.tesh b/examples/cpp/comm-pingpong/s4u-comm-pingpong.tesh
index 861b0df694..72785640cb 100644
--- a/examples/cpp/comm-pingpong/s4u-comm-pingpong.tesh
+++ b/examples/cpp/comm-pingpong/s4u-comm-pingpong.tesh
@@ -39,7 +39,7 @@ $ ${bindir:=.}/s4u-comm-pingpong ${platfdir}/small_platform.xml --cfg=cpu/model:
 > [145.639041] (1:pinger@Tremblay) Pong time (bandwidth bound): 145.638
 > [145.639041] (0:maestro@) Total simulation time: 145.639
 
-p Testing the surf network constant model
+p Testing the network constant model
 
 $ ${bindir:=.}/s4u-comm-pingpong ${platfdir}/small_platform_routing_none.xml "--cfg=cpu/model:Cas01 network/model:Constant" "--log=root.fmt:[%10.6r]%e(%i:%a@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01'
diff --git a/src/kernel/EngineImpl.cpp b/src/kernel/EngineImpl.cpp
index 075d7ffc16..3564c35802 100644
--- a/src/kernel/EngineImpl.cpp
+++ b/src/kernel/EngineImpl.cpp
@@ -17,7 +17,7 @@
 #include "src/mc/mc_record.hpp"
 #include "src/mc/mc_replay.hpp"
 #include "src/smpi/include/smpi_actor.hpp"
-#include "src/surf/xml/platf.hpp"
+#include "src/kernel/xml/platf.hpp"
 #include "xbt/module.h"
 #include "xbt/xbt_modinter.h" /* whether initialization was already done */
 
diff --git a/src/kernel/resource/models/cpu_ti.cpp b/src/kernel/resource/models/cpu_ti.cpp
index 5fdaad6b4f..1dc5eebf2c 100644
--- a/src/kernel/resource/models/cpu_ti.cpp
+++ b/src/kernel/resource/models/cpu_ti.cpp
@@ -55,7 +55,7 @@ CpuTiProfile::CpuTiProfile(const profile::Profile* profile)
 /**
  * @brief Integrate trace
  *
- * Wrapper around surf_cpu_integrate_trace_simple() to get
+ * Wrapper around profile_->integrate_simple() to get
  * the cyclic effect.
  *
  * @param a      Begin of interval
diff --git a/src/kernel/resource/models/network_ns3.cpp b/src/kernel/resource/models/network_ns3.cpp
index b486ec1e1e..dfce0f0121 100644
--- a/src/kernel/resource/models/network_ns3.cpp
+++ b/src/kernel/resource/models/network_ns3.cpp
@@ -39,7 +39,7 @@
 #include "simgrid/s4u/NetZone.hpp"
 #include "src/instr/instr_private.hpp" // TRACE_is_enabled(). FIXME: remove by subscribing tracing to the signals
 #include "src/kernel/EngineImpl.hpp"
-#include "src/surf/xml/platf_private.hpp" // ClusterCreationArgs
+#include "src/kernel/xml/platf_private.hpp" // ClusterCreationArgs
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_ns3, res_network, "Network model based on ns-3");
 
diff --git a/src/kernel/routing/FatTreeZone.cpp b/src/kernel/routing/FatTreeZone.cpp
index 0995b81568..03aed92435 100644
--- 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" // simgrid_parse_error() and simgrid_parse_assert()
+#include "src/kernel/xml/platf.hpp" // simgrid_parse_error() and simgrid_parse_assert()
 
 #include <fstream>
 #include <numeric>
diff --git a/src/surf/xml/platf.hpp b/src/kernel/xml/platf.hpp
similarity index 100%
rename from src/surf/xml/platf.hpp
rename to src/kernel/xml/platf.hpp
diff --git a/src/surf/xml/platf_private.hpp b/src/kernel/xml/platf_private.hpp
similarity index 99%
rename from src/surf/xml/platf_private.hpp
rename to src/kernel/xml/platf_private.hpp
index 87c3029a7d..4c74ac4256 100644
--- a/src/surf/xml/platf_private.hpp
+++ b/src/kernel/xml/platf_private.hpp
@@ -10,7 +10,7 @@
 
 #include "simgrid/host.h"
 #include "simgrid/s4u/Link.hpp"
-#include "src/surf/xml/simgrid_dtd.h"
+#include "src/kernel/xml/simgrid_dtd.h"
 
 #include <map>
 #include <string>
diff --git a/src/surf/sg_platf.cpp b/src/kernel/xml/sg_platf.cpp
similarity index 98%
rename from src/surf/sg_platf.cpp
rename to src/kernel/xml/sg_platf.cpp
index 16b81d1bed..6d3b433fd1 100644
--- a/src/surf/sg_platf.cpp
+++ b/src/kernel/xml/sg_platf.cpp
@@ -23,8 +23,8 @@
 #include "src/kernel/resource/DiskImpl.hpp"
 #include "src/kernel/resource/HostImpl.hpp"
 #include "src/kernel/resource/profile/Profile.hpp"
-#include "src/surf/xml/platf.hpp"
-#include "src/surf/xml/platf_private.hpp"
+#include "src/kernel/xml/platf.hpp"
+#include "src/kernel/xml/platf_private.hpp"
 
 #include <algorithm>
 #include <string>
@@ -40,7 +40,7 @@ static simgrid::kernel::routing::ClusterZoneCreationArgs
 
 /** The current NetZone in the parsing */
 static simgrid::kernel::routing::NetZoneImpl* current_routing = nullptr;
-static simgrid::s4u::Host* current_host = nullptr;
+static simgrid::s4u::Host* current_host                       = nullptr;
 
 /** Module management function: frees all internal data structures */
 void sg_platf_parser_finalize()
@@ -233,7 +233,7 @@ static void sg_platf_new_cluster_hierarchical(const simgrid::kernel::routing::Cl
 /** @brief Create regular Cluster */
 static void sg_platf_new_cluster_flat(simgrid::kernel::routing::ClusterCreationArgs* cluster)
 {
-  auto* zone                          = simgrid::s4u::create_star_zone(cluster->id);
+  auto* zone = simgrid::s4u::create_star_zone(cluster->id);
   if (const auto* parent = current_routing ? current_routing->get_iface() : nullptr)
     zone->set_parent(parent);
 
@@ -436,7 +436,7 @@ void sg_platf_new_bypass_route(simgrid::kernel::routing::RouteCreationArgs* rout
 void sg_platf_new_actor(simgrid::kernel::routing::ActorCreationArgs* actor)
 {
   const auto* engine = simgrid::s4u::Engine::get_instance();
-  sg_host_t host = sg_host_by_name(actor->host);
+  sg_host_t host     = sg_host_by_name(actor->host);
   if (not host) {
     // The requested host does not exist. Do a nice message to the user
     std::string msg = std::string("Cannot create actor '") + actor->function + "': host '" + actor->host +
diff --git a/src/surf/xml/simgrid.dtd b/src/kernel/xml/simgrid.dtd
similarity index 100%
rename from src/surf/xml/simgrid.dtd
rename to src/kernel/xml/simgrid.dtd
diff --git a/src/surf/xml/simgrid_dtd.c b/src/kernel/xml/simgrid_dtd.c
similarity index 97%
rename from src/surf/xml/simgrid_dtd.c
rename to src/kernel/xml/simgrid_dtd.c
index 2f4eae137b..5cc34983c9 100644
--- a/src/surf/xml/simgrid_dtd.c
+++ b/src/kernel/xml/simgrid_dtd.c
@@ -599,7 +599,7 @@ void yyfree ( void *  );
 
 /* Begin user sect3 */
 
-#define simgrid_parse_wrap() (/*CONSTCOND*/ 1)
+#define simgrid_parse_wrap() (/*CONSTCOND*/1)
 #define YY_SKIP_YYWRAP
 typedef flex_uint8_t YY_CHAR;
 
@@ -5367,7 +5367,7 @@ int yy_flex_debug = 0;
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *yytext;
-/* Validating XML processor for src/surf/xml/simgrid.dtd.
+/* Validating XML processor for src/kernel/xml/simgrid.dtd.
  *
  * This program was generated with the FleXML XML processor generator.
  * FleXML is Copyright (C) 1999-2005 Kristoffer Rose.  All rights reserved.
@@ -7280,28 +7280,10 @@ 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_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;
+   case S_simgrid_parse_AS_13: case S_simgrid_parse_AS_14: case S_simgrid_parse_AS_1: SET(S_simgrid_parse_AS_14); break;
+   case S_simgrid_parse_AS: case S_simgrid_parse_AS_3: 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;
   }
  }
 	YY_BREAK
@@ -7325,28 +7307,10 @@ 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_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;
+   case S_simgrid_parse_AS_13: case S_simgrid_parse_AS_14: case S_simgrid_parse_AS_1: SET(S_simgrid_parse_AS_14); break;
+   case S_simgrid_parse_AS: case S_simgrid_parse_AS_3: 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;
   }
  }
 	YY_BREAK
@@ -7832,36 +7796,11 @@ 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_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_AS_13: case S_simgrid_parse_AS_14: case S_simgrid_parse_AS_1: SET(S_simgrid_parse_AS_14); break;
+   case S_simgrid_parse_AS: case S_simgrid_parse_AS_3: 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
@@ -7885,36 +7824,11 @@ 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_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_AS_13: case S_simgrid_parse_AS_14: case S_simgrid_parse_AS_1: SET(S_simgrid_parse_AS_14); break;
+   case S_simgrid_parse_AS: case S_simgrid_parse_AS_3: 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
@@ -8779,40 +8693,12 @@ 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_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;
+   case S_simgrid_parse_AS_13: case S_simgrid_parse_AS_14: case S_simgrid_parse_AS_1: SET(S_simgrid_parse_AS_14); break;
+   case S_simgrid_parse_AS: case S_simgrid_parse_AS_3: 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;
   }
  }
 	YY_BREAK
@@ -8836,40 +8722,12 @@ 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_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;
+   case S_simgrid_parse_AS_13: case S_simgrid_parse_AS_14: case S_simgrid_parse_AS_1: SET(S_simgrid_parse_AS_14); break;
+   case S_simgrid_parse_AS: case S_simgrid_parse_AS_3: 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;
   }
  }
 	YY_BREAK
@@ -9025,28 +8883,10 @@ 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_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;
+   case S_simgrid_parse_AS_13: case S_simgrid_parse_AS_14: case S_simgrid_parse_AS_1: SET(S_simgrid_parse_AS_14); break;
+   case S_simgrid_parse_AS: case S_simgrid_parse_AS_3: 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;
   }
  }
 	YY_BREAK
@@ -9070,28 +8910,10 @@ 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_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;
+   case S_simgrid_parse_AS_13: case S_simgrid_parse_AS_14: case S_simgrid_parse_AS_1: SET(S_simgrid_parse_AS_14); break;
+   case S_simgrid_parse_AS: case S_simgrid_parse_AS_3: 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;
   }
  }
 	YY_BREAK
@@ -10712,70 +10534,18 @@ 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_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;
+   case S_simgrid_parse_AS_10: case S_simgrid_parse_AS_11: 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: case S_simgrid_parse_AS_1: 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: SET(S_simgrid_parse_AS_16); break;
+   case S_simgrid_parse_AS: case S_simgrid_parse_AS_3: case S_simgrid_parse_AS_5: SET(S_simgrid_parse_AS_6); break;
+   case S_simgrid_parse_AS_4: 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_10: case S_simgrid_parse_zone_11: case S_simgrid_parse_zone_6: case S_simgrid_parse_zone_7: case S_simgrid_parse_zone_9: SET(S_simgrid_parse_zone_11); break;
+   case S_simgrid_parse_zone_13: case S_simgrid_parse_zone_14: SET(S_simgrid_parse_zone_14); break;
+   case S_simgrid_parse_zone: 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_1: case S_simgrid_parse_zone_5: SET(S_simgrid_parse_zone_6); break;
+   case S_simgrid_parse_zone_3: case S_simgrid_parse_zone_4: case S_simgrid_parse_zone_8: SET(S_simgrid_parse_zone_9); break;
   }
  }
 	YY_BREAK
@@ -10801,70 +10571,18 @@ YY_RULE_SETUP
   simgrid_parse_pcdata_ix = popbuffer();
   popbuffer(); /* attribute */
   switch (YY_START) {
-    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;
+   case S_simgrid_parse_AS_10: case S_simgrid_parse_AS_11: 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: case S_simgrid_parse_AS_1: 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: SET(S_simgrid_parse_AS_16); break;
+   case S_simgrid_parse_AS: case S_simgrid_parse_AS_3: case S_simgrid_parse_AS_5: SET(S_simgrid_parse_AS_6); break;
+   case S_simgrid_parse_AS_4: 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_10: case S_simgrid_parse_zone_11: case S_simgrid_parse_zone_6: case S_simgrid_parse_zone_7: case S_simgrid_parse_zone_9: SET(S_simgrid_parse_zone_11); break;
+   case S_simgrid_parse_zone_13: case S_simgrid_parse_zone_14: SET(S_simgrid_parse_zone_14); break;
+   case S_simgrid_parse_zone: 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_1: case S_simgrid_parse_zone_5: SET(S_simgrid_parse_zone_6); break;
+   case S_simgrid_parse_zone_3: case S_simgrid_parse_zone_4: case S_simgrid_parse_zone_8: SET(S_simgrid_parse_zone_9); break;
   }
  }
 	YY_BREAK
@@ -10966,70 +10684,18 @@ 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_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;
+   case S_simgrid_parse_AS_10: case S_simgrid_parse_AS_11: 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: case S_simgrid_parse_AS_1: 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: SET(S_simgrid_parse_AS_16); break;
+   case S_simgrid_parse_AS: case S_simgrid_parse_AS_3: case S_simgrid_parse_AS_5: SET(S_simgrid_parse_AS_6); break;
+   case S_simgrid_parse_AS_4: 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_10: case S_simgrid_parse_zone_11: case S_simgrid_parse_zone_6: case S_simgrid_parse_zone_7: case S_simgrid_parse_zone_9: SET(S_simgrid_parse_zone_11); break;
+   case S_simgrid_parse_zone_13: case S_simgrid_parse_zone_14: SET(S_simgrid_parse_zone_14); break;
+   case S_simgrid_parse_zone: 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_1: case S_simgrid_parse_zone_5: SET(S_simgrid_parse_zone_6); break;
+   case S_simgrid_parse_zone_3: case S_simgrid_parse_zone_4: case S_simgrid_parse_zone_8: SET(S_simgrid_parse_zone_9); break;
   }
  }
 	YY_BREAK
@@ -11053,70 +10719,18 @@ YY_RULE_SETUP
   ETag_simgrid_parse_trace___connect();
   popbuffer(); /* attribute */
   switch (YY_START) {
-    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;
+   case S_simgrid_parse_AS_10: case S_simgrid_parse_AS_11: 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: case S_simgrid_parse_AS_1: 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: SET(S_simgrid_parse_AS_16); break;
+   case S_simgrid_parse_AS: case S_simgrid_parse_AS_3: case S_simgrid_parse_AS_5: SET(S_simgrid_parse_AS_6); break;
+   case S_simgrid_parse_AS_4: 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_10: case S_simgrid_parse_zone_11: case S_simgrid_parse_zone_6: case S_simgrid_parse_zone_7: case S_simgrid_parse_zone_9: SET(S_simgrid_parse_zone_11); break;
+   case S_simgrid_parse_zone_13: case S_simgrid_parse_zone_14: SET(S_simgrid_parse_zone_14); break;
+   case S_simgrid_parse_zone: 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_1: case S_simgrid_parse_zone_5: SET(S_simgrid_parse_zone_6); break;
+   case S_simgrid_parse_zone_3: case S_simgrid_parse_zone_4: case S_simgrid_parse_zone_8: SET(S_simgrid_parse_zone_9); break;
   }
  }
 	YY_BREAK
diff --git a/src/surf/xml/simgrid_dtd.h b/src/kernel/xml/simgrid_dtd.h
similarity index 99%
rename from src/surf/xml/simgrid_dtd.h
rename to src/kernel/xml/simgrid_dtd.h
index dd5f1ea499..87c97e92fe 100644
--- a/src/surf/xml/simgrid_dtd.h
+++ b/src/kernel/xml/simgrid_dtd.h
@@ -1,4 +1,4 @@
-/* XML processor/application API for src/surf/xml/simgrid.dtd.
+/* XML processor/application API for src/kernel/xml/simgrid.dtd.
  *
  * This program was generated with the FleXML XML processor generator.
  * FleXML is Copyright (C) 1999-2005 Kristoffer Rose.  All rights reserved.
diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/kernel/xml/surfxml_parseplatf.cpp
similarity index 98%
rename from src/surf/xml/surfxml_parseplatf.cpp
rename to src/kernel/xml/surfxml_parseplatf.cpp
index bab333f076..c5e7c0359c 100644
--- a/src/surf/xml/surfxml_parseplatf.cpp
+++ b/src/kernel/xml/surfxml_parseplatf.cpp
@@ -7,8 +7,8 @@
 
 #include "src/kernel/resource/CpuImpl.hpp"
 #include "src/kernel/resource/LinkImpl.hpp"
-#include "src/surf/xml/platf.hpp"
-#include "src/surf/xml/platf_private.hpp"
+#include "src/kernel/xml/platf.hpp"
+#include "src/kernel/xml/platf_private.hpp"
 
 #include <vector>
 
diff --git a/src/surf/xml/surfxml_sax_cb.cpp b/src/kernel/xml/surfxml_sax_cb.cpp
similarity index 99%
rename from src/surf/xml/surfxml_sax_cb.cpp
rename to src/kernel/xml/surfxml_sax_cb.cpp
index 019b4922a5..a41490ded5 100644
--- a/src/surf/xml/surfxml_sax_cb.cpp
+++ b/src/kernel/xml/surfxml_sax_cb.cpp
@@ -13,8 +13,8 @@
 #include "src/kernel/resource/LinkImpl.hpp"
 #include "src/kernel/resource/profile/FutureEvtSet.hpp"
 #include "src/kernel/resource/profile/Profile.hpp"
-#include "src/surf/xml/platf.hpp"
-#include "src/surf/xml/platf_private.hpp"
+#include "src/kernel/xml/platf.hpp"
+#include "src/kernel/xml/platf_private.hpp"
 
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
diff --git a/src/smpi/internals/smpi_utils.cpp b/src/smpi/internals/smpi_utils.cpp
index 46249714c6..09688d88f2 100644
--- a/src/smpi/internals/smpi_utils.cpp
+++ b/src/smpi/internals/smpi_utils.cpp
@@ -7,7 +7,7 @@
 
 #include "private.hpp"
 #include "smpi_config.hpp"
-#include "src/surf/xml/platf.hpp"
+#include "src/kernel/xml/platf.hpp"
 #include "xbt/ex.h"
 #include "xbt/file.hpp"
 #include "xbt/log.h"
diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 0fbc70e557..410426e1d4 100644
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -43,10 +43,10 @@ set(EXTRA_DIST
   src/smpi/smpi_main.c
   src/smpi/smpi_replay_main.cpp
   src/surf/surf_interface.hpp
-  src/surf/xml/simgrid.dtd
-  src/surf/xml/simgrid_dtd.c
-  src/surf/xml/simgrid_dtd.h
-  src/surf/xml/surfxml_sax_cb.cpp
+  src/kernel/xml/simgrid.dtd
+  src/kernel/xml/simgrid_dtd.c
+  src/kernel/xml/simgrid_dtd.h
+  src/kernel/xml/surfxml_sax_cb.cpp
 
   src/xbt/automaton/automaton_lexer.yy.c
   src/xbt/automaton/parserPromela.lex
@@ -360,11 +360,11 @@ set(SURF_SRC
 
   src/kernel/timer/Timer.cpp
 
-  src/surf/sg_platf.cpp
-  src/surf/xml/platf.hpp
-  src/surf/xml/platf_private.hpp
-  src/surf/xml/surfxml_parseplatf.cpp
-  src/surf/xml/surfxml_sax_cb.cpp
+  src/kernel/xml/platf.hpp
+  src/kernel/xml/platf_private.hpp
+  src/kernel/xml/sg_platf.cpp
+  src/kernel/xml/surfxml_parseplatf.cpp
+  src/kernel/xml/surfxml_sax_cb.cpp
   )
 if (Eigen3_FOUND)
   set(SURF_SRC
diff --git a/tools/cmake/MaintainerMode.cmake b/tools/cmake/MaintainerMode.cmake
index 810f67f3ac..b31d336099 100644
--- a/tools/cmake/MaintainerMode.cmake
+++ b/tools/cmake/MaintainerMode.cmake
@@ -135,20 +135,20 @@ if(enable_maintainer_mode)
     set(string14 "'\\!^ \\* Generated [0-9/]\\{10\\} [0-9:]\\{8\\}\\.$$!d'")
 
     ADD_CUSTOM_COMMAND(
-      OUTPUT 	${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid_dtd.h
+      OUTPUT 	${CMAKE_HOME_DIRECTORY}/src/kernel/xml/simgrid_dtd.h
                 ${CMAKE_HOME_DIRECTORY}/src/dag/dax_dtd.h
-                ${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid_dtd.c
+                ${CMAKE_HOME_DIRECTORY}/src/kernel/xml/simgrid_dtd.c
                 ${CMAKE_HOME_DIRECTORY}/src/dag/dax_dtd.c
 
-      DEPENDS	${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid.dtd
+      DEPENDS	${CMAKE_HOME_DIRECTORY}/src/kernel/xml/simgrid.dtd
                 ${CMAKE_HOME_DIRECTORY}/src/dag/dax.dtd
 
-      #${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid_dtd.l: ${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid.dtd
-      COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_HOME_DIRECTORY}/src/surf/xml
-      COMMAND ${FLEXML_EXE} --root-tags platform -b 1000000 -P simgrid_parse --sysid=https://simgrid.org/simgrid.dtd -S src/surf/xml/simgrid_dtd.l -L src/surf/xml/simgrid.dtd
-      COMMAND ${PERL_EXE} ${CMAKE_HOME_DIRECTORY}/tools/cmake/scripts/fixup_simgrid_dtd_l.pl < src/surf/xml/simgrid_dtd.l > src/surf/xml/simgrid_dtd.l.tmp
-      COMMAND mv src/surf/xml/simgrid_dtd.l.tmp src/surf/xml/simgrid_dtd.l
-      COMMAND ${CMAKE_COMMAND} -E echo "       Generated src/surf/xml/simgrid_dtd.l"
+      #${CMAKE_HOME_DIRECTORY}/src/kernel/xml/simgrid_dtd.l: ${CMAKE_HOME_DIRECTORY}/src/kernel/xml/simgrid.dtd
+      COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_HOME_DIRECTORY}/src/kernel/xml
+      COMMAND ${FLEXML_EXE} --root-tags platform -b 1000000 -P simgrid_parse --sysid=https://simgrid.org/simgrid.dtd -S src/kernel/xml/simgrid_dtd.l -L src/kernel/xml/simgrid.dtd
+      COMMAND ${PERL_EXE} ${CMAKE_HOME_DIRECTORY}/tools/cmake/scripts/fixup_simgrid_dtd_l.pl < src/kernel/xml/simgrid_dtd.l > src/kernel/xml/simgrid_dtd.l.tmp
+      COMMAND mv src/kernel/xml/simgrid_dtd.l.tmp src/kernel/xml/simgrid_dtd.l
+      COMMAND ${CMAKE_COMMAND} -E echo "       Generated src/kernel/xml/simgrid_dtd.l"
 
       #${CMAKE_HOME_DIRECTORY}/src/dag/dax_dtd.l: ${CMAKE_HOME_DIRECTORY}/src/dag/dax.dtd
       COMMAND ${FLEXML_EXE} -b 1000000 --root-tags adag -P dax_ --sysid=dax.dtd -S src/dag/dax_dtd.l -L src/dag/dax.dtd
@@ -156,15 +156,14 @@ if(enable_maintainer_mode)
       COMMAND ${SED_EXE} -i ${string14} src/dag/dax_dtd.l
       COMMAND ${CMAKE_COMMAND} -E echo "       Generated src/dag/dax_dtd.l"
 
-      #${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid_dtd.h: ${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid.dtd
-      COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/include/surf/simgrid.h
-      COMMAND ${FLEXML_EXE} --root-tags platform -P simgrid_parse --sysid=https://simgrid.org/simgrid.dtd -H src/surf/xml/simgrid_dtd.h -L src/surf/xml/simgrid.dtd
-      COMMAND ${SED_EXE} -i ${string1} src/surf/xml/simgrid_dtd.h
-      COMMAND ${SED_EXE} -i ${string2} src/surf/xml/simgrid_dtd.h
-      COMMAND ${SED_EXE} -i ${string3} src/surf/xml/simgrid_dtd.h
-      COMMAND ${SED_EXE} -i ${string4} src/surf/xml/simgrid_dtd.h
-      COMMAND ${SED_EXE} -i ${string14} src/surf/xml/simgrid_dtd.h
-      COMMAND ${CMAKE_COMMAND} -E echo "       Generated src/surf/xml/simgrid_dtd.h"
+      #${CMAKE_HOME_DIRECTORY}/src/kernel/xml/simgrid_dtd.h: ${CMAKE_HOME_DIRECTORY}/src/kernel/xml/simgrid.dtd
+      COMMAND ${FLEXML_EXE} --root-tags platform -P simgrid_parse --sysid=https://simgrid.org/simgrid.dtd -H src/kernel/xml/simgrid_dtd.h -L src/kernel/xml/simgrid.dtd
+      COMMAND ${SED_EXE} -i ${string1} src/kernel/xml/simgrid_dtd.h
+      COMMAND ${SED_EXE} -i ${string2} src/kernel/xml/simgrid_dtd.h
+      COMMAND ${SED_EXE} -i ${string3} src/kernel/xml/simgrid_dtd.h
+      COMMAND ${SED_EXE} -i ${string4} src/kernel/xml/simgrid_dtd.h
+      COMMAND ${SED_EXE} -i ${string14} src/kernel/xml/simgrid_dtd.h
+      COMMAND ${CMAKE_COMMAND} -E echo "       Generated src/kernel/xml/simgrid_dtd.h"
 
       #${CMAKE_HOME_DIRECTORY}/src/dag/dax_dtd.h: ${CMAKE_HOME_DIRECTORY}/src/dag/dax.dtd
       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/src/dag/dax_dtd.h
@@ -174,10 +173,10 @@ if(enable_maintainer_mode)
       COMMAND ${SED_EXE} -i ${string14} src/dag/dax_dtd.h
       COMMAND ${CMAKE_COMMAND} -E echo "       Generated src/dag/dax_dtd.h"
 
-      #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 -Psimgrid_parse_ --noline src/surf/xml/simgrid_dtd.l
-      COMMAND ${CMAKE_COMMAND} -E echo "       Generated surf/xml/simgrid_dtd.c"
+      #kernel/xml/simgrid_dtd.c: kernel/xml/simgrid_dtd.l
+      COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/src/kernel/xml/simgrid_dtd.c
+      COMMAND ${FLEX_EXE} -o src/kernel/xml/simgrid_dtd.c -Psimgrid_parse_ --noline src/kernel/xml/simgrid_dtd.l
+      COMMAND ${CMAKE_COMMAND} -E echo "       Generated kernel/xml/simgrid_dtd.c"
 
       #dag/dax_dtd.c: dag/dax_dtd.l
       COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_HOME_DIRECTORY}/src/dag/dax_dtd.c
@@ -206,8 +205,8 @@ if(enable_maintainer_mode)
 endif()
 
     add_custom_target(maintainer_files
-      DEPENDS ${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid_dtd.h
-              ${CMAKE_HOME_DIRECTORY}/src/surf/xml/simgrid_dtd.c
+      DEPENDS ${CMAKE_HOME_DIRECTORY}/src/kernel/xml/simgrid_dtd.h
+              ${CMAKE_HOME_DIRECTORY}/src/kernel/xml/simgrid_dtd.c
               ${CMAKE_HOME_DIRECTORY}/src/dag/dax_dtd.h
               ${CMAKE_HOME_DIRECTORY}/src/dag/dax_dtd.c
       )