[Scatter-Gather] Fix issue parsing the wireconn tag

Author: AmirhosseinPoolad

libs/libarchfpga/src/parse_switchblocks.cpp

@@ -177,26 +177,26 @@ static t_wireconn_inf parse_wireconn_inline(pugi::xml_node node,
     parse_num_conns(char_prop, wc);
 
     // get from type
-    char_prop = get_attribute(node, "from_type", loc_data, from_to_required).value();
-    if (!can_skip_from_or_to) {
+    char_prop = get_attribute(node, "from_type", loc_data, from_to_required).as_string();
+    if (*char_prop) { // if from_to_required is ReqOpt::REQUIRED, char_prop is definitely not null. Otherwise, it's optional and should be null checked.
         parse_comma_separated_wire_types(char_prop, wc.from_switchpoint_set);
     }
 
     // get to type
-    char_prop = get_attribute(node, "to_type", loc_data, from_to_required).value();
-    if (!can_skip_from_or_to) {
+    char_prop = get_attribute(node, "to_type", loc_data, from_to_required).as_string();
+    if (*char_prop) {
         parse_comma_separated_wire_types(char_prop, wc.to_switchpoint_set);
     }
 
     // get the source wire point
-    char_prop = get_attribute(node, "from_switchpoint", loc_data, from_to_required).value();
-    if (!can_skip_from_or_to) {
+    char_prop = get_attribute(node, "from_switchpoint", loc_data, from_to_required).as_string();
+    if (*char_prop) {
         parse_comma_separated_wire_points(char_prop, wc.from_switchpoint_set);
     }
 
     // get the destination wire point
-    char_prop = get_attribute(node, "to_switchpoint", loc_data, from_to_required).value();
-    if (!can_skip_from_or_to) {
+    char_prop = get_attribute(node, "to_switchpoint", loc_data, from_to_required).as_string();
+    if (*char_prop) {
         parse_comma_separated_wire_points(char_prop, wc.to_switchpoint_set);
     }
 

libs/libarchfpga/src/read_xml_arch_file_sg.cpp

@@ -125,10 +125,10 @@ void process_sg_tag(pugi::xml_node sg_list_tag,
         // Parse scatter pattern
         pugi::xml_node scatter_node = pugiutil::get_single_child(sg_tag, "scatter", loc_data);
         t_wireconn_inf scatter_wireconn = parse_wireconn(pugiutil::get_single_child(scatter_node, "wireconn", loc_data), loc_data, switches, true);
-        if (!gather_wireconn.from_switchpoint_set.empty()) {
+        if (!scatter_wireconn.from_switchpoint_set.empty()) {
             archfpga_throw(loc_data.filename_c_str(), loc_data.line(sg_tag), "Scatter wireconn specification should not set any 'from' switchpoints");
         }
-        if (gather_wireconn.to_switchpoint_set.empty()) {
+        if (scatter_wireconn.to_switchpoint_set.empty()) {
             archfpga_throw(loc_data.filename_c_str(), loc_data.line(sg_tag), "Scatter wireconn specification does not include any switchpoints.");
         }
         sg.scatter_pattern = scatter_wireconn;