From 49ff21af7ad741979c51a383ae87546ccf4176a9 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 18 Feb 2013 12:25:07 +0100 Subject: [PATCH] Change regexp to correctly handle types like "short int". --- buildtools/Cmake/MaintainerMode.cmake | 2 +- include/surf/simgrid_dtd.h | 554 +++++++++++++------------- include/xbt/graphxml.h | 66 +-- src/simdag/dax_dtd.h | 126 +++--- 4 files changed, 374 insertions(+), 374 deletions(-) diff --git a/buildtools/Cmake/MaintainerMode.cmake b/buildtools/Cmake/MaintainerMode.cmake index 5544b42349..d5fdcad836 100644 --- a/buildtools/Cmake/MaintainerMode.cmake +++ b/buildtools/Cmake/MaintainerMode.cmake @@ -87,7 +87,7 @@ if(enable_maintainer_mode AND NOT WIN32) ENDIF() - set(string1 "'s/extern *\\([^ ]*[ \\*]*\\)/XBT_PUBLIC_DATA(\\1) /'") + set(string1 "'s/extern *\\([^(]*\\)\\( \\|\\( \\*\\)\\)/XBT_PUBLIC_DATA(\\1\\3) /'") set(string2 "'s/XBT_PUBLIC_DATA(\\([^)]*\\)) *\\([^(]*\\)(/XBT_PUBLIC(\\1) \\2(/'") set(string5 "'s/SET(DOCTYPE)/SET(ROOT_dax__adag)/'") set(string8 "'s/#if defined(_WIN32)/#if defined(_XBT_WIN32)/g'") diff --git a/include/surf/simgrid_dtd.h b/include/surf/simgrid_dtd.h index c9c5b906e9..00bea13a5a 100644 --- a/include/surf/simgrid_dtd.h +++ b/include/surf/simgrid_dtd.h @@ -48,62 +48,62 @@ #define _FLEXML_simgrid_H /* XML application entry points. */ -XBT_PUBLIC(void ) STag_surfxml_platform(void); -XBT_PUBLIC(void ) ETag_surfxml_platform(void); -XBT_PUBLIC(void ) STag_surfxml_include(void); -XBT_PUBLIC(void ) ETag_surfxml_include(void); -XBT_PUBLIC(void ) STag_surfxml_trace(void); -XBT_PUBLIC(void ) ETag_surfxml_trace(void); -XBT_PUBLIC(void ) STag_surfxml_random(void); -XBT_PUBLIC(void ) ETag_surfxml_random(void); -XBT_PUBLIC(void ) STag_surfxml_trace___connect(void); -XBT_PUBLIC(void ) ETag_surfxml_trace___connect(void); -XBT_PUBLIC(void ) STag_surfxml_AS(void); -XBT_PUBLIC(void ) ETag_surfxml_AS(void); -XBT_PUBLIC(void ) STag_surfxml_storage___type(void); -XBT_PUBLIC(void ) ETag_surfxml_storage___type(void); -XBT_PUBLIC(void ) STag_surfxml_storage(void); -XBT_PUBLIC(void ) ETag_surfxml_storage(void); -XBT_PUBLIC(void ) STag_surfxml_mount(void); -XBT_PUBLIC(void ) ETag_surfxml_mount(void); -XBT_PUBLIC(void ) STag_surfxml_mstorage(void); -XBT_PUBLIC(void ) ETag_surfxml_mstorage(void); -XBT_PUBLIC(void ) STag_surfxml_host(void); -XBT_PUBLIC(void ) ETag_surfxml_host(void); -XBT_PUBLIC(void ) STag_surfxml_gpu(void); -XBT_PUBLIC(void ) ETag_surfxml_gpu(void); -XBT_PUBLIC(void ) STag_surfxml_host___link(void); -XBT_PUBLIC(void ) ETag_surfxml_host___link(void); -XBT_PUBLIC(void ) STag_surfxml_cluster(void); -XBT_PUBLIC(void ) ETag_surfxml_cluster(void); -XBT_PUBLIC(void ) STag_surfxml_cabinet(void); -XBT_PUBLIC(void ) ETag_surfxml_cabinet(void); -XBT_PUBLIC(void ) STag_surfxml_peer(void); -XBT_PUBLIC(void ) ETag_surfxml_peer(void); -XBT_PUBLIC(void ) STag_surfxml_router(void); -XBT_PUBLIC(void ) ETag_surfxml_router(void); -XBT_PUBLIC(void ) STag_surfxml_backbone(void); -XBT_PUBLIC(void ) ETag_surfxml_backbone(void); -XBT_PUBLIC(void ) STag_surfxml_link(void); -XBT_PUBLIC(void ) ETag_surfxml_link(void); -XBT_PUBLIC(void ) STag_surfxml_route(void); -XBT_PUBLIC(void ) ETag_surfxml_route(void); -XBT_PUBLIC(void ) STag_surfxml_ASroute(void); -XBT_PUBLIC(void ) ETag_surfxml_ASroute(void); -XBT_PUBLIC(void ) STag_surfxml_link___ctn(void); -XBT_PUBLIC(void ) ETag_surfxml_link___ctn(void); -XBT_PUBLIC(void ) STag_surfxml_bypassRoute(void); -XBT_PUBLIC(void ) ETag_surfxml_bypassRoute(void); -XBT_PUBLIC(void ) STag_surfxml_bypassASroute(void); -XBT_PUBLIC(void ) ETag_surfxml_bypassASroute(void); -XBT_PUBLIC(void ) STag_surfxml_process(void); -XBT_PUBLIC(void ) ETag_surfxml_process(void); -XBT_PUBLIC(void ) STag_surfxml_argument(void); -XBT_PUBLIC(void ) ETag_surfxml_argument(void); -XBT_PUBLIC(void ) STag_surfxml_config(void); -XBT_PUBLIC(void ) ETag_surfxml_config(void); -XBT_PUBLIC(void ) STag_surfxml_prop(void); -XBT_PUBLIC(void ) ETag_surfxml_prop(void); +XBT_PUBLIC(void) STag_surfxml_platform(void); +XBT_PUBLIC(void) ETag_surfxml_platform(void); +XBT_PUBLIC(void) STag_surfxml_include(void); +XBT_PUBLIC(void) ETag_surfxml_include(void); +XBT_PUBLIC(void) STag_surfxml_trace(void); +XBT_PUBLIC(void) ETag_surfxml_trace(void); +XBT_PUBLIC(void) STag_surfxml_random(void); +XBT_PUBLIC(void) ETag_surfxml_random(void); +XBT_PUBLIC(void) STag_surfxml_trace___connect(void); +XBT_PUBLIC(void) ETag_surfxml_trace___connect(void); +XBT_PUBLIC(void) STag_surfxml_AS(void); +XBT_PUBLIC(void) ETag_surfxml_AS(void); +XBT_PUBLIC(void) STag_surfxml_storage___type(void); +XBT_PUBLIC(void) ETag_surfxml_storage___type(void); +XBT_PUBLIC(void) STag_surfxml_storage(void); +XBT_PUBLIC(void) ETag_surfxml_storage(void); +XBT_PUBLIC(void) STag_surfxml_mount(void); +XBT_PUBLIC(void) ETag_surfxml_mount(void); +XBT_PUBLIC(void) STag_surfxml_mstorage(void); +XBT_PUBLIC(void) ETag_surfxml_mstorage(void); +XBT_PUBLIC(void) STag_surfxml_host(void); +XBT_PUBLIC(void) ETag_surfxml_host(void); +XBT_PUBLIC(void) STag_surfxml_gpu(void); +XBT_PUBLIC(void) ETag_surfxml_gpu(void); +XBT_PUBLIC(void) STag_surfxml_host___link(void); +XBT_PUBLIC(void) ETag_surfxml_host___link(void); +XBT_PUBLIC(void) STag_surfxml_cluster(void); +XBT_PUBLIC(void) ETag_surfxml_cluster(void); +XBT_PUBLIC(void) STag_surfxml_cabinet(void); +XBT_PUBLIC(void) ETag_surfxml_cabinet(void); +XBT_PUBLIC(void) STag_surfxml_peer(void); +XBT_PUBLIC(void) ETag_surfxml_peer(void); +XBT_PUBLIC(void) STag_surfxml_router(void); +XBT_PUBLIC(void) ETag_surfxml_router(void); +XBT_PUBLIC(void) STag_surfxml_backbone(void); +XBT_PUBLIC(void) ETag_surfxml_backbone(void); +XBT_PUBLIC(void) STag_surfxml_link(void); +XBT_PUBLIC(void) ETag_surfxml_link(void); +XBT_PUBLIC(void) STag_surfxml_route(void); +XBT_PUBLIC(void) ETag_surfxml_route(void); +XBT_PUBLIC(void) STag_surfxml_ASroute(void); +XBT_PUBLIC(void) ETag_surfxml_ASroute(void); +XBT_PUBLIC(void) STag_surfxml_link___ctn(void); +XBT_PUBLIC(void) ETag_surfxml_link___ctn(void); +XBT_PUBLIC(void) STag_surfxml_bypassRoute(void); +XBT_PUBLIC(void) ETag_surfxml_bypassRoute(void); +XBT_PUBLIC(void) STag_surfxml_bypassASroute(void); +XBT_PUBLIC(void) ETag_surfxml_bypassASroute(void); +XBT_PUBLIC(void) STag_surfxml_process(void); +XBT_PUBLIC(void) ETag_surfxml_process(void); +XBT_PUBLIC(void) STag_surfxml_argument(void); +XBT_PUBLIC(void) ETag_surfxml_argument(void); +XBT_PUBLIC(void) STag_surfxml_config(void); +XBT_PUBLIC(void) ETag_surfxml_config(void); +XBT_PUBLIC(void) STag_surfxml_prop(void); +XBT_PUBLIC(void) ETag_surfxml_prop(void); /* XML application data. */ typedef int AT_surfxml_mount_name; @@ -314,342 +314,342 @@ typedef int AT_surfxml_platform_version; #define AU_surfxml_platform_version NULL /* FleXML-provided data. */ -XBT_PUBLIC_DATA(int ) surfxml_pcdata_ix; +XBT_PUBLIC_DATA(int) surfxml_pcdata_ix; XBT_PUBLIC_DATA(char *) surfxml_bufferstack; #define surfxml_pcdata (surfxml_bufferstack + surfxml_pcdata_ix) -XBT_PUBLIC_DATA(AT_surfxml_mount_name ) AX_surfxml_mount_name; +XBT_PUBLIC_DATA(AT_surfxml_mount_name) AX_surfxml_mount_name; #define A_surfxml_mount_name (surfxml_bufferstack + AX_surfxml_mount_name) -XBT_PUBLIC_DATA(short ) int surfxml_mount_name_isset; -XBT_PUBLIC_DATA(AT_surfxml_random_generator ) AX_surfxml_random_generator; +XBT_PUBLIC_DATA(short int) surfxml_mount_name_isset; +XBT_PUBLIC_DATA(AT_surfxml_random_generator) AX_surfxml_random_generator; #define A_surfxml_random_generator AX_surfxml_random_generator -XBT_PUBLIC_DATA(short ) int surfxml_random_generator_isset; -XBT_PUBLIC_DATA(AT_surfxml_ASroute_gw___dst ) AX_surfxml_ASroute_gw___dst; +XBT_PUBLIC_DATA(short int) surfxml_random_generator_isset; +XBT_PUBLIC_DATA(AT_surfxml_ASroute_gw___dst) AX_surfxml_ASroute_gw___dst; #define A_surfxml_ASroute_gw___dst (surfxml_bufferstack + AX_surfxml_ASroute_gw___dst) -XBT_PUBLIC_DATA(short ) int surfxml_ASroute_gw___dst_isset; -XBT_PUBLIC_DATA(AT_surfxml_trace___connect_element ) AX_surfxml_trace___connect_element; +XBT_PUBLIC_DATA(short int) surfxml_ASroute_gw___dst_isset; +XBT_PUBLIC_DATA(AT_surfxml_trace___connect_element) AX_surfxml_trace___connect_element; #define A_surfxml_trace___connect_element (surfxml_bufferstack + AX_surfxml_trace___connect_element) -XBT_PUBLIC_DATA(short ) int surfxml_trace___connect_element_isset; -XBT_PUBLIC_DATA(AT_surfxml_prop_id ) AX_surfxml_prop_id; +XBT_PUBLIC_DATA(short int) surfxml_trace___connect_element_isset; +XBT_PUBLIC_DATA(AT_surfxml_prop_id) AX_surfxml_prop_id; #define A_surfxml_prop_id (surfxml_bufferstack + AX_surfxml_prop_id) -XBT_PUBLIC_DATA(short ) int surfxml_prop_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_host___link_up ) AX_surfxml_host___link_up; +XBT_PUBLIC_DATA(short int) surfxml_prop_id_isset; +XBT_PUBLIC_DATA(AT_surfxml_host___link_up) AX_surfxml_host___link_up; #define A_surfxml_host___link_up (surfxml_bufferstack + AX_surfxml_host___link_up) -XBT_PUBLIC_DATA(short ) int surfxml_host___link_up_isset; -XBT_PUBLIC_DATA(AT_surfxml_host_id ) AX_surfxml_host_id; +XBT_PUBLIC_DATA(short int) surfxml_host___link_up_isset; +XBT_PUBLIC_DATA(AT_surfxml_host_id) AX_surfxml_host_id; #define A_surfxml_host_id (surfxml_bufferstack + AX_surfxml_host_id) -XBT_PUBLIC_DATA(short ) int surfxml_host_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_ASroute_symmetrical ) AX_surfxml_ASroute_symmetrical; +XBT_PUBLIC_DATA(short int) surfxml_host_id_isset; +XBT_PUBLIC_DATA(AT_surfxml_ASroute_symmetrical) AX_surfxml_ASroute_symmetrical; #define A_surfxml_ASroute_symmetrical AX_surfxml_ASroute_symmetrical -XBT_PUBLIC_DATA(short ) int surfxml_ASroute_symmetrical_isset; -XBT_PUBLIC_DATA(AT_surfxml_peer_lat ) AX_surfxml_peer_lat; +XBT_PUBLIC_DATA(short int) surfxml_ASroute_symmetrical_isset; +XBT_PUBLIC_DATA(AT_surfxml_peer_lat) AX_surfxml_peer_lat; #define A_surfxml_peer_lat (surfxml_bufferstack + AX_surfxml_peer_lat) -XBT_PUBLIC_DATA(short ) int surfxml_peer_lat_isset; -XBT_PUBLIC_DATA(AT_surfxml_process_on___failure ) AX_surfxml_process_on___failure; +XBT_PUBLIC_DATA(short int) surfxml_peer_lat_isset; +XBT_PUBLIC_DATA(AT_surfxml_process_on___failure) AX_surfxml_process_on___failure; #define A_surfxml_process_on___failure AX_surfxml_process_on___failure -XBT_PUBLIC_DATA(short ) int surfxml_process_on___failure_isset; -XBT_PUBLIC_DATA(AT_surfxml_link_latency___file ) AX_surfxml_link_latency___file; +XBT_PUBLIC_DATA(short int) surfxml_process_on___failure_isset; +XBT_PUBLIC_DATA(AT_surfxml_link_latency___file) AX_surfxml_link_latency___file; #define A_surfxml_link_latency___file (surfxml_bufferstack + AX_surfxml_link_latency___file) -XBT_PUBLIC_DATA(short ) int surfxml_link_latency___file_isset; -XBT_PUBLIC_DATA(AT_surfxml_peer_availability___file ) AX_surfxml_peer_availability___file; +XBT_PUBLIC_DATA(short int) surfxml_link_latency___file_isset; +XBT_PUBLIC_DATA(AT_surfxml_peer_availability___file) AX_surfxml_peer_availability___file; #define A_surfxml_peer_availability___file (surfxml_bufferstack + AX_surfxml_peer_availability___file) -XBT_PUBLIC_DATA(short ) int surfxml_peer_availability___file_isset; -XBT_PUBLIC_DATA(AT_surfxml_link___ctn_direction ) AX_surfxml_link___ctn_direction; +XBT_PUBLIC_DATA(short int) surfxml_peer_availability___file_isset; +XBT_PUBLIC_DATA(AT_surfxml_link___ctn_direction) AX_surfxml_link___ctn_direction; #define A_surfxml_link___ctn_direction AX_surfxml_link___ctn_direction -XBT_PUBLIC_DATA(short ) int surfxml_link___ctn_direction_isset; -XBT_PUBLIC_DATA(AT_surfxml_host_state ) AX_surfxml_host_state; +XBT_PUBLIC_DATA(short int) surfxml_link___ctn_direction_isset; +XBT_PUBLIC_DATA(AT_surfxml_host_state) AX_surfxml_host_state; #define A_surfxml_host_state AX_surfxml_host_state -XBT_PUBLIC_DATA(short ) int surfxml_host_state_isset; -XBT_PUBLIC_DATA(AT_surfxml_AS_id ) AX_surfxml_AS_id; +XBT_PUBLIC_DATA(short int) surfxml_host_state_isset; +XBT_PUBLIC_DATA(AT_surfxml_AS_id) AX_surfxml_AS_id; #define A_surfxml_AS_id (surfxml_bufferstack + AX_surfxml_AS_id) -XBT_PUBLIC_DATA(short ) int surfxml_AS_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_host_power ) AX_surfxml_host_power; +XBT_PUBLIC_DATA(short int) surfxml_AS_id_isset; +XBT_PUBLIC_DATA(AT_surfxml_host_power) AX_surfxml_host_power; #define A_surfxml_host_power (surfxml_bufferstack + AX_surfxml_host_power) -XBT_PUBLIC_DATA(short ) int surfxml_host_power_isset; -XBT_PUBLIC_DATA(AT_surfxml_cabinet_suffix ) AX_surfxml_cabinet_suffix; +XBT_PUBLIC_DATA(short int) surfxml_host_power_isset; +XBT_PUBLIC_DATA(AT_surfxml_cabinet_suffix) AX_surfxml_cabinet_suffix; #define A_surfxml_cabinet_suffix (surfxml_bufferstack + AX_surfxml_cabinet_suffix) -XBT_PUBLIC_DATA(short ) int surfxml_cabinet_suffix_isset; -XBT_PUBLIC_DATA(AT_surfxml_gpu_name ) AX_surfxml_gpu_name; +XBT_PUBLIC_DATA(short int) surfxml_cabinet_suffix_isset; +XBT_PUBLIC_DATA(AT_surfxml_gpu_name) AX_surfxml_gpu_name; #define A_surfxml_gpu_name (surfxml_bufferstack + AX_surfxml_gpu_name) -XBT_PUBLIC_DATA(short ) int surfxml_gpu_name_isset; -XBT_PUBLIC_DATA(AT_surfxml_router_id ) AX_surfxml_router_id; +XBT_PUBLIC_DATA(short int) surfxml_gpu_name_isset; +XBT_PUBLIC_DATA(AT_surfxml_router_id) AX_surfxml_router_id; #define A_surfxml_router_id (surfxml_bufferstack + AX_surfxml_router_id) -XBT_PUBLIC_DATA(short ) int surfxml_router_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_storage___type_id ) AX_surfxml_storage___type_id; +XBT_PUBLIC_DATA(short int) surfxml_router_id_isset; +XBT_PUBLIC_DATA(AT_surfxml_storage___type_id) AX_surfxml_storage___type_id; #define A_surfxml_storage___type_id (surfxml_bufferstack + AX_surfxml_storage___type_id) -XBT_PUBLIC_DATA(short ) int surfxml_storage___type_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_process_start___time ) AX_surfxml_process_start___time; +XBT_PUBLIC_DATA(short int) surfxml_storage___type_id_isset; +XBT_PUBLIC_DATA(AT_surfxml_process_start___time) AX_surfxml_process_start___time; #define A_surfxml_process_start___time (surfxml_bufferstack + AX_surfxml_process_start___time) -XBT_PUBLIC_DATA(short ) int surfxml_process_start___time_isset; -XBT_PUBLIC_DATA(AT_surfxml_cabinet_bw ) AX_surfxml_cabinet_bw; +XBT_PUBLIC_DATA(short int) surfxml_process_start___time_isset; +XBT_PUBLIC_DATA(AT_surfxml_cabinet_bw) AX_surfxml_cabinet_bw; #define A_surfxml_cabinet_bw (surfxml_bufferstack + AX_surfxml_cabinet_bw) -XBT_PUBLIC_DATA(short ) int surfxml_cabinet_bw_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_suffix ) AX_surfxml_cluster_suffix; +XBT_PUBLIC_DATA(short int) surfxml_cabinet_bw_isset; +XBT_PUBLIC_DATA(AT_surfxml_cluster_suffix) AX_surfxml_cluster_suffix; #define A_surfxml_cluster_suffix (surfxml_bufferstack + AX_surfxml_cluster_suffix) -XBT_PUBLIC_DATA(short ) int surfxml_cluster_suffix_isset; -XBT_PUBLIC_DATA(AT_surfxml_bypassASroute_dst ) AX_surfxml_bypassASroute_dst; +XBT_PUBLIC_DATA(short int) surfxml_cluster_suffix_isset; +XBT_PUBLIC_DATA(AT_surfxml_bypassASroute_dst) AX_surfxml_bypassASroute_dst; #define A_surfxml_bypassASroute_dst (surfxml_bufferstack + AX_surfxml_bypassASroute_dst) -XBT_PUBLIC_DATA(short ) int surfxml_bypassASroute_dst_isset; -XBT_PUBLIC_DATA(AT_surfxml_host___link_id ) AX_surfxml_host___link_id; +XBT_PUBLIC_DATA(short int) surfxml_bypassASroute_dst_isset; +XBT_PUBLIC_DATA(AT_surfxml_host___link_id) AX_surfxml_host___link_id; #define A_surfxml_host___link_id (surfxml_bufferstack + AX_surfxml_host___link_id) -XBT_PUBLIC_DATA(short ) int surfxml_host___link_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_ASroute_src ) AX_surfxml_ASroute_src; +XBT_PUBLIC_DATA(short int) surfxml_host___link_id_isset; +XBT_PUBLIC_DATA(AT_surfxml_ASroute_src) AX_surfxml_ASroute_src; #define A_surfxml_ASroute_src (surfxml_bufferstack + AX_surfxml_ASroute_src) -XBT_PUBLIC_DATA(short ) int surfxml_ASroute_src_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_prefix ) AX_surfxml_cluster_prefix; +XBT_PUBLIC_DATA(short int) surfxml_ASroute_src_isset; +XBT_PUBLIC_DATA(AT_surfxml_cluster_prefix) AX_surfxml_cluster_prefix; #define A_surfxml_cluster_prefix (surfxml_bufferstack + AX_surfxml_cluster_prefix) -XBT_PUBLIC_DATA(short ) int surfxml_cluster_prefix_isset; -XBT_PUBLIC_DATA(AT_surfxml_cabinet_prefix ) AX_surfxml_cabinet_prefix; +XBT_PUBLIC_DATA(short int) surfxml_cluster_prefix_isset; +XBT_PUBLIC_DATA(AT_surfxml_cabinet_prefix) AX_surfxml_cabinet_prefix; #define A_surfxml_cabinet_prefix (surfxml_bufferstack + AX_surfxml_cabinet_prefix) -XBT_PUBLIC_DATA(short ) int surfxml_cabinet_prefix_isset; -XBT_PUBLIC_DATA(AT_surfxml_trace_file ) AX_surfxml_trace_file; +XBT_PUBLIC_DATA(short int) surfxml_cabinet_prefix_isset; +XBT_PUBLIC_DATA(AT_surfxml_trace_file) AX_surfxml_trace_file; #define A_surfxml_trace_file (surfxml_bufferstack + AX_surfxml_trace_file) -XBT_PUBLIC_DATA(short ) int surfxml_trace_file_isset; -XBT_PUBLIC_DATA(AT_surfxml_link_sharing___policy ) AX_surfxml_link_sharing___policy; +XBT_PUBLIC_DATA(short int) surfxml_trace_file_isset; +XBT_PUBLIC_DATA(AT_surfxml_link_sharing___policy) AX_surfxml_link_sharing___policy; #define A_surfxml_link_sharing___policy AX_surfxml_link_sharing___policy -XBT_PUBLIC_DATA(short ) int surfxml_link_sharing___policy_isset; -XBT_PUBLIC_DATA(AT_surfxml_storage_typeId ) AX_surfxml_storage_typeId; +XBT_PUBLIC_DATA(short int) surfxml_link_sharing___policy_isset; +XBT_PUBLIC_DATA(AT_surfxml_storage_typeId) AX_surfxml_storage_typeId; #define A_surfxml_storage_typeId (surfxml_bufferstack + AX_surfxml_storage_typeId) -XBT_PUBLIC_DATA(short ) int surfxml_storage_typeId_isset; -XBT_PUBLIC_DATA(AT_surfxml_random_min ) AX_surfxml_random_min; +XBT_PUBLIC_DATA(short int) surfxml_storage_typeId_isset; +XBT_PUBLIC_DATA(AT_surfxml_random_min) AX_surfxml_random_min; #define A_surfxml_random_min (surfxml_bufferstack + AX_surfxml_random_min) -XBT_PUBLIC_DATA(short ) int surfxml_random_min_isset; -XBT_PUBLIC_DATA(AT_surfxml_link___ctn_id ) AX_surfxml_link___ctn_id; +XBT_PUBLIC_DATA(short int) surfxml_random_min_isset; +XBT_PUBLIC_DATA(AT_surfxml_link___ctn_id) AX_surfxml_link___ctn_id; #define A_surfxml_link___ctn_id (surfxml_bufferstack + AX_surfxml_link___ctn_id) -XBT_PUBLIC_DATA(short ) int surfxml_link___ctn_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_peer_bw___out ) AX_surfxml_peer_bw___out; +XBT_PUBLIC_DATA(short int) surfxml_link___ctn_id_isset; +XBT_PUBLIC_DATA(AT_surfxml_peer_bw___out) AX_surfxml_peer_bw___out; #define A_surfxml_peer_bw___out (surfxml_bufferstack + AX_surfxml_peer_bw___out) -XBT_PUBLIC_DATA(short ) int surfxml_peer_bw___out_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_availability___file ) AX_surfxml_cluster_availability___file; +XBT_PUBLIC_DATA(short int) surfxml_peer_bw___out_isset; +XBT_PUBLIC_DATA(AT_surfxml_cluster_availability___file) AX_surfxml_cluster_availability___file; #define A_surfxml_cluster_availability___file (surfxml_bufferstack + AX_surfxml_cluster_availability___file) -XBT_PUBLIC_DATA(short ) int surfxml_cluster_availability___file_isset; -XBT_PUBLIC_DATA(AT_surfxml_storage_content ) AX_surfxml_storage_content; +XBT_PUBLIC_DATA(short int) surfxml_cluster_availability___file_isset; +XBT_PUBLIC_DATA(AT_surfxml_storage_content) AX_surfxml_storage_content; #define A_surfxml_storage_content (surfxml_bufferstack + AX_surfxml_storage_content) -XBT_PUBLIC_DATA(short ) int surfxml_storage_content_isset; -XBT_PUBLIC_DATA(AT_surfxml_process_kill___time ) AX_surfxml_process_kill___time; +XBT_PUBLIC_DATA(short int) surfxml_storage_content_isset; +XBT_PUBLIC_DATA(AT_surfxml_process_kill___time) AX_surfxml_process_kill___time; #define A_surfxml_process_kill___time (surfxml_bufferstack + AX_surfxml_process_kill___time) -XBT_PUBLIC_DATA(short ) int surfxml_process_kill___time_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_bb___bw ) AX_surfxml_cluster_bb___bw; +XBT_PUBLIC_DATA(short int) surfxml_process_kill___time_isset; +XBT_PUBLIC_DATA(AT_surfxml_cluster_bb___bw) AX_surfxml_cluster_bb___bw; #define A_surfxml_cluster_bb___bw (surfxml_bufferstack + AX_surfxml_cluster_bb___bw) -XBT_PUBLIC_DATA(short ) int surfxml_cluster_bb___bw_isset; -XBT_PUBLIC_DATA(AT_surfxml_argument_value ) AX_surfxml_argument_value; +XBT_PUBLIC_DATA(short int) surfxml_cluster_bb___bw_isset; +XBT_PUBLIC_DATA(AT_surfxml_argument_value) AX_surfxml_argument_value; #define A_surfxml_argument_value (surfxml_bufferstack + AX_surfxml_argument_value) -XBT_PUBLIC_DATA(short ) int surfxml_argument_value_isset; -XBT_PUBLIC_DATA(AT_surfxml_link_state ) AX_surfxml_link_state; +XBT_PUBLIC_DATA(short int) surfxml_argument_value_isset; +XBT_PUBLIC_DATA(AT_surfxml_link_state) AX_surfxml_link_state; #define A_surfxml_link_state AX_surfxml_link_state -XBT_PUBLIC_DATA(short ) int surfxml_link_state_isset; -XBT_PUBLIC_DATA(AT_surfxml_ASroute_gw___src ) AX_surfxml_ASroute_gw___src; +XBT_PUBLIC_DATA(short int) surfxml_link_state_isset; +XBT_PUBLIC_DATA(AT_surfxml_ASroute_gw___src) AX_surfxml_ASroute_gw___src; #define A_surfxml_ASroute_gw___src (surfxml_bufferstack + AX_surfxml_ASroute_gw___src) -XBT_PUBLIC_DATA(short ) int surfxml_ASroute_gw___src_isset; -XBT_PUBLIC_DATA(AT_surfxml_AS_routing ) AX_surfxml_AS_routing; +XBT_PUBLIC_DATA(short int) surfxml_ASroute_gw___src_isset; +XBT_PUBLIC_DATA(AT_surfxml_AS_routing) AX_surfxml_AS_routing; #define A_surfxml_AS_routing AX_surfxml_AS_routing -XBT_PUBLIC_DATA(short ) int surfxml_AS_routing_isset; -XBT_PUBLIC_DATA(AT_surfxml_link_bandwidth ) AX_surfxml_link_bandwidth; +XBT_PUBLIC_DATA(short int) surfxml_AS_routing_isset; +XBT_PUBLIC_DATA(AT_surfxml_link_bandwidth) AX_surfxml_link_bandwidth; #define A_surfxml_link_bandwidth (surfxml_bufferstack + AX_surfxml_link_bandwidth) -XBT_PUBLIC_DATA(short ) int surfxml_link_bandwidth_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_id ) AX_surfxml_cluster_id; +XBT_PUBLIC_DATA(short int) surfxml_link_bandwidth_isset; +XBT_PUBLIC_DATA(AT_surfxml_cluster_id) AX_surfxml_cluster_id; #define A_surfxml_cluster_id (surfxml_bufferstack + AX_surfxml_cluster_id) -XBT_PUBLIC_DATA(short ) int surfxml_cluster_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_peer_bw___in ) AX_surfxml_peer_bw___in; +XBT_PUBLIC_DATA(short int) surfxml_cluster_id_isset; +XBT_PUBLIC_DATA(AT_surfxml_peer_bw___in) AX_surfxml_peer_bw___in; #define A_surfxml_peer_bw___in (surfxml_bufferstack + AX_surfxml_peer_bw___in) -XBT_PUBLIC_DATA(short ) int surfxml_peer_bw___in_isset; -XBT_PUBLIC_DATA(AT_surfxml_random_mean ) AX_surfxml_random_mean; +XBT_PUBLIC_DATA(short int) surfxml_peer_bw___in_isset; +XBT_PUBLIC_DATA(AT_surfxml_random_mean) AX_surfxml_random_mean; #define A_surfxml_random_mean (surfxml_bufferstack + AX_surfxml_random_mean) -XBT_PUBLIC_DATA(short ) int surfxml_random_mean_isset; -XBT_PUBLIC_DATA(AT_surfxml_storage___type_size ) AX_surfxml_storage___type_size; +XBT_PUBLIC_DATA(short int) surfxml_random_mean_isset; +XBT_PUBLIC_DATA(AT_surfxml_storage___type_size) AX_surfxml_storage___type_size; #define A_surfxml_storage___type_size (surfxml_bufferstack + AX_surfxml_storage___type_size) -XBT_PUBLIC_DATA(short ) int surfxml_storage___type_size_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_bb___lat ) AX_surfxml_cluster_bb___lat; +XBT_PUBLIC_DATA(short int) surfxml_storage___type_size_isset; +XBT_PUBLIC_DATA(AT_surfxml_cluster_bb___lat) AX_surfxml_cluster_bb___lat; #define A_surfxml_cluster_bb___lat (surfxml_bufferstack + AX_surfxml_cluster_bb___lat) -XBT_PUBLIC_DATA(short ) int surfxml_cluster_bb___lat_isset; -XBT_PUBLIC_DATA(AT_surfxml_link_latency ) AX_surfxml_link_latency; +XBT_PUBLIC_DATA(short int) surfxml_cluster_bb___lat_isset; +XBT_PUBLIC_DATA(AT_surfxml_link_latency) AX_surfxml_link_latency; #define A_surfxml_link_latency (surfxml_bufferstack + AX_surfxml_link_latency) -XBT_PUBLIC_DATA(short ) int surfxml_link_latency_isset; -XBT_PUBLIC_DATA(AT_surfxml_backbone_bandwidth ) AX_surfxml_backbone_bandwidth; +XBT_PUBLIC_DATA(short int) surfxml_link_latency_isset; +XBT_PUBLIC_DATA(AT_surfxml_backbone_bandwidth) AX_surfxml_backbone_bandwidth; #define A_surfxml_backbone_bandwidth (surfxml_bufferstack + AX_surfxml_backbone_bandwidth) -XBT_PUBLIC_DATA(short ) int surfxml_backbone_bandwidth_isset; -XBT_PUBLIC_DATA(AT_surfxml_backbone_id ) AX_surfxml_backbone_id; +XBT_PUBLIC_DATA(short int) surfxml_backbone_bandwidth_isset; +XBT_PUBLIC_DATA(AT_surfxml_backbone_id) AX_surfxml_backbone_id; #define A_surfxml_backbone_id (surfxml_bufferstack + AX_surfxml_backbone_id) -XBT_PUBLIC_DATA(short ) int surfxml_backbone_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_trace___connect_kind ) AX_surfxml_trace___connect_kind; +XBT_PUBLIC_DATA(short int) surfxml_backbone_id_isset; +XBT_PUBLIC_DATA(AT_surfxml_trace___connect_kind) AX_surfxml_trace___connect_kind; #define A_surfxml_trace___connect_kind AX_surfxml_trace___connect_kind -XBT_PUBLIC_DATA(short ) int surfxml_trace___connect_kind_isset; -XBT_PUBLIC_DATA(AT_surfxml_cabinet_lat ) AX_surfxml_cabinet_lat; +XBT_PUBLIC_DATA(short int) surfxml_trace___connect_kind_isset; +XBT_PUBLIC_DATA(AT_surfxml_cabinet_lat) AX_surfxml_cabinet_lat; #define A_surfxml_cabinet_lat (surfxml_bufferstack + AX_surfxml_cabinet_lat) -XBT_PUBLIC_DATA(short ) int surfxml_cabinet_lat_isset; -XBT_PUBLIC_DATA(AT_surfxml_random_seed ) AX_surfxml_random_seed; +XBT_PUBLIC_DATA(short int) surfxml_cabinet_lat_isset; +XBT_PUBLIC_DATA(AT_surfxml_random_seed) AX_surfxml_random_seed; #define A_surfxml_random_seed (surfxml_bufferstack + AX_surfxml_random_seed) -XBT_PUBLIC_DATA(short ) int surfxml_random_seed_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_state___file ) AX_surfxml_cluster_state___file; +XBT_PUBLIC_DATA(short int) surfxml_random_seed_isset; +XBT_PUBLIC_DATA(AT_surfxml_cluster_state___file) AX_surfxml_cluster_state___file; #define A_surfxml_cluster_state___file (surfxml_bufferstack + AX_surfxml_cluster_state___file) -XBT_PUBLIC_DATA(short ) int surfxml_cluster_state___file_isset; -XBT_PUBLIC_DATA(AT_surfxml_link_bandwidth___file ) AX_surfxml_link_bandwidth___file; +XBT_PUBLIC_DATA(short int) surfxml_cluster_state___file_isset; +XBT_PUBLIC_DATA(AT_surfxml_link_bandwidth___file) AX_surfxml_link_bandwidth___file; #define A_surfxml_link_bandwidth___file (surfxml_bufferstack + AX_surfxml_link_bandwidth___file) -XBT_PUBLIC_DATA(short ) int surfxml_link_bandwidth___file_isset; -XBT_PUBLIC_DATA(AT_surfxml_storage___type_content ) AX_surfxml_storage___type_content; +XBT_PUBLIC_DATA(short int) surfxml_link_bandwidth___file_isset; +XBT_PUBLIC_DATA(AT_surfxml_storage___type_content) AX_surfxml_storage___type_content; #define A_surfxml_storage___type_content (surfxml_bufferstack + AX_surfxml_storage___type_content) -XBT_PUBLIC_DATA(short ) int surfxml_storage___type_content_isset; -XBT_PUBLIC_DATA(AT_surfxml_route_symmetrical ) AX_surfxml_route_symmetrical; +XBT_PUBLIC_DATA(short int) surfxml_storage___type_content_isset; +XBT_PUBLIC_DATA(AT_surfxml_route_symmetrical) AX_surfxml_route_symmetrical; #define A_surfxml_route_symmetrical AX_surfxml_route_symmetrical -XBT_PUBLIC_DATA(short ) int surfxml_route_symmetrical_isset; -XBT_PUBLIC_DATA(AT_surfxml_random_id ) AX_surfxml_random_id; +XBT_PUBLIC_DATA(short int) surfxml_route_symmetrical_isset; +XBT_PUBLIC_DATA(AT_surfxml_random_id) AX_surfxml_random_id; #define A_surfxml_random_id (surfxml_bufferstack + AX_surfxml_random_id) -XBT_PUBLIC_DATA(short ) int surfxml_random_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_mstorage_name ) AX_surfxml_mstorage_name; +XBT_PUBLIC_DATA(short int) surfxml_random_id_isset; +XBT_PUBLIC_DATA(AT_surfxml_mstorage_name) AX_surfxml_mstorage_name; #define A_surfxml_mstorage_name (surfxml_bufferstack + AX_surfxml_mstorage_name) -XBT_PUBLIC_DATA(short ) int surfxml_mstorage_name_isset; -XBT_PUBLIC_DATA(AT_surfxml_random_max ) AX_surfxml_random_max; +XBT_PUBLIC_DATA(short int) surfxml_mstorage_name_isset; +XBT_PUBLIC_DATA(AT_surfxml_random_max) AX_surfxml_random_max; #define A_surfxml_random_max (surfxml_bufferstack + AX_surfxml_random_max) -XBT_PUBLIC_DATA(short ) int surfxml_random_max_isset; -XBT_PUBLIC_DATA(AT_surfxml_link_id ) AX_surfxml_link_id; +XBT_PUBLIC_DATA(short int) surfxml_random_max_isset; +XBT_PUBLIC_DATA(AT_surfxml_link_id) AX_surfxml_link_id; #define A_surfxml_link_id (surfxml_bufferstack + AX_surfxml_link_id) -XBT_PUBLIC_DATA(short ) int surfxml_link_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_process_host ) AX_surfxml_process_host; +XBT_PUBLIC_DATA(short int) surfxml_link_id_isset; +XBT_PUBLIC_DATA(AT_surfxml_process_host) AX_surfxml_process_host; #define A_surfxml_process_host (surfxml_bufferstack + AX_surfxml_process_host) -XBT_PUBLIC_DATA(short ) int surfxml_process_host_isset; -XBT_PUBLIC_DATA(AT_surfxml_cabinet_id ) AX_surfxml_cabinet_id; +XBT_PUBLIC_DATA(short int) surfxml_process_host_isset; +XBT_PUBLIC_DATA(AT_surfxml_cabinet_id) AX_surfxml_cabinet_id; #define A_surfxml_cabinet_id (surfxml_bufferstack + AX_surfxml_cabinet_id) -XBT_PUBLIC_DATA(short ) int surfxml_cabinet_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_host_availability___file ) AX_surfxml_host_availability___file; +XBT_PUBLIC_DATA(short int) surfxml_cabinet_id_isset; +XBT_PUBLIC_DATA(AT_surfxml_host_availability___file) AX_surfxml_host_availability___file; #define A_surfxml_host_availability___file (surfxml_bufferstack + AX_surfxml_host_availability___file) -XBT_PUBLIC_DATA(short ) int surfxml_host_availability___file_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_lat ) AX_surfxml_cluster_lat; +XBT_PUBLIC_DATA(short int) surfxml_host_availability___file_isset; +XBT_PUBLIC_DATA(AT_surfxml_cluster_lat) AX_surfxml_cluster_lat; #define A_surfxml_cluster_lat (surfxml_bufferstack + AX_surfxml_cluster_lat) -XBT_PUBLIC_DATA(short ) int surfxml_cluster_lat_isset; -XBT_PUBLIC_DATA(AT_surfxml_router_coordinates ) AX_surfxml_router_coordinates; +XBT_PUBLIC_DATA(short int) surfxml_cluster_lat_isset; +XBT_PUBLIC_DATA(AT_surfxml_router_coordinates) AX_surfxml_router_coordinates; #define A_surfxml_router_coordinates (surfxml_bufferstack + AX_surfxml_router_coordinates) -XBT_PUBLIC_DATA(short ) int surfxml_router_coordinates_isset; -XBT_PUBLIC_DATA(AT_surfxml_trace_periodicity ) AX_surfxml_trace_periodicity; +XBT_PUBLIC_DATA(short int) surfxml_router_coordinates_isset; +XBT_PUBLIC_DATA(AT_surfxml_trace_periodicity) AX_surfxml_trace_periodicity; #define A_surfxml_trace_periodicity (surfxml_bufferstack + AX_surfxml_trace_periodicity) -XBT_PUBLIC_DATA(short ) int surfxml_trace_periodicity_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_bb___sharing___policy ) AX_surfxml_cluster_bb___sharing___policy; +XBT_PUBLIC_DATA(short int) surfxml_trace_periodicity_isset; +XBT_PUBLIC_DATA(AT_surfxml_cluster_bb___sharing___policy) AX_surfxml_cluster_bb___sharing___policy; #define A_surfxml_cluster_bb___sharing___policy AX_surfxml_cluster_bb___sharing___policy -XBT_PUBLIC_DATA(short ) int surfxml_cluster_bb___sharing___policy_isset; -XBT_PUBLIC_DATA(AT_surfxml_peer_state___file ) AX_surfxml_peer_state___file; +XBT_PUBLIC_DATA(short int) surfxml_cluster_bb___sharing___policy_isset; +XBT_PUBLIC_DATA(AT_surfxml_peer_state___file) AX_surfxml_peer_state___file; #define A_surfxml_peer_state___file (surfxml_bufferstack + AX_surfxml_peer_state___file) -XBT_PUBLIC_DATA(short ) int surfxml_peer_state___file_isset; -XBT_PUBLIC_DATA(AT_surfxml_peer_coordinates ) AX_surfxml_peer_coordinates; +XBT_PUBLIC_DATA(short int) surfxml_peer_state___file_isset; +XBT_PUBLIC_DATA(AT_surfxml_peer_coordinates) AX_surfxml_peer_coordinates; #define A_surfxml_peer_coordinates (surfxml_bufferstack + AX_surfxml_peer_coordinates) -XBT_PUBLIC_DATA(short ) int surfxml_peer_coordinates_isset; -XBT_PUBLIC_DATA(AT_surfxml_bypassASroute_src ) AX_surfxml_bypassASroute_src; +XBT_PUBLIC_DATA(short int) surfxml_peer_coordinates_isset; +XBT_PUBLIC_DATA(AT_surfxml_bypassASroute_src) AX_surfxml_bypassASroute_src; #define A_surfxml_bypassASroute_src (surfxml_bufferstack + AX_surfxml_bypassASroute_src) -XBT_PUBLIC_DATA(short ) int surfxml_bypassASroute_src_isset; -XBT_PUBLIC_DATA(AT_surfxml_prop_value ) AX_surfxml_prop_value; +XBT_PUBLIC_DATA(short int) surfxml_bypassASroute_src_isset; +XBT_PUBLIC_DATA(AT_surfxml_prop_value) AX_surfxml_prop_value; #define A_surfxml_prop_value (surfxml_bufferstack + AX_surfxml_prop_value) -XBT_PUBLIC_DATA(short ) int surfxml_prop_value_isset; -XBT_PUBLIC_DATA(AT_surfxml_mstorage_typeId ) AX_surfxml_mstorage_typeId; +XBT_PUBLIC_DATA(short int) surfxml_prop_value_isset; +XBT_PUBLIC_DATA(AT_surfxml_mstorage_typeId) AX_surfxml_mstorage_typeId; #define A_surfxml_mstorage_typeId (surfxml_bufferstack + AX_surfxml_mstorage_typeId) -XBT_PUBLIC_DATA(short ) int surfxml_mstorage_typeId_isset; -XBT_PUBLIC_DATA(AT_surfxml_ASroute_dst ) AX_surfxml_ASroute_dst; +XBT_PUBLIC_DATA(short int) surfxml_mstorage_typeId_isset; +XBT_PUBLIC_DATA(AT_surfxml_ASroute_dst) AX_surfxml_ASroute_dst; #define A_surfxml_ASroute_dst (surfxml_bufferstack + AX_surfxml_ASroute_dst) -XBT_PUBLIC_DATA(short ) int surfxml_ASroute_dst_isset; -XBT_PUBLIC_DATA(AT_surfxml_link_state___file ) AX_surfxml_link_state___file; +XBT_PUBLIC_DATA(short int) surfxml_ASroute_dst_isset; +XBT_PUBLIC_DATA(AT_surfxml_link_state___file) AX_surfxml_link_state___file; #define A_surfxml_link_state___file (surfxml_bufferstack + AX_surfxml_link_state___file) -XBT_PUBLIC_DATA(short ) int surfxml_link_state___file_isset; -XBT_PUBLIC_DATA(AT_surfxml_random_radical ) AX_surfxml_random_radical; +XBT_PUBLIC_DATA(short int) surfxml_link_state___file_isset; +XBT_PUBLIC_DATA(AT_surfxml_random_radical) AX_surfxml_random_radical; #define A_surfxml_random_radical (surfxml_bufferstack + AX_surfxml_random_radical) -XBT_PUBLIC_DATA(short ) int surfxml_random_radical_isset; -XBT_PUBLIC_DATA(AT_surfxml_bypassASroute_gw___src ) AX_surfxml_bypassASroute_gw___src; +XBT_PUBLIC_DATA(short int) surfxml_random_radical_isset; +XBT_PUBLIC_DATA(AT_surfxml_bypassASroute_gw___src) AX_surfxml_bypassASroute_gw___src; #define A_surfxml_bypassASroute_gw___src (surfxml_bufferstack + AX_surfxml_bypassASroute_gw___src) -XBT_PUBLIC_DATA(short ) int surfxml_bypassASroute_gw___src_isset; -XBT_PUBLIC_DATA(AT_surfxml_trace___connect_trace ) AX_surfxml_trace___connect_trace; +XBT_PUBLIC_DATA(short int) surfxml_bypassASroute_gw___src_isset; +XBT_PUBLIC_DATA(AT_surfxml_trace___connect_trace) AX_surfxml_trace___connect_trace; #define A_surfxml_trace___connect_trace (surfxml_bufferstack + AX_surfxml_trace___connect_trace) -XBT_PUBLIC_DATA(short ) int surfxml_trace___connect_trace_isset; -XBT_PUBLIC_DATA(AT_surfxml_mount_id ) AX_surfxml_mount_id; +XBT_PUBLIC_DATA(short int) surfxml_trace___connect_trace_isset; +XBT_PUBLIC_DATA(AT_surfxml_mount_id) AX_surfxml_mount_id; #define A_surfxml_mount_id (surfxml_bufferstack + AX_surfxml_mount_id) -XBT_PUBLIC_DATA(short ) int surfxml_mount_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_power ) AX_surfxml_cluster_power; +XBT_PUBLIC_DATA(short int) surfxml_mount_id_isset; +XBT_PUBLIC_DATA(AT_surfxml_cluster_power) AX_surfxml_cluster_power; #define A_surfxml_cluster_power (surfxml_bufferstack + AX_surfxml_cluster_power) -XBT_PUBLIC_DATA(short ) int surfxml_cluster_power_isset; -XBT_PUBLIC_DATA(AT_surfxml_process_function ) AX_surfxml_process_function; +XBT_PUBLIC_DATA(short int) surfxml_cluster_power_isset; +XBT_PUBLIC_DATA(AT_surfxml_process_function) AX_surfxml_process_function; #define A_surfxml_process_function (surfxml_bufferstack + AX_surfxml_process_function) -XBT_PUBLIC_DATA(short ) int surfxml_process_function_isset; -XBT_PUBLIC_DATA(AT_surfxml_peer_id ) AX_surfxml_peer_id; +XBT_PUBLIC_DATA(short int) surfxml_process_function_isset; +XBT_PUBLIC_DATA(AT_surfxml_peer_id) AX_surfxml_peer_id; #define A_surfxml_peer_id (surfxml_bufferstack + AX_surfxml_peer_id) -XBT_PUBLIC_DATA(short ) int surfxml_peer_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_router___id ) AX_surfxml_cluster_router___id; +XBT_PUBLIC_DATA(short int) surfxml_peer_id_isset; +XBT_PUBLIC_DATA(AT_surfxml_cluster_router___id) AX_surfxml_cluster_router___id; #define A_surfxml_cluster_router___id (surfxml_bufferstack + AX_surfxml_cluster_router___id) -XBT_PUBLIC_DATA(short ) int surfxml_cluster_router___id_isset; -XBT_PUBLIC_DATA(AT_surfxml_cabinet_radical ) AX_surfxml_cabinet_radical; +XBT_PUBLIC_DATA(short int) surfxml_cluster_router___id_isset; +XBT_PUBLIC_DATA(AT_surfxml_cabinet_radical) AX_surfxml_cabinet_radical; #define A_surfxml_cabinet_radical (surfxml_bufferstack + AX_surfxml_cabinet_radical) -XBT_PUBLIC_DATA(short ) int surfxml_cabinet_radical_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_sharing___policy ) AX_surfxml_cluster_sharing___policy; +XBT_PUBLIC_DATA(short int) surfxml_cabinet_radical_isset; +XBT_PUBLIC_DATA(AT_surfxml_cluster_sharing___policy) AX_surfxml_cluster_sharing___policy; #define A_surfxml_cluster_sharing___policy AX_surfxml_cluster_sharing___policy -XBT_PUBLIC_DATA(short ) int surfxml_cluster_sharing___policy_isset; -XBT_PUBLIC_DATA(AT_surfxml_bypassRoute_dst ) AX_surfxml_bypassRoute_dst; +XBT_PUBLIC_DATA(short int) surfxml_cluster_sharing___policy_isset; +XBT_PUBLIC_DATA(AT_surfxml_bypassRoute_dst) AX_surfxml_bypassRoute_dst; #define A_surfxml_bypassRoute_dst (surfxml_bufferstack + AX_surfxml_bypassRoute_dst) -XBT_PUBLIC_DATA(short ) int surfxml_bypassRoute_dst_isset; -XBT_PUBLIC_DATA(AT_surfxml_cabinet_power ) AX_surfxml_cabinet_power; +XBT_PUBLIC_DATA(short int) surfxml_bypassRoute_dst_isset; +XBT_PUBLIC_DATA(AT_surfxml_cabinet_power) AX_surfxml_cabinet_power; #define A_surfxml_cabinet_power (surfxml_bufferstack + AX_surfxml_cabinet_power) -XBT_PUBLIC_DATA(short ) int surfxml_cabinet_power_isset; -XBT_PUBLIC_DATA(AT_surfxml_host_core ) AX_surfxml_host_core; +XBT_PUBLIC_DATA(short int) surfxml_cabinet_power_isset; +XBT_PUBLIC_DATA(AT_surfxml_host_core) AX_surfxml_host_core; #define A_surfxml_host_core (surfxml_bufferstack + AX_surfxml_host_core) -XBT_PUBLIC_DATA(short ) int surfxml_host_core_isset; -XBT_PUBLIC_DATA(AT_surfxml_storage___type_model ) AX_surfxml_storage___type_model; +XBT_PUBLIC_DATA(short int) surfxml_host_core_isset; +XBT_PUBLIC_DATA(AT_surfxml_storage___type_model) AX_surfxml_storage___type_model; #define A_surfxml_storage___type_model (surfxml_bufferstack + AX_surfxml_storage___type_model) -XBT_PUBLIC_DATA(short ) int surfxml_storage___type_model_isset; -XBT_PUBLIC_DATA(AT_surfxml_host_availability ) AX_surfxml_host_availability; +XBT_PUBLIC_DATA(short int) surfxml_storage___type_model_isset; +XBT_PUBLIC_DATA(AT_surfxml_host_availability) AX_surfxml_host_availability; #define A_surfxml_host_availability (surfxml_bufferstack + AX_surfxml_host_availability) -XBT_PUBLIC_DATA(short ) int surfxml_host_availability_isset; -XBT_PUBLIC_DATA(AT_surfxml_bypassRoute_src ) AX_surfxml_bypassRoute_src; +XBT_PUBLIC_DATA(short int) surfxml_host_availability_isset; +XBT_PUBLIC_DATA(AT_surfxml_bypassRoute_src) AX_surfxml_bypassRoute_src; #define A_surfxml_bypassRoute_src (surfxml_bufferstack + AX_surfxml_bypassRoute_src) -XBT_PUBLIC_DATA(short ) int surfxml_bypassRoute_src_isset; -XBT_PUBLIC_DATA(AT_surfxml_backbone_latency ) AX_surfxml_backbone_latency; +XBT_PUBLIC_DATA(short int) surfxml_bypassRoute_src_isset; +XBT_PUBLIC_DATA(AT_surfxml_backbone_latency) AX_surfxml_backbone_latency; #define A_surfxml_backbone_latency (surfxml_bufferstack + AX_surfxml_backbone_latency) -XBT_PUBLIC_DATA(short ) int surfxml_backbone_latency_isset; -XBT_PUBLIC_DATA(AT_surfxml_route_src ) AX_surfxml_route_src; +XBT_PUBLIC_DATA(short int) surfxml_backbone_latency_isset; +XBT_PUBLIC_DATA(AT_surfxml_route_src) AX_surfxml_route_src; #define A_surfxml_route_src (surfxml_bufferstack + AX_surfxml_route_src) -XBT_PUBLIC_DATA(short ) int surfxml_route_src_isset; -XBT_PUBLIC_DATA(AT_surfxml_storage_id ) AX_surfxml_storage_id; +XBT_PUBLIC_DATA(short int) surfxml_route_src_isset; +XBT_PUBLIC_DATA(AT_surfxml_storage_id) AX_surfxml_storage_id; #define A_surfxml_storage_id (surfxml_bufferstack + AX_surfxml_storage_id) -XBT_PUBLIC_DATA(short ) int surfxml_storage_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_host_coordinates ) AX_surfxml_host_coordinates; +XBT_PUBLIC_DATA(short int) surfxml_storage_id_isset; +XBT_PUBLIC_DATA(AT_surfxml_host_coordinates) AX_surfxml_host_coordinates; #define A_surfxml_host_coordinates (surfxml_bufferstack + AX_surfxml_host_coordinates) -XBT_PUBLIC_DATA(short ) int surfxml_host_coordinates_isset; -XBT_PUBLIC_DATA(AT_surfxml_trace_id ) AX_surfxml_trace_id; +XBT_PUBLIC_DATA(short int) surfxml_host_coordinates_isset; +XBT_PUBLIC_DATA(AT_surfxml_trace_id) AX_surfxml_trace_id; #define A_surfxml_trace_id (surfxml_bufferstack + AX_surfxml_trace_id) -XBT_PUBLIC_DATA(short ) int surfxml_trace_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_peer_power ) AX_surfxml_peer_power; +XBT_PUBLIC_DATA(short int) surfxml_trace_id_isset; +XBT_PUBLIC_DATA(AT_surfxml_peer_power) AX_surfxml_peer_power; #define A_surfxml_peer_power (surfxml_bufferstack + AX_surfxml_peer_power) -XBT_PUBLIC_DATA(short ) int surfxml_peer_power_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_radical ) AX_surfxml_cluster_radical; +XBT_PUBLIC_DATA(short int) surfxml_peer_power_isset; +XBT_PUBLIC_DATA(AT_surfxml_cluster_radical) AX_surfxml_cluster_radical; #define A_surfxml_cluster_radical (surfxml_bufferstack + AX_surfxml_cluster_radical) -XBT_PUBLIC_DATA(short ) int surfxml_cluster_radical_isset; -XBT_PUBLIC_DATA(AT_surfxml_config_id ) AX_surfxml_config_id; +XBT_PUBLIC_DATA(short int) surfxml_cluster_radical_isset; +XBT_PUBLIC_DATA(AT_surfxml_config_id) AX_surfxml_config_id; #define A_surfxml_config_id (surfxml_bufferstack + AX_surfxml_config_id) -XBT_PUBLIC_DATA(short ) int surfxml_config_id_isset; -XBT_PUBLIC_DATA(AT_surfxml_bypassASroute_gw___dst ) AX_surfxml_bypassASroute_gw___dst; +XBT_PUBLIC_DATA(short int) surfxml_config_id_isset; +XBT_PUBLIC_DATA(AT_surfxml_bypassASroute_gw___dst) AX_surfxml_bypassASroute_gw___dst; #define A_surfxml_bypassASroute_gw___dst (surfxml_bufferstack + AX_surfxml_bypassASroute_gw___dst) -XBT_PUBLIC_DATA(short ) int surfxml_bypassASroute_gw___dst_isset; -XBT_PUBLIC_DATA(AT_surfxml_host___link_down ) AX_surfxml_host___link_down; +XBT_PUBLIC_DATA(short int) surfxml_bypassASroute_gw___dst_isset; +XBT_PUBLIC_DATA(AT_surfxml_host___link_down) AX_surfxml_host___link_down; #define A_surfxml_host___link_down (surfxml_bufferstack + AX_surfxml_host___link_down) -XBT_PUBLIC_DATA(short ) int surfxml_host___link_down_isset; -XBT_PUBLIC_DATA(AT_surfxml_include_file ) AX_surfxml_include_file; +XBT_PUBLIC_DATA(short int) surfxml_host___link_down_isset; +XBT_PUBLIC_DATA(AT_surfxml_include_file) AX_surfxml_include_file; #define A_surfxml_include_file (surfxml_bufferstack + AX_surfxml_include_file) -XBT_PUBLIC_DATA(short ) int surfxml_include_file_isset; -XBT_PUBLIC_DATA(AT_surfxml_random_std___deviation ) AX_surfxml_random_std___deviation; +XBT_PUBLIC_DATA(short int) surfxml_include_file_isset; +XBT_PUBLIC_DATA(AT_surfxml_random_std___deviation) AX_surfxml_random_std___deviation; #define A_surfxml_random_std___deviation (surfxml_bufferstack + AX_surfxml_random_std___deviation) -XBT_PUBLIC_DATA(short ) int surfxml_random_std___deviation_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_core ) AX_surfxml_cluster_core; +XBT_PUBLIC_DATA(short int) surfxml_random_std___deviation_isset; +XBT_PUBLIC_DATA(AT_surfxml_cluster_core) AX_surfxml_cluster_core; #define A_surfxml_cluster_core (surfxml_bufferstack + AX_surfxml_cluster_core) -XBT_PUBLIC_DATA(short ) int surfxml_cluster_core_isset; -XBT_PUBLIC_DATA(AT_surfxml_host_state___file ) AX_surfxml_host_state___file; +XBT_PUBLIC_DATA(short int) surfxml_cluster_core_isset; +XBT_PUBLIC_DATA(AT_surfxml_host_state___file) AX_surfxml_host_state___file; #define A_surfxml_host_state___file (surfxml_bufferstack + AX_surfxml_host_state___file) -XBT_PUBLIC_DATA(short ) int surfxml_host_state___file_isset; -XBT_PUBLIC_DATA(AT_surfxml_route_dst ) AX_surfxml_route_dst; +XBT_PUBLIC_DATA(short int) surfxml_host_state___file_isset; +XBT_PUBLIC_DATA(AT_surfxml_route_dst) AX_surfxml_route_dst; #define A_surfxml_route_dst (surfxml_bufferstack + AX_surfxml_route_dst) -XBT_PUBLIC_DATA(short ) int surfxml_route_dst_isset; -XBT_PUBLIC_DATA(AT_surfxml_cluster_bw ) AX_surfxml_cluster_bw; +XBT_PUBLIC_DATA(short int) surfxml_route_dst_isset; +XBT_PUBLIC_DATA(AT_surfxml_cluster_bw) AX_surfxml_cluster_bw; #define A_surfxml_cluster_bw (surfxml_bufferstack + AX_surfxml_cluster_bw) -XBT_PUBLIC_DATA(short ) int surfxml_cluster_bw_isset; -XBT_PUBLIC_DATA(AT_surfxml_platform_version ) AX_surfxml_platform_version; +XBT_PUBLIC_DATA(short int) surfxml_cluster_bw_isset; +XBT_PUBLIC_DATA(AT_surfxml_platform_version) AX_surfxml_platform_version; #define A_surfxml_platform_version (surfxml_bufferstack + AX_surfxml_platform_version) -XBT_PUBLIC_DATA(short ) int surfxml_platform_version_isset; +XBT_PUBLIC_DATA(short int) surfxml_platform_version_isset; /* XML application utilities. */ -XBT_PUBLIC(int ) surfxml_element_context(int); +XBT_PUBLIC(int) surfxml_element_context(int); /* XML processor entry point. */ -XBT_PUBLIC(int ) yylex(void); +XBT_PUBLIC(int) yylex(void); /* Flexml error handling function (useful only when -q flag passed to flexml) */ const char * surfxml_parse_err_msg(void); diff --git a/include/xbt/graphxml.h b/include/xbt/graphxml.h index 272239c1e8..6c925086b6 100644 --- a/include/xbt/graphxml.h +++ b/include/xbt/graphxml.h @@ -48,12 +48,12 @@ #define _FLEXML_graphxml_H /* XML application entry points. */ -XBT_PUBLIC(void ) STag_graphxml_graph(void); -XBT_PUBLIC(void ) ETag_graphxml_graph(void); -XBT_PUBLIC(void ) STag_graphxml_node(void); -XBT_PUBLIC(void ) ETag_graphxml_node(void); -XBT_PUBLIC(void ) STag_graphxml_edge(void); -XBT_PUBLIC(void ) ETag_graphxml_edge(void); +XBT_PUBLIC(void) STag_graphxml_graph(void); +XBT_PUBLIC(void) ETag_graphxml_graph(void); +XBT_PUBLIC(void) STag_graphxml_node(void); +XBT_PUBLIC(void) ETag_graphxml_node(void); +XBT_PUBLIC(void) STag_graphxml_edge(void); +XBT_PUBLIC(void) ETag_graphxml_edge(void); /* XML application data. */ typedef int AT_graphxml_node_name; @@ -81,51 +81,51 @@ typedef int AT_graphxml_edge_name; #define AU_graphxml_edge_name NULL /* FleXML-provided data. */ -XBT_PUBLIC_DATA(int ) graphxml_pcdata_ix; +XBT_PUBLIC_DATA(int) graphxml_pcdata_ix; XBT_PUBLIC_DATA(char *) graphxml_bufferstack; #define graphxml_pcdata (graphxml_bufferstack + graphxml_pcdata_ix) -XBT_PUBLIC_DATA(AT_graphxml_node_name ) AX_graphxml_node_name; +XBT_PUBLIC_DATA(AT_graphxml_node_name) AX_graphxml_node_name; #define A_graphxml_node_name (graphxml_bufferstack + AX_graphxml_node_name) -XBT_PUBLIC_DATA(short ) int graphxml_node_name_isset; -XBT_PUBLIC_DATA(AT_graphxml_edge_source ) AX_graphxml_edge_source; +XBT_PUBLIC_DATA(short int) graphxml_node_name_isset; +XBT_PUBLIC_DATA(AT_graphxml_edge_source) AX_graphxml_edge_source; #define A_graphxml_edge_source (graphxml_bufferstack + AX_graphxml_edge_source) -XBT_PUBLIC_DATA(short ) int graphxml_edge_source_isset; -XBT_PUBLIC_DATA(AT_graphxml_node_position___y ) AX_graphxml_node_position___y; +XBT_PUBLIC_DATA(short int) graphxml_edge_source_isset; +XBT_PUBLIC_DATA(AT_graphxml_node_position___y) AX_graphxml_node_position___y; #define A_graphxml_node_position___y (graphxml_bufferstack + AX_graphxml_node_position___y) -XBT_PUBLIC_DATA(short ) int graphxml_node_position___y_isset; -XBT_PUBLIC_DATA(AT_graphxml_node_position___x ) AX_graphxml_node_position___x; +XBT_PUBLIC_DATA(short int) graphxml_node_position___y_isset; +XBT_PUBLIC_DATA(AT_graphxml_node_position___x) AX_graphxml_node_position___x; #define A_graphxml_node_position___x (graphxml_bufferstack + AX_graphxml_node_position___x) -XBT_PUBLIC_DATA(short ) int graphxml_node_position___x_isset; -XBT_PUBLIC_DATA(AT_graphxml_edge_data ) AX_graphxml_edge_data; +XBT_PUBLIC_DATA(short int) graphxml_node_position___x_isset; +XBT_PUBLIC_DATA(AT_graphxml_edge_data) AX_graphxml_edge_data; #define A_graphxml_edge_data (graphxml_bufferstack + AX_graphxml_edge_data) -XBT_PUBLIC_DATA(short ) int graphxml_edge_data_isset; -XBT_PUBLIC_DATA(AT_graphxml_edge_target ) AX_graphxml_edge_target; +XBT_PUBLIC_DATA(short int) graphxml_edge_data_isset; +XBT_PUBLIC_DATA(AT_graphxml_edge_target) AX_graphxml_edge_target; #define A_graphxml_edge_target (graphxml_bufferstack + AX_graphxml_edge_target) -XBT_PUBLIC_DATA(short ) int graphxml_edge_target_isset; -XBT_PUBLIC_DATA(AT_graphxml_graph_isDirected ) AX_graphxml_graph_isDirected; +XBT_PUBLIC_DATA(short int) graphxml_edge_target_isset; +XBT_PUBLIC_DATA(AT_graphxml_graph_isDirected) AX_graphxml_graph_isDirected; #define A_graphxml_graph_isDirected AX_graphxml_graph_isDirected -XBT_PUBLIC_DATA(short ) int graphxml_graph_isDirected_isset; -XBT_PUBLIC_DATA(AT_graphxml_node_label ) AX_graphxml_node_label; +XBT_PUBLIC_DATA(short int) graphxml_graph_isDirected_isset; +XBT_PUBLIC_DATA(AT_graphxml_node_label) AX_graphxml_node_label; #define A_graphxml_node_label (graphxml_bufferstack + AX_graphxml_node_label) -XBT_PUBLIC_DATA(short ) int graphxml_node_label_isset; -XBT_PUBLIC_DATA(AT_graphxml_node_data ) AX_graphxml_node_data; +XBT_PUBLIC_DATA(short int) graphxml_node_label_isset; +XBT_PUBLIC_DATA(AT_graphxml_node_data) AX_graphxml_node_data; #define A_graphxml_node_data (graphxml_bufferstack + AX_graphxml_node_data) -XBT_PUBLIC_DATA(short ) int graphxml_node_data_isset; -XBT_PUBLIC_DATA(AT_graphxml_edge_label ) AX_graphxml_edge_label; +XBT_PUBLIC_DATA(short int) graphxml_node_data_isset; +XBT_PUBLIC_DATA(AT_graphxml_edge_label) AX_graphxml_edge_label; #define A_graphxml_edge_label (graphxml_bufferstack + AX_graphxml_edge_label) -XBT_PUBLIC_DATA(short ) int graphxml_edge_label_isset; -XBT_PUBLIC_DATA(AT_graphxml_edge_length ) AX_graphxml_edge_length; +XBT_PUBLIC_DATA(short int) graphxml_edge_label_isset; +XBT_PUBLIC_DATA(AT_graphxml_edge_length) AX_graphxml_edge_length; #define A_graphxml_edge_length (graphxml_bufferstack + AX_graphxml_edge_length) -XBT_PUBLIC_DATA(short ) int graphxml_edge_length_isset; -XBT_PUBLIC_DATA(AT_graphxml_edge_name ) AX_graphxml_edge_name; +XBT_PUBLIC_DATA(short int) graphxml_edge_length_isset; +XBT_PUBLIC_DATA(AT_graphxml_edge_name) AX_graphxml_edge_name; #define A_graphxml_edge_name (graphxml_bufferstack + AX_graphxml_edge_name) -XBT_PUBLIC_DATA(short ) int graphxml_edge_name_isset; +XBT_PUBLIC_DATA(short int) graphxml_edge_name_isset; /* XML application utilities. */ -XBT_PUBLIC(int ) graphxml_element_context(int); +XBT_PUBLIC(int) graphxml_element_context(int); /* XML processor entry point. */ -XBT_PUBLIC(int ) yylex(void); +XBT_PUBLIC(int) yylex(void); /* Flexml error handling function (useful only when -q flag passed to flexml) */ const char * graphxml_parse_err_msg(void); diff --git a/src/simdag/dax_dtd.h b/src/simdag/dax_dtd.h index e7b83a4e0e..e31871dd23 100644 --- a/src/simdag/dax_dtd.h +++ b/src/simdag/dax_dtd.h @@ -48,16 +48,16 @@ #define _FLEXML_dax_H /* XML application entry points. */ -XBT_PUBLIC(void ) STag_dax__adag(void); -XBT_PUBLIC(void ) ETag_dax__adag(void); -XBT_PUBLIC(void ) STag_dax__job(void); -XBT_PUBLIC(void ) ETag_dax__job(void); -XBT_PUBLIC(void ) STag_dax__uses(void); -XBT_PUBLIC(void ) ETag_dax__uses(void); -XBT_PUBLIC(void ) STag_dax__child(void); -XBT_PUBLIC(void ) ETag_dax__child(void); -XBT_PUBLIC(void ) STag_dax__parent(void); -XBT_PUBLIC(void ) ETag_dax__parent(void); +XBT_PUBLIC(void) STag_dax__adag(void); +XBT_PUBLIC(void) ETag_dax__adag(void); +XBT_PUBLIC(void) STag_dax__job(void); +XBT_PUBLIC(void) ETag_dax__job(void); +XBT_PUBLIC(void) STag_dax__uses(void); +XBT_PUBLIC(void) ETag_dax__uses(void); +XBT_PUBLIC(void) STag_dax__child(void); +XBT_PUBLIC(void) ETag_dax__child(void); +XBT_PUBLIC(void) STag_dax__parent(void); +XBT_PUBLIC(void) ETag_dax__parent(void); /* XML application data. */ typedef int AT_dax__adag_version; @@ -108,90 +108,90 @@ typedef int AT_dax__adag_fileCount; #define AU_dax__adag_fileCount NULL /* FleXML-provided data. */ -XBT_PUBLIC_DATA(int ) dax__pcdata_ix; +XBT_PUBLIC_DATA(int) dax__pcdata_ix; XBT_PUBLIC_DATA(char *) dax__bufferstack; #define dax__pcdata (dax__bufferstack + dax__pcdata_ix) -XBT_PUBLIC_DATA(AT_dax__adag_version ) AX_dax__adag_version; +XBT_PUBLIC_DATA(AT_dax__adag_version) AX_dax__adag_version; #define A_dax__adag_version (dax__bufferstack + AX_dax__adag_version) -XBT_PUBLIC_DATA(short ) int dax__adag_version_isset; -XBT_PUBLIC_DATA(AT_dax__uses_type ) AX_dax__uses_type; +XBT_PUBLIC_DATA(short int) dax__adag_version_isset; +XBT_PUBLIC_DATA(AT_dax__uses_type) AX_dax__uses_type; #define A_dax__uses_type (dax__bufferstack + AX_dax__uses_type) -XBT_PUBLIC_DATA(short ) int dax__uses_type_isset; -XBT_PUBLIC_DATA(AT_dax__uses_optional ) AX_dax__uses_optional; +XBT_PUBLIC_DATA(short int) dax__uses_type_isset; +XBT_PUBLIC_DATA(AT_dax__uses_optional) AX_dax__uses_optional; #define A_dax__uses_optional AX_dax__uses_optional -XBT_PUBLIC_DATA(short ) int dax__uses_optional_isset; -XBT_PUBLIC_DATA(AT_dax__adag_name ) AX_dax__adag_name; +XBT_PUBLIC_DATA(short int) dax__uses_optional_isset; +XBT_PUBLIC_DATA(AT_dax__adag_name) AX_dax__adag_name; #define A_dax__adag_name (dax__bufferstack + AX_dax__adag_name) -XBT_PUBLIC_DATA(short ) int dax__adag_name_isset; -XBT_PUBLIC_DATA(AT_dax__child_ref ) AX_dax__child_ref; +XBT_PUBLIC_DATA(short int) dax__adag_name_isset; +XBT_PUBLIC_DATA(AT_dax__child_ref) AX_dax__child_ref; #define A_dax__child_ref (dax__bufferstack + AX_dax__child_ref) -XBT_PUBLIC_DATA(short ) int dax__child_ref_isset; -XBT_PUBLIC_DATA(AT_dax__adag_xmlns ) AX_dax__adag_xmlns; +XBT_PUBLIC_DATA(short int) dax__child_ref_isset; +XBT_PUBLIC_DATA(AT_dax__adag_xmlns) AX_dax__adag_xmlns; #define A_dax__adag_xmlns (dax__bufferstack + AX_dax__adag_xmlns) -XBT_PUBLIC_DATA(short ) int dax__adag_xmlns_isset; -XBT_PUBLIC_DATA(AT_dax__uses_transfer ) AX_dax__uses_transfer; +XBT_PUBLIC_DATA(short int) dax__adag_xmlns_isset; +XBT_PUBLIC_DATA(AT_dax__uses_transfer) AX_dax__uses_transfer; #define A_dax__uses_transfer AX_dax__uses_transfer -XBT_PUBLIC_DATA(short ) int dax__uses_transfer_isset; -XBT_PUBLIC_DATA(AT_dax__job_id ) AX_dax__job_id; +XBT_PUBLIC_DATA(short int) dax__uses_transfer_isset; +XBT_PUBLIC_DATA(AT_dax__job_id) AX_dax__job_id; #define A_dax__job_id (dax__bufferstack + AX_dax__job_id) -XBT_PUBLIC_DATA(short ) int dax__job_id_isset; -XBT_PUBLIC_DATA(AT_dax__uses_file ) AX_dax__uses_file; +XBT_PUBLIC_DATA(short int) dax__job_id_isset; +XBT_PUBLIC_DATA(AT_dax__uses_file) AX_dax__uses_file; #define A_dax__uses_file (dax__bufferstack + AX_dax__uses_file) -XBT_PUBLIC_DATA(short ) int dax__uses_file_isset; -XBT_PUBLIC_DATA(AT_dax__parent_ref ) AX_dax__parent_ref; +XBT_PUBLIC_DATA(short int) dax__uses_file_isset; +XBT_PUBLIC_DATA(AT_dax__parent_ref) AX_dax__parent_ref; #define A_dax__parent_ref (dax__bufferstack + AX_dax__parent_ref) -XBT_PUBLIC_DATA(short ) int dax__parent_ref_isset; -XBT_PUBLIC_DATA(AT_dax__adag_count ) AX_dax__adag_count; +XBT_PUBLIC_DATA(short int) dax__parent_ref_isset; +XBT_PUBLIC_DATA(AT_dax__adag_count) AX_dax__adag_count; #define A_dax__adag_count (dax__bufferstack + AX_dax__adag_count) -XBT_PUBLIC_DATA(short ) int dax__adag_count_isset; -XBT_PUBLIC_DATA(AT_dax__adag_xmlns_c_xsi ) AX_dax__adag_xmlns_c_xsi; +XBT_PUBLIC_DATA(short int) dax__adag_count_isset; +XBT_PUBLIC_DATA(AT_dax__adag_xmlns_c_xsi) AX_dax__adag_xmlns_c_xsi; #define A_dax__adag_xmlns_c_xsi (dax__bufferstack + AX_dax__adag_xmlns_c_xsi) -XBT_PUBLIC_DATA(short ) int dax__adag_xmlns_c_xsi_isset; -XBT_PUBLIC_DATA(AT_dax__adag_index ) AX_dax__adag_index; +XBT_PUBLIC_DATA(short int) dax__adag_xmlns_c_xsi_isset; +XBT_PUBLIC_DATA(AT_dax__adag_index) AX_dax__adag_index; #define A_dax__adag_index (dax__bufferstack + AX_dax__adag_index) -XBT_PUBLIC_DATA(short ) int dax__adag_index_isset; -XBT_PUBLIC_DATA(AT_dax__uses_size ) AX_dax__uses_size; +XBT_PUBLIC_DATA(short int) dax__adag_index_isset; +XBT_PUBLIC_DATA(AT_dax__uses_size) AX_dax__uses_size; #define A_dax__uses_size (dax__bufferstack + AX_dax__uses_size) -XBT_PUBLIC_DATA(short ) int dax__uses_size_isset; -XBT_PUBLIC_DATA(AT_dax__adag_childCount ) AX_dax__adag_childCount; +XBT_PUBLIC_DATA(short int) dax__uses_size_isset; +XBT_PUBLIC_DATA(AT_dax__adag_childCount) AX_dax__adag_childCount; #define A_dax__adag_childCount (dax__bufferstack + AX_dax__adag_childCount) -XBT_PUBLIC_DATA(short ) int dax__adag_childCount_isset; -XBT_PUBLIC_DATA(AT_dax__uses_link ) AX_dax__uses_link; +XBT_PUBLIC_DATA(short int) dax__adag_childCount_isset; +XBT_PUBLIC_DATA(AT_dax__uses_link) AX_dax__uses_link; #define A_dax__uses_link AX_dax__uses_link -XBT_PUBLIC_DATA(short ) int dax__uses_link_isset; -XBT_PUBLIC_DATA(AT_dax__job_runtime ) AX_dax__job_runtime; +XBT_PUBLIC_DATA(short int) dax__uses_link_isset; +XBT_PUBLIC_DATA(AT_dax__job_runtime) AX_dax__job_runtime; #define A_dax__job_runtime (dax__bufferstack + AX_dax__job_runtime) -XBT_PUBLIC_DATA(short ) int dax__job_runtime_isset; -XBT_PUBLIC_DATA(AT_dax__job_level ) AX_dax__job_level; +XBT_PUBLIC_DATA(short int) dax__job_runtime_isset; +XBT_PUBLIC_DATA(AT_dax__job_level) AX_dax__job_level; #define A_dax__job_level (dax__bufferstack + AX_dax__job_level) -XBT_PUBLIC_DATA(short ) int dax__job_level_isset; -XBT_PUBLIC_DATA(AT_dax__job_namespace ) AX_dax__job_namespace; +XBT_PUBLIC_DATA(short int) dax__job_level_isset; +XBT_PUBLIC_DATA(AT_dax__job_namespace) AX_dax__job_namespace; #define A_dax__job_namespace (dax__bufferstack + AX_dax__job_namespace) -XBT_PUBLIC_DATA(short ) int dax__job_namespace_isset; -XBT_PUBLIC_DATA(AT_dax__job_name ) AX_dax__job_name; +XBT_PUBLIC_DATA(short int) dax__job_namespace_isset; +XBT_PUBLIC_DATA(AT_dax__job_name) AX_dax__job_name; #define A_dax__job_name (dax__bufferstack + AX_dax__job_name) -XBT_PUBLIC_DATA(short ) int dax__job_name_isset; -XBT_PUBLIC_DATA(AT_dax__adag_jobCount ) AX_dax__adag_jobCount; +XBT_PUBLIC_DATA(short int) dax__job_name_isset; +XBT_PUBLIC_DATA(AT_dax__adag_jobCount) AX_dax__adag_jobCount; #define A_dax__adag_jobCount (dax__bufferstack + AX_dax__adag_jobCount) -XBT_PUBLIC_DATA(short ) int dax__adag_jobCount_isset; -XBT_PUBLIC_DATA(AT_dax__job_version ) AX_dax__job_version; +XBT_PUBLIC_DATA(short int) dax__adag_jobCount_isset; +XBT_PUBLIC_DATA(AT_dax__job_version) AX_dax__job_version; #define A_dax__job_version (dax__bufferstack + AX_dax__job_version) -XBT_PUBLIC_DATA(short ) int dax__job_version_isset; -XBT_PUBLIC_DATA(AT_dax__adag_xsi_c_schemaLocation ) AX_dax__adag_xsi_c_schemaLocation; +XBT_PUBLIC_DATA(short int) dax__job_version_isset; +XBT_PUBLIC_DATA(AT_dax__adag_xsi_c_schemaLocation) AX_dax__adag_xsi_c_schemaLocation; #define A_dax__adag_xsi_c_schemaLocation (dax__bufferstack + AX_dax__adag_xsi_c_schemaLocation) -XBT_PUBLIC_DATA(short ) int dax__adag_xsi_c_schemaLocation_isset; -XBT_PUBLIC_DATA(AT_dax__uses_register ) AX_dax__uses_register; +XBT_PUBLIC_DATA(short int) dax__adag_xsi_c_schemaLocation_isset; +XBT_PUBLIC_DATA(AT_dax__uses_register) AX_dax__uses_register; #define A_dax__uses_register AX_dax__uses_register -XBT_PUBLIC_DATA(short ) int dax__uses_register_isset; -XBT_PUBLIC_DATA(AT_dax__adag_fileCount ) AX_dax__adag_fileCount; +XBT_PUBLIC_DATA(short int) dax__uses_register_isset; +XBT_PUBLIC_DATA(AT_dax__adag_fileCount) AX_dax__adag_fileCount; #define A_dax__adag_fileCount (dax__bufferstack + AX_dax__adag_fileCount) -XBT_PUBLIC_DATA(short ) int dax__adag_fileCount_isset; +XBT_PUBLIC_DATA(short int) dax__adag_fileCount_isset; /* XML application utilities. */ -XBT_PUBLIC(int ) dax__element_context(int); +XBT_PUBLIC(int) dax__element_context(int); /* XML processor entry point. */ -XBT_PUBLIC(int ) yylex(void); +XBT_PUBLIC(int) yylex(void); /* Flexml error handling function (useful only when -q flag passed to flexml) */ const char * dax__parse_err_msg(void); -- 2.20.1