fixing lua console (brain dead) damages to the parser

diff --git a/src/bindings/lua/lua_console.c b/src/bindings/lua/lua_console.c
index eeda51d..1e8880f 100644 (file)
--- a/src/bindings/lua/lua_console.c
+++ b/src/bindings/lua/lua_console.c
@@ -22,7 +22,7 @@ static xbt_dynar_t as_list_d;
 
 static void create_AS(const char *id, const char *mode)
 {
 
 static void create_AS(const char *id, const char *mode)
 {

-  surf_AS_new(id, mode);
+  routing_AS_init(id, mode);

 }
 
 /**
 }
 
 /**


@@ -732,7 +732,7 @@ static int surf_parse_bypass_platform()
          }
 
          // Finalize AS
          }
 
          // Finalize AS

-         surf_AS_finalize(p_as->id);
+         routing_AS_end(p_as->id);

   }
 
   // add traces
   }
 
   // add traces


@@ -789,7 +789,7 @@ static int surf_wsL07_parse_bypass_platform()
              }
          /* </AS> */
          // Finalize AS
              }
          /* </AS> */
          // Finalize AS

-         surf_AS_finalize(p_as->id);
+         routing_AS_end(p_as->id);

   }
   // add traces
   surf_wsL07_add_traces();
   }
   // add traces
   surf_wsL07_add_traces();

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index 062d9ea..7f48885 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -809,8 +809,6 @@ XBT_PUBLIC(void) routing_store_route(void);
  * interface between surf and lua bindings
  * see surfxml_parse.c
  */
  * interface between surf and lua bindings
  * see surfxml_parse.c
  */

-XBT_PUBLIC(void) surf_AS_new(const char *id, const char *mode);
-XBT_PUBLIC(void) surf_AS_finalize(const char *id);

 XBT_PUBLIC(void) surf_route_add_host(const char *id);
 XBT_PUBLIC(void) surf_routing_add_route(const char *src_id,
                                         const char *dest_id,
 XBT_PUBLIC(void) surf_route_add_host(const char *id);
 XBT_PUBLIC(void) surf_routing_add_route(const char *src_id,
                                         const char *dest_id,

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 4db9fcc..c4f4a50 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -764,21 +764,6 @@ void* surf_wsL07_link_create_resource(char *name,
                            properties);
 }
 
                            properties);
 }
 

-/**
- *
- *init new routing model component
- */
-
-void surf_AS_new(const char *AS_id, const char *AS_mode)
-{
-  routing_AS_init(AS_id, AS_mode);
-}
-
-void surf_AS_finalize(const char *AS_id)
-{
-  routing_AS_end(AS_id);
-}
-

 /*
  * add host to the network element list
  */
 /*
  * add host to the network element list
  */