handle flexer errors within the parsing module

[simgrid.git] / src / surf / xml / surfxml_parseplatf.cpp

diff --git a/src/surf/xml/surfxml_parseplatf.cpp b/src/surf/xml/surfxml_parseplatf.cpp
index 739247a..88029c7 100644 (file)
--- a/src/surf/xml/surfxml_parseplatf.cpp
+++ b/src/surf/xml/surfxml_parseplatf.cpp
@@ -92,42 +92,36 @@ void parse_platform_file(const std::string& file)
 
   // Use XML parser
 
-  int parse_status;
-
   /* init the flex parser */
   surf_parse_open(file);
 
   /* Do the actual parsing */
-  parse_status = surf_parse();
+  surf_parse();
 
   /* connect all profiles relative to hosts */
   for (auto const& elm : trace_connect_list_host_avail) {
     xbt_assert(traces_set_list.find(elm.first) != traces_set_list.end(), "Trace %s undefined", elm.first.c_str());
     simgrid::kernel::profile::Profile* profile = traces_set_list.at(elm.first);
 
-    simgrid::s4u::Host* host = sg_host_by_name(elm.second.c_str());
+    simgrid::s4u::Host* host = simgrid::s4u::Host::by_name_or_null(elm.second);
     xbt_assert(host, "Host %s undefined", elm.second.c_str());
-    simgrid::surf::Cpu* cpu = host->pimpl_cpu;
-
-    cpu->set_state_profile(profile);
+    host->set_state_profile(profile);
   }
 
   for (auto const& elm : trace_connect_list_host_speed) {
     xbt_assert(traces_set_list.find(elm.first) != traces_set_list.end(), "Trace %s undefined", elm.first.c_str());
     simgrid::kernel::profile::Profile* profile = traces_set_list.at(elm.first);
 
-    simgrid::s4u::Host* host = sg_host_by_name(elm.second.c_str());
+    simgrid::s4u::Host* host = simgrid::s4u::Host::by_name_or_null(elm.second);
     xbt_assert(host, "Host %s undefined", elm.second.c_str());
-    simgrid::surf::Cpu* cpu = host->pimpl_cpu;
-
-    cpu->set_speed_profile(profile);
+    host->set_speed_profile(profile);
   }
 
   for (auto const& elm : trace_connect_list_link_avail) {
     xbt_assert(traces_set_list.find(elm.first) != traces_set_list.end(), "Trace %s undefined", elm.first.c_str());
     simgrid::kernel::profile::Profile* profile = traces_set_list.at(elm.first);
 
-    sg_link_t link = simgrid::s4u::Link::by_name(elm.second.c_str());
+    sg_link_t link = simgrid::s4u::Link::by_name(elm.second);
     xbt_assert(link, "Link %s undefined", elm.second.c_str());
     link->set_state_profile(profile);
   }
@@ -135,7 +129,7 @@ void parse_platform_file(const std::string& file)
   for (auto const& elm : trace_connect_list_link_bw) {
     xbt_assert(traces_set_list.find(elm.first) != traces_set_list.end(), "Trace %s undefined", elm.first.c_str());
     simgrid::kernel::profile::Profile* profile = traces_set_list.at(elm.first);
-    sg_link_t link     = simgrid::s4u::Link::by_name(elm.second.c_str());
+    sg_link_t link                             = simgrid::s4u::Link::by_name(elm.second);
     xbt_assert(link, "Link %s undefined", elm.second.c_str());
     link->set_bandwidth_profile(profile);
   }
@@ -143,13 +137,10 @@ void parse_platform_file(const std::string& file)
   for (auto const& elm : trace_connect_list_link_lat) {
     xbt_assert(traces_set_list.find(elm.first) != traces_set_list.end(), "Trace %s undefined", elm.first.c_str());
     simgrid::kernel::profile::Profile* profile = traces_set_list.at(elm.first);
-    sg_link_t link     = simgrid::s4u::Link::by_name(elm.second.c_str());
+    sg_link_t link                             = simgrid::s4u::Link::by_name(elm.second);
     xbt_assert(link, "Link %s undefined", elm.second.c_str());
     link->set_latency_profile(profile);
   }
 
   surf_parse_close();
-
-  if (parse_status)
-    surf_parse_error(std::string("Parse error in ") + file);
 }