Index: hyp_y.c =================================================================== --- hyp_y.c (revision 31010) +++ hyp_y.c (revision 31011) @@ -1897,13 +1897,13 @@ case 24: #line 164 "hyp_y.y" /* yacc.c:1652 */ - { h.detailed = pcb_false; } + { h.detailed = rnd_false; } #line 1902 "hyp_y.c" /* yacc.c:1652 */ break; case 25: #line 165 "hyp_y.y" /* yacc.c:1652 */ - { h.detailed = pcb_true; } + { h.detailed = rnd_true; } #line 1908 "hyp_y.c" /* yacc.c:1652 */ break; @@ -1915,25 +1915,25 @@ case 27: #line 173 "hyp_y.y" /* yacc.c:1652 */ - { h.unit_system_english = pcb_true; } + { h.unit_system_english = rnd_true; } #line 1920 "hyp_y.c" /* yacc.c:1652 */ break; case 28: #line 174 "hyp_y.y" /* yacc.c:1652 */ - { h.unit_system_english = pcb_false; } + { h.unit_system_english = rnd_false; } #line 1926 "hyp_y.c" /* yacc.c:1652 */ break; case 29: #line 177 "hyp_y.y" /* yacc.c:1652 */ - { h.metal_thickness_weight = pcb_true; } + { h.metal_thickness_weight = rnd_true; } #line 1932 "hyp_y.c" /* yacc.c:1652 */ break; case 30: #line 178 "hyp_y.y" /* yacc.c:1652 */ - { h.metal_thickness_weight = pcb_false; } + { h.metal_thickness_weight = rnd_false; } #line 1938 "hyp_y.c" /* yacc.c:1652 */ break; @@ -2011,7 +2011,7 @@ case 66: #line 248 "hyp_y.y" /* yacc.c:1652 */ - { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = pcb_true; } + { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = rnd_true; } #line 2016 "hyp_y.c" /* yacc.c:1652 */ break; @@ -2029,7 +2029,7 @@ case 79: #line 266 "hyp_y.y" /* yacc.c:1652 */ - { h.epsilon_r = yylval.floatval; h.epsilon_r_set = pcb_true; } + { h.epsilon_r = yylval.floatval; h.epsilon_r_set = rnd_true; } #line 2034 "hyp_y.c" /* yacc.c:1652 */ break; @@ -2047,73 +2047,73 @@ case 91: #line 284 "hyp_y.y" /* yacc.c:1652 */ - { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = pcb_true; } + { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = rnd_true; } #line 2052 "hyp_y.c" /* yacc.c:1652 */ break; case 99: #line 294 "hyp_y.y" /* yacc.c:1652 */ - { h.thickness = yylval.floatval; h.thickness_set = pcb_true; } + { h.thickness = yylval.floatval; h.thickness_set = rnd_true; } #line 2058 "hyp_y.c" /* yacc.c:1652 */ break; case 100: #line 297 "hyp_y.y" /* yacc.c:1652 */ - { h.plating_thickness = yylval.floatval; h.plating_thickness_set = pcb_true; } + { h.plating_thickness = yylval.floatval; h.plating_thickness_set = rnd_true; } #line 2064 "hyp_y.c" /* yacc.c:1652 */ break; case 101: #line 300 "hyp_y.y" /* yacc.c:1652 */ - { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = pcb_true; } + { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = rnd_true; } #line 2070 "hyp_y.c" /* yacc.c:1652 */ break; case 102: #line 303 "hyp_y.y" /* yacc.c:1652 */ - { h.temperature_coefficient = yylval.floatval; h.temperature_coefficient_set = pcb_true; } + { h.temperature_coefficient = yylval.floatval; h.temperature_coefficient_set = rnd_true; } #line 2076 "hyp_y.c" /* yacc.c:1652 */ break; case 103: #line 306 "hyp_y.y" /* yacc.c:1652 */ - { h.epsilon_r = yylval.floatval; h.epsilon_r_set = pcb_true; } + { h.epsilon_r = yylval.floatval; h.epsilon_r_set = rnd_true; } #line 2082 "hyp_y.c" /* yacc.c:1652 */ break; case 104: #line 309 "hyp_y.y" /* yacc.c:1652 */ - { h.loss_tangent = yylval.floatval; h.loss_tangent_set = pcb_true; } + { h.loss_tangent = yylval.floatval; h.loss_tangent_set = rnd_true; } #line 2088 "hyp_y.c" /* yacc.c:1652 */ break; case 105: #line 312 "hyp_y.y" /* yacc.c:1652 */ - { h.layer_name = yylval.strval; h.layer_name_set = pcb_true; } + { h.layer_name = yylval.strval; h.layer_name_set = rnd_true; } #line 2094 "hyp_y.c" /* yacc.c:1652 */ break; case 106: #line 315 "hyp_y.y" /* yacc.c:1652 */ - { h.material_name = yylval.strval; h.material_name_set = pcb_true; } + { h.material_name = yylval.strval; h.material_name_set = rnd_true; } #line 2100 "hyp_y.c" /* yacc.c:1652 */ break; case 107: #line 318 "hyp_y.y" /* yacc.c:1652 */ - { h.plane_separation = yylval.floatval; h.plane_separation_set = pcb_true; } + { h.plane_separation = yylval.floatval; h.plane_separation_set = rnd_true; } #line 2106 "hyp_y.c" /* yacc.c:1652 */ break; case 108: #line 321 "hyp_y.y" /* yacc.c:1652 */ - { h.conformal = yylval.boolval; h.conformal_set = pcb_true; } + { h.conformal = yylval.boolval; h.conformal_set = rnd_true; } #line 2112 "hyp_y.c" /* yacc.c:1652 */ break; case 109: #line 324 "hyp_y.y" /* yacc.c:1652 */ - { h.prepreg = yylval.boolval; h.prepreg_set = pcb_true; } + { h.prepreg = yylval.boolval; h.prepreg_set = rnd_true; } #line 2118 "hyp_y.c" /* yacc.c:1652 */ break; @@ -2143,25 +2143,25 @@ case 125: #line 356 "hyp_y.y" /* yacc.c:1652 */ - { h.name = yylval.strval; h.name_set = pcb_true; } + { h.name = yylval.strval; h.name_set = rnd_true; } #line 2148 "hyp_y.c" /* yacc.c:1652 */ break; case 128: #line 364 "hyp_y.y" /* yacc.c:1652 */ - { h.value_float = yylval.floatval; h.value_float_set = pcb_true; } + { h.value_float = yylval.floatval; h.value_float_set = rnd_true; } #line 2154 "hyp_y.c" /* yacc.c:1652 */ break; case 129: #line 367 "hyp_y.y" /* yacc.c:1652 */ - { h.value_string = yylval.strval; h.value_string_set = pcb_true; } + { h.value_string = yylval.strval; h.value_string_set = rnd_true; } #line 2160 "hyp_y.c" /* yacc.c:1652 */ break; case 130: #line 370 "hyp_y.y" /* yacc.c:1652 */ - { h.package = yylval.strval; h.package_set = pcb_true; } + { h.package = yylval.strval; h.package_set = rnd_true; } #line 2166 "hyp_y.c" /* yacc.c:1652 */ break; @@ -2191,7 +2191,7 @@ case 139: #line 394 "hyp_y.y" /* yacc.c:1652 */ - { h.padstack_name = yylval.strval; h.padstack_name_set = pcb_true; } + { h.padstack_name = yylval.strval; h.padstack_name_set = rnd_true; } #line 2196 "hyp_y.c" /* yacc.c:1652 */ break; @@ -2203,13 +2203,13 @@ case 141: #line 397 "hyp_y.y" /* yacc.c:1652 */ - { h.drill_size = yylval.floatval; h.drill_size_set = pcb_true; } + { h.drill_size = yylval.floatval; h.drill_size_set = rnd_true; } #line 2208 "hyp_y.c" /* yacc.c:1652 */ break; case 147: #line 406 "hyp_y.y" /* yacc.c:1652 */ - { h.layer_name = yylval.strval; h.layer_name_set = pcb_true; } + { h.layer_name = yylval.strval; h.layer_name_set = rnd_true; } #line 2214 "hyp_y.c" /* yacc.c:1652 */ break; @@ -2251,13 +2251,13 @@ case 157: #line 419 "hyp_y.y" /* yacc.c:1652 */ - { h.pad_type = PAD_TYPE_METAL; h.pad_type_set = pcb_true; } + { h.pad_type = PAD_TYPE_METAL; h.pad_type_set = rnd_true; } #line 2256 "hyp_y.c" /* yacc.c:1652 */ break; case 158: #line 420 "hyp_y.y" /* yacc.c:1652 */ - { h.pad_type = PAD_TYPE_ANTIPAD; h.pad_type_set = pcb_true; } + { h.pad_type = PAD_TYPE_ANTIPAD; h.pad_type_set = rnd_true; } #line 2262 "hyp_y.c" /* yacc.c:1652 */ break; @@ -2287,7 +2287,7 @@ case 163: #line 425 "hyp_y.y" /* yacc.c:1652 */ - { h.pad_type = PAD_TYPE_THERMAL_RELIEF; h.pad_type_set = pcb_true; } + { h.pad_type = PAD_TYPE_THERMAL_RELIEF; h.pad_type_set = rnd_true; } #line 2292 "hyp_y.c" /* yacc.c:1652 */ break; @@ -2335,13 +2335,13 @@ case 194: #line 479 "hyp_y.y" /* yacc.c:1652 */ - { h.width = yylval.floatval; h.width_set = pcb_true; } + { h.width = yylval.floatval; h.width_set = rnd_true; } #line 2340 "hyp_y.c" /* yacc.c:1652 */ break; case 195: #line 482 "hyp_y.y" /* yacc.c:1652 */ - { h.left_plane_separation = yylval.floatval; h.left_plane_separation_set = pcb_true; } + { h.left_plane_separation = yylval.floatval; h.left_plane_separation_set = rnd_true; } #line 2346 "hyp_y.c" /* yacc.c:1652 */ break; @@ -2359,97 +2359,97 @@ case 201: #line 496 "hyp_y.y" /* yacc.c:1652 */ - { h.drill_size = yylval.floatval; h.drill_size_set = pcb_true; } + { h.drill_size = yylval.floatval; h.drill_size_set = rnd_true; } #line 2364 "hyp_y.c" /* yacc.c:1652 */ break; case 204: #line 499 "hyp_y.y" /* yacc.c:1652 */ - { h.via_pad_shape = yylval.strval; h.via_pad_shape_set = pcb_true; } + { h.via_pad_shape = yylval.strval; h.via_pad_shape_set = rnd_true; } #line 2370 "hyp_y.c" /* yacc.c:1652 */ break; case 205: #line 500 "hyp_y.y" /* yacc.c:1652 */ - { h.via_pad_sx = yylval.floatval; h.via_pad_sx_set = pcb_true; } + { h.via_pad_sx = yylval.floatval; h.via_pad_sx_set = rnd_true; } #line 2376 "hyp_y.c" /* yacc.c:1652 */ break; case 206: #line 501 "hyp_y.y" /* yacc.c:1652 */ - { h.via_pad_sy = yylval.floatval; h.via_pad_sy_set = pcb_true; } + { h.via_pad_sy = yylval.floatval; h.via_pad_sy_set = rnd_true; } #line 2382 "hyp_y.c" /* yacc.c:1652 */ break; case 207: #line 502 "hyp_y.y" /* yacc.c:1652 */ - { h.via_pad_angle = yylval.floatval; h.via_pad_angle_set = pcb_true; } + { h.via_pad_angle = yylval.floatval; h.via_pad_angle_set = rnd_true; } #line 2388 "hyp_y.c" /* yacc.c:1652 */ break; case 208: #line 503 "hyp_y.y" /* yacc.c:1652 */ - { h.via_pad1_shape = yylval.strval; h.via_pad1_shape_set = pcb_true; } + { h.via_pad1_shape = yylval.strval; h.via_pad1_shape_set = rnd_true; } #line 2394 "hyp_y.c" /* yacc.c:1652 */ break; case 209: #line 504 "hyp_y.y" /* yacc.c:1652 */ - { h.via_pad1_sx = yylval.floatval; h.via_pad1_sx_set = pcb_true; } + { h.via_pad1_sx = yylval.floatval; h.via_pad1_sx_set = rnd_true; } #line 2400 "hyp_y.c" /* yacc.c:1652 */ break; case 210: #line 505 "hyp_y.y" /* yacc.c:1652 */ - { h.via_pad1_sy = yylval.floatval; h.via_pad1_sy_set = pcb_true; } + { h.via_pad1_sy = yylval.floatval; h.via_pad1_sy_set = rnd_true; } #line 2406 "hyp_y.c" /* yacc.c:1652 */ break; case 211: #line 506 "hyp_y.y" /* yacc.c:1652 */ - { h.via_pad1_angle = yylval.floatval; h.via_pad1_angle_set = pcb_true; } + { h.via_pad1_angle = yylval.floatval; h.via_pad1_angle_set = rnd_true; } #line 2412 "hyp_y.c" /* yacc.c:1652 */ break; case 212: #line 507 "hyp_y.y" /* yacc.c:1652 */ - { h.via_pad2_shape = yylval.strval; h.via_pad2_shape_set = pcb_true; } + { h.via_pad2_shape = yylval.strval; h.via_pad2_shape_set = rnd_true; } #line 2418 "hyp_y.c" /* yacc.c:1652 */ break; case 213: #line 508 "hyp_y.y" /* yacc.c:1652 */ - { h.via_pad2_sx = yylval.floatval; h.via_pad2_sx_set = pcb_true; } + { h.via_pad2_sx = yylval.floatval; h.via_pad2_sx_set = rnd_true; } #line 2424 "hyp_y.c" /* yacc.c:1652 */ break; case 214: #line 509 "hyp_y.y" /* yacc.c:1652 */ - { h.via_pad2_sy = yylval.floatval; h.via_pad2_sy_set = pcb_true; } + { h.via_pad2_sy = yylval.floatval; h.via_pad2_sy_set = rnd_true; } #line 2430 "hyp_y.c" /* yacc.c:1652 */ break; case 215: #line 510 "hyp_y.y" /* yacc.c:1652 */ - { h.via_pad2_angle = yylval.floatval; h.via_pad2_angle_set = pcb_true; } + { h.via_pad2_angle = yylval.floatval; h.via_pad2_angle_set = rnd_true; } #line 2436 "hyp_y.c" /* yacc.c:1652 */ break; case 216: #line 514 "hyp_y.y" /* yacc.c:1652 */ - { h.padstack_name = yylval.strval; h.padstack_name_set = pcb_true; } + { h.padstack_name = yylval.strval; h.padstack_name_set = rnd_true; } #line 2442 "hyp_y.c" /* yacc.c:1652 */ break; case 217: #line 517 "hyp_y.y" /* yacc.c:1652 */ - { h.layer1_name = yylval.strval; h.layer1_name_set = pcb_true; } + { h.layer1_name = yylval.strval; h.layer1_name_set = rnd_true; } #line 2448 "hyp_y.c" /* yacc.c:1652 */ break; case 218: #line 520 "hyp_y.y" /* yacc.c:1652 */ - { h.layer2_name = yylval.strval; h.layer2_name_set = pcb_true; } + { h.layer2_name = yylval.strval; h.layer2_name_set = rnd_true; } #line 2454 "hyp_y.c" /* yacc.c:1652 */ break; @@ -2467,31 +2467,31 @@ case 225: #line 536 "hyp_y.y" /* yacc.c:1652 */ - { h.pin_reference = yylval.strval; h.pin_reference_set = pcb_true; } + { h.pin_reference = yylval.strval; h.pin_reference_set = rnd_true; } #line 2472 "hyp_y.c" /* yacc.c:1652 */ break; case 226: #line 539 "hyp_y.y" /* yacc.c:1652 */ - { h.pin_function = PIN_SIM_OUT; h.pin_function_set = pcb_true; } + { h.pin_function = PIN_SIM_OUT; h.pin_function_set = rnd_true; } #line 2478 "hyp_y.c" /* yacc.c:1652 */ break; case 227: #line 540 "hyp_y.y" /* yacc.c:1652 */ - { h.pin_function = PIN_SIM_IN; h.pin_function_set = pcb_true; } + { h.pin_function = PIN_SIM_IN; h.pin_function_set = rnd_true; } #line 2484 "hyp_y.c" /* yacc.c:1652 */ break; case 228: #line 541 "hyp_y.y" /* yacc.c:1652 */ - { h.pin_function = PIN_SIM_BOTH; h.pin_function_set = pcb_true; } + { h.pin_function = PIN_SIM_BOTH; h.pin_function_set = rnd_true; } #line 2490 "hyp_y.c" /* yacc.c:1652 */ break; case 229: #line 542 "hyp_y.y" /* yacc.c:1652 */ - { h.pin_function = PIN_SIM_BOTH; h.pin_function_set = pcb_true; hyyerror("warning: SIM_BOTH assumed"); } + { h.pin_function = PIN_SIM_BOTH; h.pin_function_set = rnd_true; hyyerror("warning: SIM_BOTH assumed"); } #line 2496 "hyp_y.c" /* yacc.c:1652 */ break; @@ -2509,25 +2509,25 @@ case 235: #line 555 "hyp_y.y" /* yacc.c:1652 */ - { h.via_pad_shape = yylval.strval; h.via_pad_shape_set = pcb_true; } + { h.via_pad_shape = yylval.strval; h.via_pad_shape_set = rnd_true; } #line 2514 "hyp_y.c" /* yacc.c:1652 */ break; case 236: #line 556 "hyp_y.y" /* yacc.c:1652 */ - { h.via_pad_sx = yylval.floatval; h.via_pad_sx_set = pcb_true; } + { h.via_pad_sx = yylval.floatval; h.via_pad_sx_set = rnd_true; } #line 2520 "hyp_y.c" /* yacc.c:1652 */ break; case 237: #line 557 "hyp_y.y" /* yacc.c:1652 */ - { h.via_pad_sy = yylval.floatval; h.via_pad_sy_set = pcb_true; } + { h.via_pad_sy = yylval.floatval; h.via_pad_sy_set = rnd_true; } #line 2526 "hyp_y.c" /* yacc.c:1652 */ break; case 238: #line 558 "hyp_y.y" /* yacc.c:1652 */ - { h.via_pad_angle = yylval.floatval; h.via_pad_angle_set = pcb_true; } + { h.via_pad_angle = yylval.floatval; h.via_pad_angle_set = rnd_true; } #line 2532 "hyp_y.c" /* yacc.c:1652 */ break; @@ -2545,7 +2545,7 @@ case 243: #line 570 "hyp_y.y" /* yacc.c:1652 */ - { h.zlayer_name = yylval.strval; h.zlayer_name_set = pcb_true; } + { h.zlayer_name = yylval.strval; h.zlayer_name_set = rnd_true; } #line 2550 "hyp_y.c" /* yacc.c:1652 */ break; @@ -2563,7 +2563,7 @@ case 247: #line 577 "hyp_y.y" /* yacc.c:1652 */ - { h.impedance = yylval.floatval; h.impedance_set = pcb_true; } + { h.impedance = yylval.floatval; h.impedance_set = rnd_true; } #line 2568 "hyp_y.c" /* yacc.c:1652 */ break; @@ -2575,7 +2575,7 @@ case 250: #line 582 "hyp_y.y" /* yacc.c:1652 */ - { h.resistance = yylval.floatval; h.resistance_set = pcb_true;} + { h.resistance = yylval.floatval; h.resistance_set = rnd_true;} #line 2580 "hyp_y.c" /* yacc.c:1652 */ break; @@ -2599,25 +2599,25 @@ case 262: #line 604 "hyp_y.y" /* yacc.c:1652 */ - { h.id = yylval.intval; h.id_set = pcb_true; } + { h.id = yylval.intval; h.id_set = rnd_true; } #line 2604 "hyp_y.c" /* yacc.c:1652 */ break; case 263: #line 608 "hyp_y.y" /* yacc.c:1652 */ - { h.polygon_type = POLYGON_TYPE_POUR; h.polygon_type_set = pcb_true; } + { h.polygon_type = POLYGON_TYPE_POUR; h.polygon_type_set = rnd_true; } #line 2610 "hyp_y.c" /* yacc.c:1652 */ break; case 264: #line 609 "hyp_y.y" /* yacc.c:1652 */ - { h.polygon_type = POLYGON_TYPE_PLANE; h.polygon_type_set = pcb_true; } + { h.polygon_type = POLYGON_TYPE_PLANE; h.polygon_type_set = rnd_true; } #line 2616 "hyp_y.c" /* yacc.c:1652 */ break; case 265: #line 610 "hyp_y.y" /* yacc.c:1652 */ - { h.polygon_type = POLYGON_TYPE_COPPER; h.polygon_type_set = pcb_true; } + { h.polygon_type = POLYGON_TYPE_COPPER; h.polygon_type_set = rnd_true; } #line 2622 "hyp_y.c" /* yacc.c:1652 */ break; @@ -3076,13 +3076,13 @@ static void new_record() { h.vers = 0; - h.detailed = pcb_false; - h.unit_system_english = pcb_false; - h.metal_thickness_weight = pcb_false; + h.detailed = rnd_false; + h.unit_system_english = rnd_false; + h.metal_thickness_weight = rnd_false; h.default_plane_separation = 0; - h.use_die_for_metal = pcb_false; + h.use_die_for_metal = rnd_false; h.bulk_resistivity = 0; - h.conformal = pcb_false; + h.conformal = rnd_false; h.epsilon_r = 0; h.layer_name = NULL; h.loss_tangent = 0; @@ -3089,31 +3089,31 @@ h.material_name = NULL; h.plane_separation = 0; h.plating_thickness = 0; - h.prepreg = pcb_false; + h.prepreg = rnd_false; h.temperature_coefficient = 0; h.thickness = 0; - h.bulk_resistivity_set = pcb_false; - h.conformal_set = pcb_false; - h.epsilon_r_set = pcb_false; - h.layer_name_set = pcb_false; - h.loss_tangent_set = pcb_false; - h.material_name_set = pcb_false; - h.plane_separation_set = pcb_false; - h.plating_thickness_set = pcb_false; - h.prepreg_set = pcb_false; - h.temperature_coefficient_set = pcb_false; - h.thickness_set = pcb_false; + h.bulk_resistivity_set = rnd_false; + h.conformal_set = rnd_false; + h.epsilon_r_set = rnd_false; + h.layer_name_set = rnd_false; + h.loss_tangent_set = rnd_false; + h.material_name_set = rnd_false; + h.plane_separation_set = rnd_false; + h.plating_thickness_set = rnd_false; + h.prepreg_set = rnd_false; + h.temperature_coefficient_set = rnd_false; + h.thickness_set = rnd_false; h.device_type = NULL; h.ref = NULL; h.value_float = 0; h.value_string = NULL; h.package = NULL; - h.name_set = pcb_false; - h.value_float_set = pcb_false; - h.value_string_set = pcb_false; - h.package_set = pcb_false; - h.voltage_specified = pcb_false; - h.conversion = pcb_false; + h.name_set = rnd_false; + h.value_float_set = rnd_false; + h.value_string_set = rnd_false; + h.package_set = rnd_false; + h.voltage_specified = rnd_false; + h.conversion = rnd_false; h.padstack_name = NULL; h.drill_size = 0; h.pad_shape = 0; @@ -3125,57 +3125,57 @@ h.thermal_clear_sy = 0; h.thermal_clear_angle = 0; h.pad_type = PAD_TYPE_METAL; - h.padstack_name_set = pcb_false; - h.drill_size_set = pcb_false; - h.pad_type_set = pcb_false; + h.padstack_name_set = rnd_false; + h.drill_size_set = rnd_false; + h.pad_type_set = rnd_false; h.width = 0; h.left_plane_separation = 0; - h.width_set = pcb_false; - h.left_plane_separation_set = pcb_false; + h.width_set = rnd_false; + h.left_plane_separation_set = rnd_false; h.layer1_name = NULL; - h.layer1_name_set = pcb_false; + h.layer1_name_set = rnd_false; h.layer2_name = NULL; - h.layer2_name_set = pcb_false; + h.layer2_name_set = rnd_false; h.via_pad_shape = NULL; - h.via_pad_shape_set = pcb_false; + h.via_pad_shape_set = rnd_false; h.via_pad_sx = 0; - h.via_pad_sx_set = pcb_false; + h.via_pad_sx_set = rnd_false; h.via_pad_sy = 0; - h.via_pad_sy_set = pcb_false; + h.via_pad_sy_set = rnd_false; h.via_pad_angle = 0; - h.via_pad_angle_set = pcb_false; + h.via_pad_angle_set = rnd_false; h.via_pad1_shape = NULL; - h.via_pad1_shape_set = pcb_false; + h.via_pad1_shape_set = rnd_false; h.via_pad1_sx = 0; - h.via_pad1_sx_set = pcb_false; + h.via_pad1_sx_set = rnd_false; h.via_pad1_sy = 0; - h.via_pad1_sy_set = pcb_false; + h.via_pad1_sy_set = rnd_false; h.via_pad1_angle = 0; - h.via_pad1_angle_set = pcb_false; + h.via_pad1_angle_set = rnd_false; h.via_pad2_shape = NULL; - h.via_pad2_shape_set = pcb_false; + h.via_pad2_shape_set = rnd_false; h.via_pad2_sx = 0; - h.via_pad2_sx_set = pcb_false; + h.via_pad2_sx_set = rnd_false; h.via_pad2_sy = 0; - h.via_pad2_sy_set = pcb_false; + h.via_pad2_sy_set = rnd_false; h.via_pad2_angle = 0; - h.via_pad2_angle_set = pcb_false; + h.via_pad2_angle_set = rnd_false; h.pin_reference = NULL; - h.pin_reference_set = pcb_false; + h.pin_reference_set = rnd_false; h.pin_function = PIN_SIM_BOTH; - h.pin_function_set = pcb_false; + h.pin_function_set = rnd_false; h.zlayer_name = NULL; - h.zlayer_name_set = pcb_false; + h.zlayer_name_set = rnd_false; h.length = 0; h.impedance = 0; - h.impedance_set = pcb_false; + h.impedance_set = rnd_false; h.delay = 0; h.resistance = 0; - h.resistance_set = pcb_false; + h.resistance_set = rnd_false; h.id = -1; - h.id_set = pcb_false; + h.id_set = rnd_false; h.polygon_type = POLYGON_TYPE_PLANE; - h.polygon_type_set = pcb_false; + h.polygon_type_set = rnd_false; h.net_class_name = NULL; h.net_name = NULL; h.key = NULL; Index: hyp_y.y =================================================================== --- hyp_y.y (revision 31010) +++ hyp_y.y (revision 31011) @@ -161,8 +161,8 @@ : '{' H_DATA_MODE '=' mode '}' { if (exec_data_mode(&h)) YYERROR; }; mode - : H_SIMPLIFIED { h.detailed = pcb_false; } - | H_DETAILED { h.detailed = pcb_true; } ; + : H_SIMPLIFIED { h.detailed = rnd_false; } + | H_DETAILED { h.detailed = rnd_true; } ; /* units */ @@ -170,12 +170,12 @@ : '{' H_UNITS '=' unit_system metal_thickness_unit '}' { if (exec_units(&h)) YYERROR; } ; unit_system - : H_ENGLISH { h.unit_system_english = pcb_true; } - | H_METRIC { h.unit_system_english = pcb_false; }; + : H_ENGLISH { h.unit_system_english = rnd_true; } + | H_METRIC { h.unit_system_english = rnd_false; }; metal_thickness_unit - : H_WEIGHT { h.metal_thickness_weight = pcb_true; } - | H_LENGTH { h.metal_thickness_weight = pcb_false; } ; + : H_WEIGHT { h.metal_thickness_weight = rnd_true; } + | H_LENGTH { h.metal_thickness_weight = rnd_false; } ; /* plane_sep */ plane_sep @@ -245,7 +245,7 @@ signal_param : thickness | plating_thickness - | H_C '=' H_FLOAT { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = pcb_true; } + | H_C '=' H_FLOAT { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = rnd_true; } | bulk_resistivity | temperature_coefficient | epsilon_r @@ -263,7 +263,7 @@ dielectric_param : thickness - | H_C '=' H_FLOAT { h.epsilon_r = yylval.floatval; h.epsilon_r_set = pcb_true; } + | H_C '=' H_FLOAT { h.epsilon_r = yylval.floatval; h.epsilon_r_set = rnd_true; } | epsilon_r | loss_tangent | conformal @@ -281,7 +281,7 @@ plane_param : thickness - | H_C '=' H_FLOAT { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = pcb_true; } + | H_C '=' H_FLOAT { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = rnd_true; } | bulk_resistivity | temperature_coefficient | epsilon_r @@ -291,37 +291,37 @@ | plane_separation ; thickness - : H_T '=' H_FLOAT { h.thickness = yylval.floatval; h.thickness_set = pcb_true; } + : H_T '=' H_FLOAT { h.thickness = yylval.floatval; h.thickness_set = rnd_true; } plating_thickness - : H_P '=' H_FLOAT { h.plating_thickness = yylval.floatval; h.plating_thickness_set = pcb_true; } + : H_P '=' H_FLOAT { h.plating_thickness = yylval.floatval; h.plating_thickness_set = rnd_true; } bulk_resistivity - : H_BR '=' H_FLOAT { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = pcb_true; } + : H_BR '=' H_FLOAT { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = rnd_true; } temperature_coefficient - : H_TC '=' H_FLOAT { h.temperature_coefficient = yylval.floatval; h.temperature_coefficient_set = pcb_true; } + : H_TC '=' H_FLOAT { h.temperature_coefficient = yylval.floatval; h.temperature_coefficient_set = rnd_true; } epsilon_r - : H_ER '=' H_FLOAT { h.epsilon_r = yylval.floatval; h.epsilon_r_set = pcb_true; } + : H_ER '=' H_FLOAT { h.epsilon_r = yylval.floatval; h.epsilon_r_set = rnd_true; } loss_tangent - : H_LT '=' H_FLOAT { h.loss_tangent = yylval.floatval; h.loss_tangent_set = pcb_true; } + : H_LT '=' H_FLOAT { h.loss_tangent = yylval.floatval; h.loss_tangent_set = rnd_true; } layer_name - : H_L '=' H_STRING { h.layer_name = yylval.strval; h.layer_name_set = pcb_true; } + : H_L '=' H_STRING { h.layer_name = yylval.strval; h.layer_name_set = rnd_true; } material_name - : H_M '=' H_STRING { h.material_name = yylval.strval; h.material_name_set = pcb_true; } + : H_M '=' H_STRING { h.material_name = yylval.strval; h.material_name_set = rnd_true; } plane_separation - : H_PS '=' H_FLOAT { h.plane_separation = yylval.floatval; h.plane_separation_set = pcb_true; } + : H_PS '=' H_FLOAT { h.plane_separation = yylval.floatval; h.plane_separation_set = rnd_true; } conformal - : H_CO_QM '=' H_BOOL { h.conformal = yylval.boolval; h.conformal_set = pcb_true; } + : H_CO_QM '=' H_BOOL { h.conformal = yylval.boolval; h.conformal_set = rnd_true; } prepreg - : H_PR_QM '=' H_BOOL { h.prepreg = yylval.boolval; h.prepreg_set = pcb_true; } + : H_PR_QM '=' H_BOOL { h.prepreg = yylval.boolval; h.prepreg_set = rnd_true; } /* devices */ @@ -353,7 +353,7 @@ ; name - : H_NAME '=' H_STRING { h.name = yylval.strval; h.name_set = pcb_true; } ; + : H_NAME '=' H_STRING { h.name = yylval.strval; h.name_set = rnd_true; } ; value : value_float @@ -361,13 +361,13 @@ ; value_float - : H_VAL '=' H_FLOAT { h.value_float = yylval.floatval; h.value_float_set = pcb_true; } ; + : H_VAL '=' H_FLOAT { h.value_float = yylval.floatval; h.value_float_set = rnd_true; } ; value_string - : H_VAL '=' H_STRING { h.value_string = yylval.strval; h.value_string_set = pcb_true; } ; + : H_VAL '=' H_STRING { h.value_string = yylval.strval; h.value_string_set = rnd_true; } ; package - : H_PKG '=' H_STRING { h.package = yylval.strval; h.package_set = pcb_true; } ; + : H_PKG '=' H_STRING { h.package = yylval.strval; h.package_set = rnd_true; } ; /* supplies */ @@ -391,10 +391,10 @@ /* padstack */ padstack - : '{' H_PADSTACK { new_record(); } '=' H_STRING { h.padstack_name = yylval.strval; h.padstack_name_set = pcb_true; } drill_size '}' { if (exec_pstk_end(&h)) YYERROR; } ; + : '{' H_PADSTACK { new_record(); } '=' H_STRING { h.padstack_name = yylval.strval; h.padstack_name_set = rnd_true; } drill_size '}' { if (exec_pstk_end(&h)) YYERROR; } ; drill_size - : ',' H_FLOAT { h.drill_size = yylval.floatval; h.drill_size_set = pcb_true; } padstack_list + : ',' H_FLOAT { h.drill_size = yylval.floatval; h.drill_size_set = rnd_true; } padstack_list | ',' padstack_list ; | padstack_list ; @@ -403,7 +403,7 @@ | padstack_def ; padstack_def - : '(' H_STRING { h.layer_name = yylval.strval; h.layer_name_set = pcb_true; } ',' pad_shape pad_coord pad_type { if (exec_pstk_element(&h)) YYERROR; new_record(); } + : '(' H_STRING { h.layer_name = yylval.strval; h.layer_name_set = rnd_true; } ',' pad_shape pad_coord pad_type { if (exec_pstk_element(&h)) YYERROR; new_record(); } | '(' error ')' ; pad_shape @@ -416,13 +416,13 @@ pad_type : ')' - | ',' H_M ')' { h.pad_type = PAD_TYPE_METAL; h.pad_type_set = pcb_true; } - | ',' H_A ')' { h.pad_type = PAD_TYPE_ANTIPAD; h.pad_type_set = pcb_true; } + | ',' H_M ')' { h.pad_type = PAD_TYPE_METAL; h.pad_type_set = rnd_true; } + | ',' H_A ')' { h.pad_type = PAD_TYPE_ANTIPAD; h.pad_type_set = rnd_true; } | ',' H_FLOAT { h.thermal_clear_shape = yylval.floatval; } ',' H_FLOAT { h.thermal_clear_sx = yylval.floatval; } ',' H_FLOAT { h.thermal_clear_sy = yylval.floatval; } ',' H_FLOAT { h.thermal_clear_angle = yylval.floatval; } - ',' H_T ')' { h.pad_type = PAD_TYPE_THERMAL_RELIEF; h.pad_type_set = pcb_true; } + ',' H_T ')' { h.pad_type = PAD_TYPE_THERMAL_RELIEF; h.pad_type_set = rnd_true; } ; /* net */ @@ -476,10 +476,10 @@ ; width - : H_W '=' H_FLOAT { h.width = yylval.floatval; h.width_set = pcb_true; } ; + : H_W '=' H_FLOAT { h.width = yylval.floatval; h.width_set = rnd_true; } ; left_plane_separation - : H_LPS '=' H_FLOAT { h.left_plane_separation = yylval.floatval; h.left_plane_separation_set = pcb_true; } ; + : H_LPS '=' H_FLOAT { h.left_plane_separation = yylval.floatval; h.left_plane_separation_set = rnd_true; } ; via : '(' H_VIA { new_record(); } coord_point via_param_list ')' { if (exec_via(&h)) YYERROR; } ; @@ -493,31 +493,31 @@ via_param : padstack_name /* parameters below are for deprecated v1.0 via format */ - | H_D '=' H_FLOAT { h.drill_size = yylval.floatval; h.drill_size_set = pcb_true; } + | H_D '=' H_FLOAT { h.drill_size = yylval.floatval; h.drill_size_set = rnd_true; } | layer1_name | layer2_name - | H_S '=' H_STRING { h.via_pad_shape = yylval.strval; h.via_pad_shape_set = pcb_true; } - | H_SX '=' H_FLOAT { h.via_pad_sx = yylval.floatval; h.via_pad_sx_set = pcb_true; } - | H_SY '=' H_FLOAT { h.via_pad_sy = yylval.floatval; h.via_pad_sy_set = pcb_true; } - | H_A '=' H_FLOAT { h.via_pad_angle = yylval.floatval; h.via_pad_angle_set = pcb_true; } - | H_S1 '=' H_STRING { h.via_pad1_shape = yylval.strval; h.via_pad1_shape_set = pcb_true; } - | H_S1X '=' H_FLOAT { h.via_pad1_sx = yylval.floatval; h.via_pad1_sx_set = pcb_true; } - | H_S1Y '=' H_FLOAT { h.via_pad1_sy = yylval.floatval; h.via_pad1_sy_set = pcb_true; } - | H_A1 '=' H_FLOAT { h.via_pad1_angle = yylval.floatval; h.via_pad1_angle_set = pcb_true; } - | H_S2 '=' H_STRING { h.via_pad2_shape = yylval.strval; h.via_pad2_shape_set = pcb_true; } - | H_S2X '=' H_FLOAT { h.via_pad2_sx = yylval.floatval; h.via_pad2_sx_set = pcb_true; } - | H_S2Y '=' H_FLOAT { h.via_pad2_sy = yylval.floatval; h.via_pad2_sy_set = pcb_true; } - | H_A2 '=' H_FLOAT { h.via_pad2_angle = yylval.floatval; h.via_pad2_angle_set = pcb_true; } + | H_S '=' H_STRING { h.via_pad_shape = yylval.strval; h.via_pad_shape_set = rnd_true; } + | H_SX '=' H_FLOAT { h.via_pad_sx = yylval.floatval; h.via_pad_sx_set = rnd_true; } + | H_SY '=' H_FLOAT { h.via_pad_sy = yylval.floatval; h.via_pad_sy_set = rnd_true; } + | H_A '=' H_FLOAT { h.via_pad_angle = yylval.floatval; h.via_pad_angle_set = rnd_true; } + | H_S1 '=' H_STRING { h.via_pad1_shape = yylval.strval; h.via_pad1_shape_set = rnd_true; } + | H_S1X '=' H_FLOAT { h.via_pad1_sx = yylval.floatval; h.via_pad1_sx_set = rnd_true; } + | H_S1Y '=' H_FLOAT { h.via_pad1_sy = yylval.floatval; h.via_pad1_sy_set = rnd_true; } + | H_A1 '=' H_FLOAT { h.via_pad1_angle = yylval.floatval; h.via_pad1_angle_set = rnd_true; } + | H_S2 '=' H_STRING { h.via_pad2_shape = yylval.strval; h.via_pad2_shape_set = rnd_true; } + | H_S2X '=' H_FLOAT { h.via_pad2_sx = yylval.floatval; h.via_pad2_sx_set = rnd_true; } + | H_S2Y '=' H_FLOAT { h.via_pad2_sy = yylval.floatval; h.via_pad2_sy_set = rnd_true; } + | H_A2 '=' H_FLOAT { h.via_pad2_angle = yylval.floatval; h.via_pad2_angle_set = rnd_true; } ; padstack_name - : H_P '=' H_STRING { h.padstack_name = yylval.strval; h.padstack_name_set = pcb_true; } ; + : H_P '=' H_STRING { h.padstack_name = yylval.strval; h.padstack_name_set = rnd_true; } ; layer1_name - : H_L1 '=' H_STRING { h.layer1_name = yylval.strval; h.layer1_name_set = pcb_true; } ; + : H_L1 '=' H_STRING { h.layer1_name = yylval.strval; h.layer1_name_set = rnd_true; } ; layer2_name - : H_L2 '=' H_STRING { h.layer2_name = yylval.strval; h.layer2_name_set = pcb_true; } ; + : H_L2 '=' H_STRING { h.layer2_name = yylval.strval; h.layer2_name_set = rnd_true; } ; pin : '(' H_PIN { new_record(); } coord_point pin_reference pin_param { if (exec_pin(&h)) YYERROR; } ; @@ -533,13 +533,13 @@ ; pin_reference - : H_R '=' H_STRING { h.pin_reference = yylval.strval; h.pin_reference_set = pcb_true; } ; + : H_R '=' H_STRING { h.pin_reference = yylval.strval; h.pin_reference_set = rnd_true; } ; pin_function - : H_F '=' H_SIM_OUT { h.pin_function = PIN_SIM_OUT; h.pin_function_set = pcb_true; } - | H_F '=' H_SIM_IN { h.pin_function = PIN_SIM_IN; h.pin_function_set = pcb_true; } - | H_F '=' H_SIM_BOTH { h.pin_function = PIN_SIM_BOTH; h.pin_function_set = pcb_true; } - | H_F '=' H_STRING { h.pin_function = PIN_SIM_BOTH; h.pin_function_set = pcb_true; hyyerror("warning: SIM_BOTH assumed"); } + : H_F '=' H_SIM_OUT { h.pin_function = PIN_SIM_OUT; h.pin_function_set = rnd_true; } + | H_F '=' H_SIM_IN { h.pin_function = PIN_SIM_IN; h.pin_function_set = rnd_true; } + | H_F '=' H_SIM_BOTH { h.pin_function = PIN_SIM_BOTH; h.pin_function_set = rnd_true; } + | H_F '=' H_STRING { h.pin_function = PIN_SIM_BOTH; h.pin_function_set = rnd_true; hyyerror("warning: SIM_BOTH assumed"); } ; pad /* deprecated hyperlynx v1.x only */ @@ -552,10 +552,10 @@ pad_param : layer_name - | H_S '=' H_STRING { h.via_pad_shape = yylval.strval; h.via_pad_shape_set = pcb_true; } - | H_SX '=' H_FLOAT { h.via_pad_sx = yylval.floatval; h.via_pad_sx_set = pcb_true; } - | H_SY '=' H_FLOAT { h.via_pad_sy = yylval.floatval; h.via_pad_sy_set = pcb_true; } - | H_A '=' H_FLOAT { h.via_pad_angle = yylval.floatval; h.via_pad_angle_set = pcb_true; } + | H_S '=' H_STRING { h.via_pad_shape = yylval.strval; h.via_pad_shape_set = rnd_true; } + | H_SX '=' H_FLOAT { h.via_pad_sx = yylval.floatval; h.via_pad_sx_set = rnd_true; } + | H_SY '=' H_FLOAT { h.via_pad_sy = yylval.floatval; h.via_pad_sy_set = rnd_true; } + | H_A '=' H_FLOAT { h.via_pad_angle = yylval.floatval; h.via_pad_angle_set = rnd_true; } ; useg @@ -567,7 +567,7 @@ ; useg_stackup - : H_ZL '=' H_STRING { h.zlayer_name = yylval.strval; h.zlayer_name_set = pcb_true; } + : H_ZL '=' H_STRING { h.zlayer_name = yylval.strval; h.zlayer_name_set = rnd_true; } H_ZW '=' H_FLOAT { h.width = yylval.floatval; } H_ZLEN '=' H_FLOAT { h.length = yylval.floatval; } ')' @@ -574,12 +574,12 @@ ; useg_impedance - : H_Z '=' H_FLOAT { h.impedance = yylval.floatval; h.impedance_set = pcb_true; } + : H_Z '=' H_FLOAT { h.impedance = yylval.floatval; h.impedance_set = rnd_true; } H_D '=' H_FLOAT { h.delay = yylval.floatval; } useg_resistance; useg_resistance - : H_R '=' H_FLOAT { h.resistance = yylval.floatval; h.resistance_set = pcb_true;} + : H_R '=' H_FLOAT { h.resistance = yylval.floatval; h.resistance_set = rnd_true;} ')' | ')' ; @@ -601,13 +601,13 @@ ; polygon_id - : H_ID '=' H_POSINT { h.id = yylval.intval; h.id_set = pcb_true; } /* polygon id is a non-negative integer */ + : H_ID '=' H_POSINT { h.id = yylval.intval; h.id_set = rnd_true; } /* polygon id is a non-negative integer */ ; polygon_type - : H_T '=' H_POUR { h.polygon_type = POLYGON_TYPE_POUR; h.polygon_type_set = pcb_true; } - | H_T '=' H_PLANE { h.polygon_type = POLYGON_TYPE_PLANE; h.polygon_type_set = pcb_true; } - | H_T '=' H_COPPER { h.polygon_type = POLYGON_TYPE_COPPER; h.polygon_type_set = pcb_true; } + : H_T '=' H_POUR { h.polygon_type = POLYGON_TYPE_POUR; h.polygon_type_set = rnd_true; } + | H_T '=' H_PLANE { h.polygon_type = POLYGON_TYPE_PLANE; h.polygon_type_set = rnd_true; } + | H_T '=' H_COPPER { h.polygon_type = POLYGON_TYPE_COPPER; h.polygon_type_set = rnd_true; } ; polyvoid @@ -723,13 +723,13 @@ static void new_record() { h.vers = 0; - h.detailed = pcb_false; - h.unit_system_english = pcb_false; - h.metal_thickness_weight = pcb_false; + h.detailed = rnd_false; + h.unit_system_english = rnd_false; + h.metal_thickness_weight = rnd_false; h.default_plane_separation = 0; - h.use_die_for_metal = pcb_false; + h.use_die_for_metal = rnd_false; h.bulk_resistivity = 0; - h.conformal = pcb_false; + h.conformal = rnd_false; h.epsilon_r = 0; h.layer_name = NULL; h.loss_tangent = 0; @@ -736,31 +736,31 @@ h.material_name = NULL; h.plane_separation = 0; h.plating_thickness = 0; - h.prepreg = pcb_false; + h.prepreg = rnd_false; h.temperature_coefficient = 0; h.thickness = 0; - h.bulk_resistivity_set = pcb_false; - h.conformal_set = pcb_false; - h.epsilon_r_set = pcb_false; - h.layer_name_set = pcb_false; - h.loss_tangent_set = pcb_false; - h.material_name_set = pcb_false; - h.plane_separation_set = pcb_false; - h.plating_thickness_set = pcb_false; - h.prepreg_set = pcb_false; - h.temperature_coefficient_set = pcb_false; - h.thickness_set = pcb_false; + h.bulk_resistivity_set = rnd_false; + h.conformal_set = rnd_false; + h.epsilon_r_set = rnd_false; + h.layer_name_set = rnd_false; + h.loss_tangent_set = rnd_false; + h.material_name_set = rnd_false; + h.plane_separation_set = rnd_false; + h.plating_thickness_set = rnd_false; + h.prepreg_set = rnd_false; + h.temperature_coefficient_set = rnd_false; + h.thickness_set = rnd_false; h.device_type = NULL; h.ref = NULL; h.value_float = 0; h.value_string = NULL; h.package = NULL; - h.name_set = pcb_false; - h.value_float_set = pcb_false; - h.value_string_set = pcb_false; - h.package_set = pcb_false; - h.voltage_specified = pcb_false; - h.conversion = pcb_false; + h.name_set = rnd_false; + h.value_float_set = rnd_false; + h.value_string_set = rnd_false; + h.package_set = rnd_false; + h.voltage_specified = rnd_false; + h.conversion = rnd_false; h.padstack_name = NULL; h.drill_size = 0; h.pad_shape = 0; @@ -772,57 +772,57 @@ h.thermal_clear_sy = 0; h.thermal_clear_angle = 0; h.pad_type = PAD_TYPE_METAL; - h.padstack_name_set = pcb_false; - h.drill_size_set = pcb_false; - h.pad_type_set = pcb_false; + h.padstack_name_set = rnd_false; + h.drill_size_set = rnd_false; + h.pad_type_set = rnd_false; h.width = 0; h.left_plane_separation = 0; - h.width_set = pcb_false; - h.left_plane_separation_set = pcb_false; + h.width_set = rnd_false; + h.left_plane_separation_set = rnd_false; h.layer1_name = NULL; - h.layer1_name_set = pcb_false; + h.layer1_name_set = rnd_false; h.layer2_name = NULL; - h.layer2_name_set = pcb_false; + h.layer2_name_set = rnd_false; h.via_pad_shape = NULL; - h.via_pad_shape_set = pcb_false; + h.via_pad_shape_set = rnd_false; h.via_pad_sx = 0; - h.via_pad_sx_set = pcb_false; + h.via_pad_sx_set = rnd_false; h.via_pad_sy = 0; - h.via_pad_sy_set = pcb_false; + h.via_pad_sy_set = rnd_false; h.via_pad_angle = 0; - h.via_pad_angle_set = pcb_false; + h.via_pad_angle_set = rnd_false; h.via_pad1_shape = NULL; - h.via_pad1_shape_set = pcb_false; + h.via_pad1_shape_set = rnd_false; h.via_pad1_sx = 0; - h.via_pad1_sx_set = pcb_false; + h.via_pad1_sx_set = rnd_false; h.via_pad1_sy = 0; - h.via_pad1_sy_set = pcb_false; + h.via_pad1_sy_set = rnd_false; h.via_pad1_angle = 0; - h.via_pad1_angle_set = pcb_false; + h.via_pad1_angle_set = rnd_false; h.via_pad2_shape = NULL; - h.via_pad2_shape_set = pcb_false; + h.via_pad2_shape_set = rnd_false; h.via_pad2_sx = 0; - h.via_pad2_sx_set = pcb_false; + h.via_pad2_sx_set = rnd_false; h.via_pad2_sy = 0; - h.via_pad2_sy_set = pcb_false; + h.via_pad2_sy_set = rnd_false; h.via_pad2_angle = 0; - h.via_pad2_angle_set = pcb_false; + h.via_pad2_angle_set = rnd_false; h.pin_reference = NULL; - h.pin_reference_set = pcb_false; + h.pin_reference_set = rnd_false; h.pin_function = PIN_SIM_BOTH; - h.pin_function_set = pcb_false; + h.pin_function_set = rnd_false; h.zlayer_name = NULL; - h.zlayer_name_set = pcb_false; + h.zlayer_name_set = rnd_false; h.length = 0; h.impedance = 0; - h.impedance_set = pcb_false; + h.impedance_set = rnd_false; h.delay = 0; h.resistance = 0; - h.resistance_set = pcb_false; + h.resistance_set = rnd_false; h.id = -1; - h.id_set = pcb_false; + h.id_set = rnd_false; h.polygon_type = POLYGON_TYPE_PLANE; - h.polygon_type_set = pcb_false; + h.polygon_type_set = rnd_false; h.net_class_name = NULL; h.net_name = NULL; h.key = NULL; Index: io_hyp.c =================================================================== --- io_hyp.c (revision 31010) +++ io_hyp.c (revision 31011) @@ -74,7 +74,7 @@ { const char *fname = NULL; int debug = 0; - pcb_bool_t retval; + rnd_bool_t retval; rnd_PCB_ACT_MAY_CONVARG(1, FGW_STR, LoadhypFrom, fname = argv[1].val.str); Index: parser.c =================================================================== --- parser.c (revision 31010) +++ parser.c (revision 31011) @@ -68,8 +68,8 @@ rnd_coord_t xc; rnd_coord_t yc; rnd_coord_t r; - pcb_bool_t is_arc; /* arc or line */ - pcb_bool_t used; /* already included in outline */ + rnd_bool_t is_arc; /* arc or line */ + rnd_bool_t used; /* already included in outline */ struct outline_s *next; } outline_t; @@ -81,7 +81,7 @@ void hyp_draw_polygons(); /* add all hyperlynx polygons to pcb */ static void hyp_subcs_fin(void); void hyp_resize_board(); /* resize board to fit outline */ -pcb_bool_t hyp_is_bottom_layer(char *); /* true if bottom layer */ +rnd_bool_t hyp_is_bottom_layer(char *); /* true if bottom layer */ /* layer creation */ int layer_count; @@ -184,8 +184,8 @@ rnd_coord_t xc; rnd_coord_t yc; rnd_coord_t r; - pcb_bool_t is_first; /* true if first vertex of contour */ - pcb_bool_t is_arc; /* true if arc */ + rnd_bool_t is_first; /* true if first vertex of contour */ + rnd_bool_t is_arc; /* true if arc */ struct hyp_vertex_s *next; } hyp_vertex_t; @@ -193,7 +193,7 @@ typedef struct hyp_polygon_s { int hyp_poly_id; /* hyperlynx polygon/polyline id */ polygon_type_enum hyp_poly_type; /* pour, copper, ... */ - pcb_bool_t is_polygon; /* true if polygon, false if polyline */ + rnd_bool_t is_polygon; /* true if polygon, false if polyline */ char *layer_name; /* layer of polygon */ rnd_coord_t line_width; /* line width of edge */ rnd_coord_t clearance; /* clearance with other copper */ @@ -258,7 +258,7 @@ unit = 1; metal_thickness_unit = 1; - use_die_for_metal = pcb_false; + use_die_for_metal = rnd_false; inches = 0.0254; /* inches to m */ copper_imperial_weight = 1.341; /* metal thickness in ounces/ft2. 1 oz/ft2 copper = 1.341 mil */ @@ -276,7 +276,7 @@ /* clear layer info */ for (n = 1; n < PCB_MAX_LAYER; n++) { - layer_is_plane[n] = pcb_false; /* signal layer */ + layer_is_plane[n] = rnd_false; /* signal layer */ layer_clearance[n] = -1; /* no separation between fill copper and signals on layer */ } layer_count = 0; @@ -494,7 +494,7 @@ * add segment to board outline */ -void hyp_perimeter_segment_add(outline_t * s, pcb_bool_t forward) +void hyp_perimeter_segment_add(outline_t * s, rnd_bool_t forward) { rnd_layer_id_t outline_id; pcb_layer_t *outline_layer; @@ -512,7 +512,7 @@ } /* mark segment as used, so we don't use it twice */ - s->used = pcb_true; + s->used = rnd_true; /* debugging */ if (hyp_debug) { @@ -525,7 +525,7 @@ if (s->is_arc) { /* counterclockwise arc from (x1, y1) to (x2, y2) */ - hyp_arc_new(outline_layer, s->x1, s->y1, s->x2, s->y2, s->xc, s->yc, s->r, s->r, pcb_false, 1, 0, pcb_no_flags()); + hyp_arc_new(outline_layer, s->x1, s->y1, s->x2, s->y2, s->xc, s->yc, s->r, s->r, rnd_false, 1, 0, pcb_no_flags()); } else /* line from (x1, y1) to (x2, y2) */ @@ -538,16 +538,16 @@ * Check whether point (end_x, end_y) is connected to point (begin_x, begin_y) via un-used segment s and other un-used segments. */ -pcb_bool_t hyp_segment_connected(rnd_coord_t begin_x, rnd_coord_t begin_y, rnd_coord_t end_x, rnd_coord_t end_y, outline_t * s) +rnd_bool_t hyp_segment_connected(rnd_coord_t begin_x, rnd_coord_t begin_y, rnd_coord_t end_x, rnd_coord_t end_y, outline_t * s) { outline_t *i; - pcb_bool_t connected; + rnd_bool_t connected; connected = (begin_x == end_x) && (begin_y == end_y); /* trivial case */ if (!connected) { /* recursive descent */ - s->used = pcb_true; + s->used = rnd_true; for (i = outline_head; i != NULL; i = i->next) { if (i->used) @@ -565,7 +565,7 @@ } } - s->used = pcb_false; + s->used = rnd_false; } return connected; @@ -670,14 +670,14 @@ void hyp_perimeter() { - pcb_bool_t warn_not_closed; - pcb_bool_t segment_found; - pcb_bool_t polygon_closed; + rnd_bool_t warn_not_closed; + rnd_bool_t segment_found; + rnd_bool_t polygon_closed; rnd_coord_t begin_x, begin_y, last_x, last_y; outline_t *i; outline_t *j; - warn_not_closed = pcb_false; + warn_not_closed = rnd_false; /* iterate over perimeter segments and adjust origin */ for (i = outline_head; i != NULL; i = i->next) { @@ -693,11 +693,11 @@ } /* iterate over perimeter polygons */ - while (pcb_true) { + while (rnd_true) { /* find first free segment */ for (i = outline_head; i != NULL; i = i->next) - if (i->used == pcb_false) + if (i->used == rnd_false) break; /* exit if no segments found */ @@ -713,10 +713,10 @@ last_y = i->y2; /* add segment */ - hyp_perimeter_segment_add(i, pcb_true); + hyp_perimeter_segment_add(i, rnd_true); /* add polygon segments until the polygon is closed */ - polygon_closed = pcb_false; + polygon_closed = rnd_false; while (!polygon_closed) { #undef XXX @@ -729,7 +729,7 @@ #endif /* find segment to add to current polygon */ - segment_found = pcb_false; + segment_found = rnd_false; /* XXX prefer closed polygon over open polyline */ @@ -741,8 +741,8 @@ if (!hyp_segment_connected(i->x2, i->y2, begin_x, begin_y, i)) continue; /* first point of segment is last point of current edge: add segment to edge */ - segment_found = pcb_true; - hyp_perimeter_segment_add(i, pcb_true); + segment_found = rnd_true; + hyp_perimeter_segment_add(i, rnd_true); last_x = i->x2; last_y = i->y2; } @@ -750,9 +750,9 @@ if (!hyp_segment_connected(i->x1, i->y1, begin_x, begin_y, i)) continue; /* last point of segment is last point of current edge: add segment to edge back to front */ - segment_found = pcb_true; + segment_found = rnd_true; /* add segment back to front */ - hyp_perimeter_segment_add(i, pcb_false); + hyp_perimeter_segment_add(i, rnd_false); last_x = i->x1; last_y = i->y1; } @@ -770,7 +770,7 @@ else { if (hyp_debug) rnd_message(RND_MSG_DEBUG, "outline: open\n"); - warn_not_closed = pcb_true; + warn_not_closed = rnd_true; } } @@ -934,7 +934,7 @@ * True if solder side */ -pcb_bool_t hyp_is_bottom_layer(char *layer_name) +rnd_bool_t hyp_is_bottom_layer(char *layer_name) { return ((layer_name != NULL) && (pcb_layer_flags(PCB, pcb_layer_by_name(PCB->Data, layer_name)) & PCB_LYT_BOTTOM)); } @@ -941,11 +941,11 @@ /* * Draw arc from (x1, y1) to (x2, y2) with center (xc, yc) and radius r. - * Direction of arc is clockwise or counter-clockwise, depending upon value of pcb_bool_t Clockwise. + * Direction of arc is clockwise or counter-clockwise, depending upon value of rnd_bool_t Clockwise. */ pcb_arc_t *hyp_arc_new(pcb_layer_t * Layer, rnd_coord_t X1, rnd_coord_t Y1, rnd_coord_t X2, rnd_coord_t Y2, rnd_coord_t XC, - rnd_coord_t YC, rnd_coord_t Width, rnd_coord_t Height, pcb_bool_t Clockwise, rnd_coord_t Thickness, + rnd_coord_t YC, rnd_coord_t Width, rnd_coord_t Height, rnd_bool_t Clockwise, rnd_coord_t Thickness, rnd_coord_t Clearance, pcb_flag_t Flags) { rnd_angle_t start_angle; @@ -974,7 +974,7 @@ delta = end_angle - start_angle; - new_arc = pcb_arc_new(Layer, XC, YC, Width, Height, start_angle, delta, Thickness, Clearance, Flags, pcb_true); + new_arc = pcb_arc_new(Layer, XC, YC, Width, Height, start_angle, delta, Thickness, Clearance, Flags, rnd_true); return new_arc; } @@ -984,7 +984,7 @@ * Arc may be clockwise or counterclockwise. Note pcb-rnd y-axis points downward. */ void hyp_arc2contour(pcb_pline_t * contour, rnd_coord_t x1, rnd_coord_t y1, rnd_coord_t x2, rnd_coord_t y2, rnd_coord_t xc, - rnd_coord_t yc, rnd_coord_t r, pcb_bool_t clockwise) + rnd_coord_t yc, rnd_coord_t r, rnd_bool_t clockwise) { rnd_coord_t arc_precision = PCB_MM_TO_COORD(0.254); /* mm */ int min_circle_segments = 8; /* 8 seems minimal, 16 seems more than sufficient. */ @@ -1113,7 +1113,7 @@ } else { /* draw clockwise arc from (x1, y2) to (x2, y2) */ - hyp_arc_new(layer, vrtx->x1, vrtx->y1, vrtx->x2, vrtx->y2, vrtx->xc, vrtx->yc, vrtx->r, vrtx->r, pcb_false, + hyp_arc_new(layer, vrtx->x1, vrtx->y1, vrtx->x2, vrtx->y2, vrtx->xc, vrtx->yc, vrtx->r, vrtx->r, rnd_false, polyline->line_width, polyline->clearance, pcb_no_flags()); /* move on */ if ((xpos == vrtx->x1) && (ypos == vrtx->y1)) { @@ -1136,7 +1136,7 @@ void hyp_draw_polygon(hyp_polygon_t * polygon) { pcb_layer_t *layer; - pcb_bool_t outer_contour; + rnd_bool_t outer_contour; hyp_vertex_t *vrtx; rnd_polyarea_t *polyarea = NULL; @@ -1154,7 +1154,7 @@ layer = pcb_get_layer(PCB->Data, hyp_create_layer(polygon->layer_name)); - outer_contour = pcb_true; + outer_contour = rnd_true; for (vrtx = polygon->vertex; vrtx != NULL; vrtx = vrtx->next) { pcb_vector_t v; @@ -1163,7 +1163,7 @@ if ((vrtx->is_first) || (vrtx->next == NULL)) { if (contour != NULL) { /* add contour to polyarea */ - pcb_poly_contour_pre(contour, pcb_false); + pcb_poly_contour_pre(contour, rnd_false); /* check contour valid */ if (pcb_polyarea_contour_check(contour) && hyp_debug) @@ -1177,7 +1177,7 @@ pcb_polyarea_contour_include(polyarea, contour); /* first contour is outer contour, remainder are holes */ - outer_contour = pcb_false; + outer_contour = rnd_false; } /* create new contour */ contour = pcb_poly_contour_new(v); @@ -1190,7 +1190,7 @@ pcb_poly_vertex_include(contour->head->prev, pcb_poly_node_create(v)); else /* arc. pcb polyarea contains line segments, not arc segments. convert arc segment to line segments. */ - hyp_arc2contour(contour, vrtx->x1, vrtx->y1, vrtx->x2, vrtx->y2, vrtx->xc, vrtx->yc, vrtx->r, pcb_false); + hyp_arc2contour(contour, vrtx->x1, vrtx->y1, vrtx->x2, vrtx->y2, vrtx->xc, vrtx->yc, vrtx->r, rnd_false); } } @@ -1394,8 +1394,8 @@ peri_seg->xc = 0; peri_seg->yc = 0; peri_seg->r = 0; - peri_seg->is_arc = pcb_false; - peri_seg->used = pcb_false; + peri_seg->is_arc = rnd_false; + peri_seg->used = rnd_false; peri_seg->next = NULL; if (hyp_debug) @@ -1440,8 +1440,8 @@ peri_arc->xc = xy2coord(h->xc); peri_arc->yc = xy2coord(h->yc); peri_arc->r = xy2coord(h->r); - peri_arc->is_arc = pcb_true; - peri_arc->used = pcb_false; + peri_arc->is_arc = rnd_true; + peri_arc->used = rnd_false; peri_arc->next = NULL; if (hyp_debug) @@ -1527,7 +1527,7 @@ if (hyp_debug) rnd_message(RND_MSG_DEBUG, "options: use_die_for_metal = %f\n", h->use_die_for_metal); if (h->use_die_for_metal) - use_die_for_metal = pcb_true; + use_die_for_metal = rnd_true; return 0; } @@ -1545,7 +1545,7 @@ signal_layer_id = hyp_create_layer(h->layer_name); - layer_is_plane[signal_layer_id] = pcb_false; + layer_is_plane[signal_layer_id] = rnd_false; if (h->plane_separation_set) layer_clearance[signal_layer_id] = xy2coord(h->plane_separation); @@ -1584,7 +1584,7 @@ plane_layer_id = hyp_create_layer(h->layer_name); - layer_is_plane[plane_layer_id] = pcb_true; + layer_is_plane[plane_layer_id] = rnd_true; if (h->plane_separation_set) layer_clearance[plane_layer_id] = xy2coord(h->plane_separation); @@ -2018,7 +2018,7 @@ } hyp_arc_new(hyp_get_layer(h), x2coord(h->x1), y2coord(h->y1), x2coord(h->x2), y2coord(h->y2), x2coord(h->xc), - y2coord(h->yc), xy2coord(h->r), xy2coord(h->r), pcb_true, xy2coord(h->width), hyp_clearance(h), pcb_no_flags()); + y2coord(h->yc), xy2coord(h->r), xy2coord(h->r), rnd_true, xy2coord(h->width), hyp_clearance(h), pcb_no_flags()); return 0; } @@ -2341,12 +2341,12 @@ if (!h->layer_name_set) { hyp_error("expected polygon layer L = "); - return pcb_true; + return rnd_true; } if (!h->id_set) { hyp_error("expected polygon id ID = "); - return pcb_true; + return rnd_true; } /* make sure layer exists */ @@ -2369,8 +2369,8 @@ new_vertex->xc = 0; new_vertex->yc = 0; new_vertex->r = 0; - new_vertex->is_arc = pcb_false; - new_vertex->is_first = pcb_true; + new_vertex->is_arc = rnd_false; + new_vertex->is_first = rnd_true; new_vertex->next = NULL; /* create new polygon */ @@ -2377,7 +2377,7 @@ new_poly = malloc(sizeof(hyp_polygon_t)); new_poly->hyp_poly_id = h->id; /* hyperlynx polygon/polyline id */ new_poly->hyp_poly_type = h->polygon_type; - new_poly->is_polygon = pcb_true; + new_poly->is_polygon = rnd_true; new_poly->layer_name = h->layer_name; new_poly->line_width = xy2coord(h->width); new_poly->clearance = hyp_clearance(h); @@ -2424,7 +2424,7 @@ if (!h->id_set) { hyp_error("expected polygon id ID = "); - return pcb_true; + return rnd_true; } /* look up polygon with this id */ @@ -2454,8 +2454,8 @@ new_vertex->xc = 0; new_vertex->yc = 0; new_vertex->r = 0; - new_vertex->is_arc = pcb_false; - new_vertex->is_first = pcb_true; + new_vertex->is_arc = rnd_false; + new_vertex->is_first = rnd_true; new_vertex->next = NULL; /* bookkeeping */ @@ -2520,17 +2520,17 @@ if (!h->layer_name_set) { hyp_error("expected polygon layer L = "); - return pcb_true; + return rnd_true; } if (!h->width_set) { hyp_error("expected polygon width W = "); - return pcb_true; + return rnd_true; } if (!h->id_set) { hyp_error("expected polygon id ID = "); - return pcb_true; + return rnd_true; } /* make sure layer exists */ @@ -2553,8 +2553,8 @@ new_vertex->xc = 0; new_vertex->yc = 0; new_vertex->r = 0; - new_vertex->is_arc = pcb_false; - new_vertex->is_first = pcb_true; + new_vertex->is_arc = rnd_false; + new_vertex->is_first = rnd_true; new_vertex->next = NULL; /* create new polyline */ @@ -2561,7 +2561,7 @@ new_poly = malloc(sizeof(hyp_polygon_t)); new_poly->hyp_poly_id = h->id; /* hyperlynx polygon/polyline id */ new_poly->hyp_poly_type = h->polygon_type; - new_poly->is_polygon = pcb_false; + new_poly->is_polygon = rnd_false; new_poly->layer_name = h->layer_name; new_poly->line_width = xy2coord(h->width); new_poly->clearance = hyp_clearance(h); @@ -2614,8 +2614,8 @@ new_vertex->xc = 0; new_vertex->yc = 0; new_vertex->r = 0; - new_vertex->is_arc = pcb_false; - new_vertex->is_first = pcb_false; + new_vertex->is_arc = rnd_false; + new_vertex->is_first = rnd_false; new_vertex->next = NULL; /* bookkeeping */ @@ -2652,8 +2652,8 @@ new_vertex->xc = x2coord(h->xc); new_vertex->yc = y2coord(h->yc); new_vertex->r = xy2coord(h->r); - new_vertex->is_arc = pcb_true; - new_vertex->is_first = pcb_false; + new_vertex->is_arc = rnd_true; + new_vertex->is_first = rnd_false; new_vertex->next = NULL; /* bookkeeping */ Index: parser.h =================================================================== --- parser.h (revision 31010) +++ parser.h (revision 31011) @@ -243,7 +243,7 @@ /* create arc, hyperlynx-style */ pcb_arc_t *hyp_arc_new(pcb_layer_t * Layer, rnd_coord_t X1, rnd_coord_t Y1, rnd_coord_t X2, rnd_coord_t Y2, rnd_coord_t XC, - rnd_coord_t YC, rnd_coord_t Width, rnd_coord_t Height, pcb_bool_t Clockwise, rnd_coord_t Thickness, + rnd_coord_t YC, rnd_coord_t Width, rnd_coord_t Height, rnd_bool_t Clockwise, rnd_coord_t Thickness, rnd_coord_t Clearance, pcb_flag_t Flags); #endif