Index: src_plugins/io_hyp/hyp_y.c =================================================================== --- src_plugins/io_hyp/hyp_y.c (revision 10440) +++ src_plugins/io_hyp/hyp_y.c (revision 10441) @@ -259,6 +259,7 @@ #include #include #include +#include "hyp_l.h" void hyyerror(const char *); @@ -273,7 +274,7 @@ static parse_param h; -#line 277 "hyp_y.c" /* yacc.c:358 */ +#line 278 "hyp_y.c" /* yacc.c:358 */ #ifdef short # undef short @@ -580,38 +581,38 @@ /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 127, 127, 128, 131, 132, 133, 134, 135, 136, - 137, 138, 139, 140, 141, 142, 143, 144, 145, 150, - 150, 155, 155, 160, 163, 164, 169, 172, 173, 176, - 177, 181, 181, 186, 187, 190, 191, 194, 195, 196, - 200, 201, 202, 205, 208, 211, 211, 211, 216, 219, - 220, 223, 224, 225, 226, 227, 230, 233, 233, 234, - 238, 238, 241, 242, 245, 246, 247, 248, 249, 250, - 251, 252, 253, 254, 257, 257, 260, 261, 264, 265, - 266, 267, 268, 269, 270, 271, 275, 275, 278, 279, - 282, 283, 284, 285, 286, 287, 288, 289, 290, 293, - 296, 299, 302, 305, 308, 311, 314, 317, 320, 323, - 328, 329, 332, 333, 336, 336, 336, 336, 337, 340, - 341, 345, 346, 350, 351, 355, 358, 359, 363, 366, - 369, 374, 377, 378, 381, 382, 385, 388, 393, 393, - 393, 396, 396, 397, 398, 401, 402, 405, 405, 406, - 409, 409, 410, 414, 414, 414, 417, 418, 419, 420, - 421, 422, 423, 420, 430, 430, 433, 433, 434, 438, - 439, 439, 443, 444, 447, 448, 449, 450, 451, 452, - 453, 454, 455, 456, 457, 458, 462, 462, 465, 465, - 468, 469, 473, 474, 478, 481, 484, 484, 488, 489, - 493, 495, 496, 497, 498, 499, 500, 501, 502, 503, - 504, 505, 506, 507, 508, 509, 513, 516, 519, 522, - 522, 525, 526, 530, 531, 535, 538, 539, 540, 541, - 545, 545, 548, 549, 553, 554, 555, 556, 557, 561, - 561, 564, 565, 569, 570, 571, 569, 576, 577, 576, - 581, 581, 583, 587, 587, 587, 591, 592, 596, 597, - 598, 599, 603, 607, 608, 609, 613, 613, 613, 617, - 617, 617, 621, 622, 626, 627, 628, 629, 633, 633, - 636, 636, 639, 639, 639, 644, 644, 647, 648, 652, - 653, 657, 658, 659, 663, 663, 666, 666, 666, 671, - 676, 676, 681, 681, 684, 684, 687, 687, 690, 693, - 693, 693 + 0, 128, 128, 129, 132, 133, 134, 135, 136, 137, + 138, 139, 140, 141, 142, 143, 144, 145, 146, 151, + 151, 156, 156, 161, 164, 165, 170, 173, 174, 177, + 178, 182, 182, 187, 188, 191, 192, 195, 196, 197, + 201, 202, 203, 206, 209, 212, 212, 212, 217, 220, + 221, 224, 225, 226, 227, 228, 231, 234, 234, 235, + 239, 239, 242, 243, 246, 247, 248, 249, 250, 251, + 252, 253, 254, 255, 258, 258, 261, 262, 265, 266, + 267, 268, 269, 270, 271, 272, 276, 276, 279, 280, + 283, 284, 285, 286, 287, 288, 289, 290, 291, 294, + 297, 300, 303, 306, 309, 312, 315, 318, 321, 324, + 329, 330, 333, 334, 337, 337, 337, 337, 338, 341, + 342, 346, 347, 351, 352, 356, 359, 360, 364, 367, + 370, 375, 378, 379, 382, 383, 386, 389, 394, 394, + 394, 397, 397, 398, 399, 402, 403, 406, 406, 407, + 410, 410, 411, 415, 415, 415, 418, 419, 420, 421, + 422, 423, 424, 421, 431, 431, 434, 434, 435, 439, + 440, 440, 444, 445, 448, 449, 450, 451, 452, 453, + 454, 455, 456, 457, 458, 459, 463, 463, 466, 466, + 469, 470, 474, 475, 479, 482, 485, 485, 489, 490, + 494, 496, 497, 498, 499, 500, 501, 502, 503, 504, + 505, 506, 507, 508, 509, 510, 514, 517, 520, 523, + 523, 526, 527, 531, 532, 536, 539, 540, 541, 542, + 546, 546, 549, 550, 554, 555, 556, 557, 558, 562, + 562, 565, 566, 570, 571, 572, 570, 577, 578, 577, + 582, 582, 584, 588, 588, 588, 592, 593, 597, 598, + 599, 600, 604, 608, 609, 610, 614, 614, 614, 618, + 618, 618, 622, 623, 627, 628, 629, 630, 634, 634, + 637, 637, 640, 640, 640, 645, 645, 648, 649, 653, + 654, 658, 659, 660, 664, 664, 667, 667, 667, 672, + 677, 677, 682, 682, 685, 685, 688, 688, 691, 694, + 694, 694 }; #endif @@ -1866,949 +1867,949 @@ switch (yyn) { case 19: -#line 150 "hyp_y.y" /* yacc.c:1646 */ +#line 151 "hyp_y.y" /* yacc.c:1646 */ { if (exec_board_file(&h)) YYERROR; } -#line 1872 "hyp_y.c" /* yacc.c:1646 */ +#line 1873 "hyp_y.c" /* yacc.c:1646 */ break; case 21: -#line 155 "hyp_y.y" /* yacc.c:1646 */ +#line 156 "hyp_y.y" /* yacc.c:1646 */ { h.vers = yylval.floatval; } -#line 1878 "hyp_y.c" /* yacc.c:1646 */ +#line 1879 "hyp_y.c" /* yacc.c:1646 */ break; case 22: -#line 155 "hyp_y.y" /* yacc.c:1646 */ +#line 156 "hyp_y.y" /* yacc.c:1646 */ { if (exec_version(&h)) YYERROR; } -#line 1884 "hyp_y.c" /* yacc.c:1646 */ +#line 1885 "hyp_y.c" /* yacc.c:1646 */ break; case 23: -#line 160 "hyp_y.y" /* yacc.c:1646 */ +#line 161 "hyp_y.y" /* yacc.c:1646 */ { if (exec_data_mode(&h)) YYERROR; } -#line 1890 "hyp_y.c" /* yacc.c:1646 */ +#line 1891 "hyp_y.c" /* yacc.c:1646 */ break; case 24: -#line 163 "hyp_y.y" /* yacc.c:1646 */ +#line 164 "hyp_y.y" /* yacc.c:1646 */ { h.detailed = pcb_false; } -#line 1896 "hyp_y.c" /* yacc.c:1646 */ +#line 1897 "hyp_y.c" /* yacc.c:1646 */ break; case 25: -#line 164 "hyp_y.y" /* yacc.c:1646 */ +#line 165 "hyp_y.y" /* yacc.c:1646 */ { h.detailed = pcb_true; } -#line 1902 "hyp_y.c" /* yacc.c:1646 */ +#line 1903 "hyp_y.c" /* yacc.c:1646 */ break; case 26: -#line 169 "hyp_y.y" /* yacc.c:1646 */ +#line 170 "hyp_y.y" /* yacc.c:1646 */ { if (exec_units(&h)) YYERROR; } -#line 1908 "hyp_y.c" /* yacc.c:1646 */ +#line 1909 "hyp_y.c" /* yacc.c:1646 */ break; case 27: -#line 172 "hyp_y.y" /* yacc.c:1646 */ +#line 173 "hyp_y.y" /* yacc.c:1646 */ { h.unit_system_english = pcb_true; } -#line 1914 "hyp_y.c" /* yacc.c:1646 */ +#line 1915 "hyp_y.c" /* yacc.c:1646 */ break; case 28: -#line 173 "hyp_y.y" /* yacc.c:1646 */ +#line 174 "hyp_y.y" /* yacc.c:1646 */ { h.unit_system_english = pcb_false; } -#line 1920 "hyp_y.c" /* yacc.c:1646 */ +#line 1921 "hyp_y.c" /* yacc.c:1646 */ break; case 29: -#line 176 "hyp_y.y" /* yacc.c:1646 */ +#line 177 "hyp_y.y" /* yacc.c:1646 */ { h.metal_thickness_weight = pcb_true; } -#line 1926 "hyp_y.c" /* yacc.c:1646 */ +#line 1927 "hyp_y.c" /* yacc.c:1646 */ break; case 30: -#line 177 "hyp_y.y" /* yacc.c:1646 */ +#line 178 "hyp_y.y" /* yacc.c:1646 */ { h.metal_thickness_weight = pcb_false; } -#line 1932 "hyp_y.c" /* yacc.c:1646 */ +#line 1933 "hyp_y.c" /* yacc.c:1646 */ break; case 31: -#line 181 "hyp_y.y" /* yacc.c:1646 */ +#line 182 "hyp_y.y" /* yacc.c:1646 */ { h.default_plane_separation = yylval.floatval; } -#line 1938 "hyp_y.c" /* yacc.c:1646 */ +#line 1939 "hyp_y.c" /* yacc.c:1646 */ break; case 32: -#line 181 "hyp_y.y" /* yacc.c:1646 */ +#line 182 "hyp_y.y" /* yacc.c:1646 */ { if (exec_plane_sep(&h)) YYERROR; } -#line 1944 "hyp_y.c" /* yacc.c:1646 */ +#line 1945 "hyp_y.c" /* yacc.c:1646 */ break; case 38: -#line 195 "hyp_y.y" /* yacc.c:1646 */ +#line 196 "hyp_y.y" /* yacc.c:1646 */ { hyyerror("warning: missing ')'"); } -#line 1950 "hyp_y.c" /* yacc.c:1646 */ +#line 1951 "hyp_y.c" /* yacc.c:1646 */ break; case 43: -#line 205 "hyp_y.y" /* yacc.c:1646 */ +#line 206 "hyp_y.y" /* yacc.c:1646 */ { if (exec_perimeter_segment(&h)) YYERROR; } -#line 1956 "hyp_y.c" /* yacc.c:1646 */ +#line 1957 "hyp_y.c" /* yacc.c:1646 */ break; case 44: -#line 208 "hyp_y.y" /* yacc.c:1646 */ +#line 209 "hyp_y.y" /* yacc.c:1646 */ { if (exec_perimeter_arc(&h)) YYERROR; } -#line 1962 "hyp_y.c" /* yacc.c:1646 */ +#line 1963 "hyp_y.c" /* yacc.c:1646 */ break; case 45: -#line 211 "hyp_y.y" /* yacc.c:1646 */ +#line 212 "hyp_y.y" /* yacc.c:1646 */ { h.name = yylval.strval; } -#line 1968 "hyp_y.c" /* yacc.c:1646 */ +#line 1969 "hyp_y.c" /* yacc.c:1646 */ break; case 46: -#line 211 "hyp_y.y" /* yacc.c:1646 */ +#line 212 "hyp_y.y" /* yacc.c:1646 */ { h.value = yylval.strval; } -#line 1974 "hyp_y.c" /* yacc.c:1646 */ +#line 1975 "hyp_y.c" /* yacc.c:1646 */ break; case 47: -#line 211 "hyp_y.y" /* yacc.c:1646 */ +#line 212 "hyp_y.y" /* yacc.c:1646 */ { if (exec_board_attribute(&h)) YYERROR; } -#line 1980 "hyp_y.c" /* yacc.c:1646 */ +#line 1981 "hyp_y.c" /* yacc.c:1646 */ break; case 56: -#line 230 "hyp_y.y" /* yacc.c:1646 */ +#line 231 "hyp_y.y" /* yacc.c:1646 */ { if (exec_options(&h)) YYERROR; } -#line 1986 "hyp_y.c" /* yacc.c:1646 */ +#line 1987 "hyp_y.c" /* yacc.c:1646 */ break; case 57: -#line 233 "hyp_y.y" /* yacc.c:1646 */ +#line 234 "hyp_y.y" /* yacc.c:1646 */ { h.use_die_for_metal = yylval.boolval; } -#line 1992 "hyp_y.c" /* yacc.c:1646 */ +#line 1993 "hyp_y.c" /* yacc.c:1646 */ break; case 60: -#line 238 "hyp_y.y" /* yacc.c:1646 */ +#line 239 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 1998 "hyp_y.c" /* yacc.c:1646 */ +#line 1999 "hyp_y.c" /* yacc.c:1646 */ break; case 61: -#line 238 "hyp_y.y" /* yacc.c:1646 */ +#line 239 "hyp_y.y" /* yacc.c:1646 */ { if (exec_signal(&h)) YYERROR; } -#line 2004 "hyp_y.c" /* yacc.c:1646 */ +#line 2005 "hyp_y.c" /* yacc.c:1646 */ break; case 66: -#line 247 "hyp_y.y" /* yacc.c:1646 */ +#line 248 "hyp_y.y" /* yacc.c:1646 */ { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = pcb_true; } -#line 2010 "hyp_y.c" /* yacc.c:1646 */ +#line 2011 "hyp_y.c" /* yacc.c:1646 */ break; case 74: -#line 257 "hyp_y.y" /* yacc.c:1646 */ +#line 258 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2016 "hyp_y.c" /* yacc.c:1646 */ +#line 2017 "hyp_y.c" /* yacc.c:1646 */ break; case 75: -#line 257 "hyp_y.y" /* yacc.c:1646 */ +#line 258 "hyp_y.y" /* yacc.c:1646 */ { if (exec_dielectric(&h)) YYERROR; } -#line 2022 "hyp_y.c" /* yacc.c:1646 */ +#line 2023 "hyp_y.c" /* yacc.c:1646 */ break; case 79: -#line 265 "hyp_y.y" /* yacc.c:1646 */ +#line 266 "hyp_y.y" /* yacc.c:1646 */ { h.epsilon_r = yylval.floatval; h.epsilon_r_set = pcb_true; } -#line 2028 "hyp_y.c" /* yacc.c:1646 */ +#line 2029 "hyp_y.c" /* yacc.c:1646 */ break; case 86: -#line 275 "hyp_y.y" /* yacc.c:1646 */ +#line 276 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2034 "hyp_y.c" /* yacc.c:1646 */ +#line 2035 "hyp_y.c" /* yacc.c:1646 */ break; case 87: -#line 275 "hyp_y.y" /* yacc.c:1646 */ +#line 276 "hyp_y.y" /* yacc.c:1646 */ { if (exec_plane(&h)) YYERROR; } -#line 2040 "hyp_y.c" /* yacc.c:1646 */ +#line 2041 "hyp_y.c" /* yacc.c:1646 */ break; case 91: -#line 283 "hyp_y.y" /* yacc.c:1646 */ +#line 284 "hyp_y.y" /* yacc.c:1646 */ { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = pcb_true; } -#line 2046 "hyp_y.c" /* yacc.c:1646 */ +#line 2047 "hyp_y.c" /* yacc.c:1646 */ break; case 99: -#line 293 "hyp_y.y" /* yacc.c:1646 */ +#line 294 "hyp_y.y" /* yacc.c:1646 */ { h.thickness = yylval.floatval; h.thickness_set = pcb_true; } -#line 2052 "hyp_y.c" /* yacc.c:1646 */ +#line 2053 "hyp_y.c" /* yacc.c:1646 */ break; case 100: -#line 296 "hyp_y.y" /* yacc.c:1646 */ +#line 297 "hyp_y.y" /* yacc.c:1646 */ { h.plating_thickness = yylval.floatval; h.plating_thickness_set = pcb_true; } -#line 2058 "hyp_y.c" /* yacc.c:1646 */ +#line 2059 "hyp_y.c" /* yacc.c:1646 */ break; case 101: -#line 299 "hyp_y.y" /* yacc.c:1646 */ +#line 300 "hyp_y.y" /* yacc.c:1646 */ { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = pcb_true; } -#line 2064 "hyp_y.c" /* yacc.c:1646 */ +#line 2065 "hyp_y.c" /* yacc.c:1646 */ break; case 102: -#line 302 "hyp_y.y" /* yacc.c:1646 */ +#line 303 "hyp_y.y" /* yacc.c:1646 */ { h.temperature_coefficient = yylval.floatval; h.temperature_coefficient_set = pcb_true; } -#line 2070 "hyp_y.c" /* yacc.c:1646 */ +#line 2071 "hyp_y.c" /* yacc.c:1646 */ break; case 103: -#line 305 "hyp_y.y" /* yacc.c:1646 */ +#line 306 "hyp_y.y" /* yacc.c:1646 */ { h.epsilon_r = yylval.floatval; h.epsilon_r_set = pcb_true; } -#line 2076 "hyp_y.c" /* yacc.c:1646 */ +#line 2077 "hyp_y.c" /* yacc.c:1646 */ break; case 104: -#line 308 "hyp_y.y" /* yacc.c:1646 */ +#line 309 "hyp_y.y" /* yacc.c:1646 */ { h.loss_tangent = yylval.floatval; h.loss_tangent_set = pcb_true; } -#line 2082 "hyp_y.c" /* yacc.c:1646 */ +#line 2083 "hyp_y.c" /* yacc.c:1646 */ break; case 105: -#line 311 "hyp_y.y" /* yacc.c:1646 */ +#line 312 "hyp_y.y" /* yacc.c:1646 */ { h.layer_name = yylval.strval; h.layer_name_set = pcb_true; } -#line 2088 "hyp_y.c" /* yacc.c:1646 */ +#line 2089 "hyp_y.c" /* yacc.c:1646 */ break; case 106: -#line 314 "hyp_y.y" /* yacc.c:1646 */ +#line 315 "hyp_y.y" /* yacc.c:1646 */ { h.material_name = yylval.strval; h.material_name_set = pcb_true; } -#line 2094 "hyp_y.c" /* yacc.c:1646 */ +#line 2095 "hyp_y.c" /* yacc.c:1646 */ break; case 107: -#line 317 "hyp_y.y" /* yacc.c:1646 */ +#line 318 "hyp_y.y" /* yacc.c:1646 */ { h.plane_separation = yylval.floatval; h.plane_separation_set = pcb_true; } -#line 2100 "hyp_y.c" /* yacc.c:1646 */ +#line 2101 "hyp_y.c" /* yacc.c:1646 */ break; case 108: -#line 320 "hyp_y.y" /* yacc.c:1646 */ +#line 321 "hyp_y.y" /* yacc.c:1646 */ { h.conformal = yylval.boolval; h.conformal_set = pcb_true; } -#line 2106 "hyp_y.c" /* yacc.c:1646 */ +#line 2107 "hyp_y.c" /* yacc.c:1646 */ break; case 109: -#line 323 "hyp_y.y" /* yacc.c:1646 */ +#line 324 "hyp_y.y" /* yacc.c:1646 */ { h.prepreg = yylval.boolval; h.prepreg_set = pcb_true; } -#line 2112 "hyp_y.c" /* yacc.c:1646 */ +#line 2113 "hyp_y.c" /* yacc.c:1646 */ break; case 114: -#line 336 "hyp_y.y" /* yacc.c:1646 */ +#line 337 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2118 "hyp_y.c" /* yacc.c:1646 */ +#line 2119 "hyp_y.c" /* yacc.c:1646 */ break; case 115: -#line 336 "hyp_y.y" /* yacc.c:1646 */ +#line 337 "hyp_y.y" /* yacc.c:1646 */ { h.device_type = yylval.strval; } -#line 2124 "hyp_y.c" /* yacc.c:1646 */ +#line 2125 "hyp_y.c" /* yacc.c:1646 */ break; case 116: -#line 336 "hyp_y.y" /* yacc.c:1646 */ +#line 337 "hyp_y.y" /* yacc.c:1646 */ { h.ref = yylval.strval; } -#line 2130 "hyp_y.c" /* yacc.c:1646 */ +#line 2131 "hyp_y.c" /* yacc.c:1646 */ break; case 117: -#line 336 "hyp_y.y" /* yacc.c:1646 */ +#line 337 "hyp_y.y" /* yacc.c:1646 */ { if (exec_devices(&h)) YYERROR; } -#line 2136 "hyp_y.c" /* yacc.c:1646 */ +#line 2137 "hyp_y.c" /* yacc.c:1646 */ break; case 125: -#line 355 "hyp_y.y" /* yacc.c:1646 */ +#line 356 "hyp_y.y" /* yacc.c:1646 */ { h.name = yylval.strval; h.name_set = pcb_true; } -#line 2142 "hyp_y.c" /* yacc.c:1646 */ +#line 2143 "hyp_y.c" /* yacc.c:1646 */ break; case 128: -#line 363 "hyp_y.y" /* yacc.c:1646 */ +#line 364 "hyp_y.y" /* yacc.c:1646 */ { h.value_float = yylval.floatval; h.value_float_set = pcb_true; } -#line 2148 "hyp_y.c" /* yacc.c:1646 */ +#line 2149 "hyp_y.c" /* yacc.c:1646 */ break; case 129: -#line 366 "hyp_y.y" /* yacc.c:1646 */ +#line 367 "hyp_y.y" /* yacc.c:1646 */ { h.value_string = yylval.strval; h.value_string_set = pcb_true; } -#line 2154 "hyp_y.c" /* yacc.c:1646 */ +#line 2155 "hyp_y.c" /* yacc.c:1646 */ break; case 130: -#line 369 "hyp_y.y" /* yacc.c:1646 */ +#line 370 "hyp_y.y" /* yacc.c:1646 */ { h.package = yylval.strval; h.package_set = pcb_true; } -#line 2160 "hyp_y.c" /* yacc.c:1646 */ +#line 2161 "hyp_y.c" /* yacc.c:1646 */ break; case 134: -#line 381 "hyp_y.y" /* yacc.c:1646 */ +#line 382 "hyp_y.y" /* yacc.c:1646 */ { if (exec_supplies(&h)) YYERROR; } -#line 2166 "hyp_y.c" /* yacc.c:1646 */ +#line 2167 "hyp_y.c" /* yacc.c:1646 */ break; case 136: -#line 385 "hyp_y.y" /* yacc.c:1646 */ +#line 386 "hyp_y.y" /* yacc.c:1646 */ { h.voltage_specified = yylval.boolval; } -#line 2172 "hyp_y.c" /* yacc.c:1646 */ +#line 2173 "hyp_y.c" /* yacc.c:1646 */ break; case 137: -#line 388 "hyp_y.y" /* yacc.c:1646 */ +#line 389 "hyp_y.y" /* yacc.c:1646 */ { h.conversion = yylval.boolval; } -#line 2178 "hyp_y.c" /* yacc.c:1646 */ +#line 2179 "hyp_y.c" /* yacc.c:1646 */ break; case 138: -#line 393 "hyp_y.y" /* yacc.c:1646 */ +#line 394 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2184 "hyp_y.c" /* yacc.c:1646 */ +#line 2185 "hyp_y.c" /* yacc.c:1646 */ break; case 139: -#line 393 "hyp_y.y" /* yacc.c:1646 */ +#line 394 "hyp_y.y" /* yacc.c:1646 */ { h.padstack_name = yylval.strval; h.padstack_name_set = pcb_true; } -#line 2190 "hyp_y.c" /* yacc.c:1646 */ +#line 2191 "hyp_y.c" /* yacc.c:1646 */ break; case 140: -#line 393 "hyp_y.y" /* yacc.c:1646 */ +#line 394 "hyp_y.y" /* yacc.c:1646 */ { if (exec_padstack_end(&h)) YYERROR; } -#line 2196 "hyp_y.c" /* yacc.c:1646 */ +#line 2197 "hyp_y.c" /* yacc.c:1646 */ break; case 141: -#line 396 "hyp_y.y" /* yacc.c:1646 */ +#line 397 "hyp_y.y" /* yacc.c:1646 */ { h.drill_size = yylval.floatval; h.drill_size_set = pcb_true; } -#line 2202 "hyp_y.c" /* yacc.c:1646 */ +#line 2203 "hyp_y.c" /* yacc.c:1646 */ break; case 147: -#line 405 "hyp_y.y" /* yacc.c:1646 */ +#line 406 "hyp_y.y" /* yacc.c:1646 */ { h.layer_name = yylval.strval; h.layer_name_set = pcb_true; } -#line 2208 "hyp_y.c" /* yacc.c:1646 */ +#line 2209 "hyp_y.c" /* yacc.c:1646 */ break; case 148: -#line 405 "hyp_y.y" /* yacc.c:1646 */ +#line 406 "hyp_y.y" /* yacc.c:1646 */ { if (exec_padstack_element(&h)) YYERROR; new_record(); } -#line 2214 "hyp_y.c" /* yacc.c:1646 */ +#line 2215 "hyp_y.c" /* yacc.c:1646 */ break; case 150: -#line 409 "hyp_y.y" /* yacc.c:1646 */ +#line 410 "hyp_y.y" /* yacc.c:1646 */ { h.pad_shape = yylval.floatval; } -#line 2220 "hyp_y.c" /* yacc.c:1646 */ +#line 2221 "hyp_y.c" /* yacc.c:1646 */ break; case 152: -#line 410 "hyp_y.y" /* yacc.c:1646 */ +#line 411 "hyp_y.y" /* yacc.c:1646 */ { h.pad_shape = -1; } -#line 2226 "hyp_y.c" /* yacc.c:1646 */ +#line 2227 "hyp_y.c" /* yacc.c:1646 */ break; case 153: -#line 414 "hyp_y.y" /* yacc.c:1646 */ +#line 415 "hyp_y.y" /* yacc.c:1646 */ { h.pad_sx = yylval.floatval; } -#line 2232 "hyp_y.c" /* yacc.c:1646 */ +#line 2233 "hyp_y.c" /* yacc.c:1646 */ break; case 154: -#line 414 "hyp_y.y" /* yacc.c:1646 */ +#line 415 "hyp_y.y" /* yacc.c:1646 */ { h.pad_sy = yylval.floatval; } -#line 2238 "hyp_y.c" /* yacc.c:1646 */ +#line 2239 "hyp_y.c" /* yacc.c:1646 */ break; case 155: -#line 414 "hyp_y.y" /* yacc.c:1646 */ +#line 415 "hyp_y.y" /* yacc.c:1646 */ { h.pad_angle = yylval.floatval; } -#line 2244 "hyp_y.c" /* yacc.c:1646 */ +#line 2245 "hyp_y.c" /* yacc.c:1646 */ break; case 157: -#line 418 "hyp_y.y" /* yacc.c:1646 */ +#line 419 "hyp_y.y" /* yacc.c:1646 */ { h.pad_type = PAD_TYPE_METAL; h.pad_type_set = pcb_true; } -#line 2250 "hyp_y.c" /* yacc.c:1646 */ +#line 2251 "hyp_y.c" /* yacc.c:1646 */ break; case 158: -#line 419 "hyp_y.y" /* yacc.c:1646 */ +#line 420 "hyp_y.y" /* yacc.c:1646 */ { h.pad_type = PAD_TYPE_ANTIPAD; h.pad_type_set = pcb_true; } -#line 2256 "hyp_y.c" /* yacc.c:1646 */ +#line 2257 "hyp_y.c" /* yacc.c:1646 */ break; case 159: -#line 420 "hyp_y.y" /* yacc.c:1646 */ +#line 421 "hyp_y.y" /* yacc.c:1646 */ { h.thermal_clear_shape = yylval.floatval; } -#line 2262 "hyp_y.c" /* yacc.c:1646 */ +#line 2263 "hyp_y.c" /* yacc.c:1646 */ break; case 160: -#line 421 "hyp_y.y" /* yacc.c:1646 */ +#line 422 "hyp_y.y" /* yacc.c:1646 */ { h.thermal_clear_sx = yylval.floatval; } -#line 2268 "hyp_y.c" /* yacc.c:1646 */ +#line 2269 "hyp_y.c" /* yacc.c:1646 */ break; case 161: -#line 422 "hyp_y.y" /* yacc.c:1646 */ +#line 423 "hyp_y.y" /* yacc.c:1646 */ { h.thermal_clear_sy = yylval.floatval; } -#line 2274 "hyp_y.c" /* yacc.c:1646 */ +#line 2275 "hyp_y.c" /* yacc.c:1646 */ break; case 162: -#line 423 "hyp_y.y" /* yacc.c:1646 */ +#line 424 "hyp_y.y" /* yacc.c:1646 */ { h.thermal_clear_angle = yylval.floatval; } -#line 2280 "hyp_y.c" /* yacc.c:1646 */ +#line 2281 "hyp_y.c" /* yacc.c:1646 */ break; case 163: -#line 424 "hyp_y.y" /* yacc.c:1646 */ +#line 425 "hyp_y.y" /* yacc.c:1646 */ { h.pad_type = PAD_TYPE_THERMAL_RELIEF; h.pad_type_set = pcb_true; } -#line 2286 "hyp_y.c" /* yacc.c:1646 */ +#line 2287 "hyp_y.c" /* yacc.c:1646 */ break; case 164: -#line 430 "hyp_y.y" /* yacc.c:1646 */ +#line 431 "hyp_y.y" /* yacc.c:1646 */ { h.net_name = yylval.strval; if (exec_net(&h)) YYERROR; } -#line 2292 "hyp_y.c" /* yacc.c:1646 */ +#line 2293 "hyp_y.c" /* yacc.c:1646 */ break; case 166: -#line 433 "hyp_y.y" /* yacc.c:1646 */ +#line 434 "hyp_y.y" /* yacc.c:1646 */ { if (exec_net_plane_separation(&h)) YYERROR; } -#line 2298 "hyp_y.c" /* yacc.c:1646 */ +#line 2299 "hyp_y.c" /* yacc.c:1646 */ break; case 170: -#line 439 "hyp_y.y" /* yacc.c:1646 */ +#line 440 "hyp_y.y" /* yacc.c:1646 */ { hyyerror("warning: empty net"); } -#line 2304 "hyp_y.c" /* yacc.c:1646 */ +#line 2305 "hyp_y.c" /* yacc.c:1646 */ break; case 186: -#line 462 "hyp_y.y" /* yacc.c:1646 */ +#line 463 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2310 "hyp_y.c" /* yacc.c:1646 */ +#line 2311 "hyp_y.c" /* yacc.c:1646 */ break; case 187: -#line 462 "hyp_y.y" /* yacc.c:1646 */ +#line 463 "hyp_y.y" /* yacc.c:1646 */ { if (exec_seg(&h)) YYERROR; } -#line 2316 "hyp_y.c" /* yacc.c:1646 */ +#line 2317 "hyp_y.c" /* yacc.c:1646 */ break; case 188: -#line 465 "hyp_y.y" /* yacc.c:1646 */ +#line 466 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2322 "hyp_y.c" /* yacc.c:1646 */ +#line 2323 "hyp_y.c" /* yacc.c:1646 */ break; case 189: -#line 465 "hyp_y.y" /* yacc.c:1646 */ +#line 466 "hyp_y.y" /* yacc.c:1646 */ { if (exec_arc(&h)) YYERROR; } -#line 2328 "hyp_y.c" /* yacc.c:1646 */ +#line 2329 "hyp_y.c" /* yacc.c:1646 */ break; case 194: -#line 478 "hyp_y.y" /* yacc.c:1646 */ +#line 479 "hyp_y.y" /* yacc.c:1646 */ { h.width = yylval.floatval; h.width_set = pcb_true; } -#line 2334 "hyp_y.c" /* yacc.c:1646 */ +#line 2335 "hyp_y.c" /* yacc.c:1646 */ break; case 195: -#line 481 "hyp_y.y" /* yacc.c:1646 */ +#line 482 "hyp_y.y" /* yacc.c:1646 */ { h.left_plane_separation = yylval.floatval; h.left_plane_separation_set = pcb_true; } -#line 2340 "hyp_y.c" /* yacc.c:1646 */ +#line 2341 "hyp_y.c" /* yacc.c:1646 */ break; case 196: -#line 484 "hyp_y.y" /* yacc.c:1646 */ +#line 485 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2346 "hyp_y.c" /* yacc.c:1646 */ +#line 2347 "hyp_y.c" /* yacc.c:1646 */ break; case 197: -#line 484 "hyp_y.y" /* yacc.c:1646 */ +#line 485 "hyp_y.y" /* yacc.c:1646 */ { if (exec_via(&h)) YYERROR; } -#line 2352 "hyp_y.c" /* yacc.c:1646 */ +#line 2353 "hyp_y.c" /* yacc.c:1646 */ break; case 201: -#line 495 "hyp_y.y" /* yacc.c:1646 */ +#line 496 "hyp_y.y" /* yacc.c:1646 */ { h.drill_size = yylval.floatval; h.drill_size_set = pcb_true; } -#line 2358 "hyp_y.c" /* yacc.c:1646 */ +#line 2359 "hyp_y.c" /* yacc.c:1646 */ break; case 204: -#line 498 "hyp_y.y" /* yacc.c:1646 */ +#line 499 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad_shape = yylval.strval; h.via_pad_shape_set = pcb_true; } -#line 2364 "hyp_y.c" /* yacc.c:1646 */ +#line 2365 "hyp_y.c" /* yacc.c:1646 */ break; case 205: -#line 499 "hyp_y.y" /* yacc.c:1646 */ +#line 500 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad_sx = yylval.floatval; h.via_pad_sx_set = pcb_true; } -#line 2370 "hyp_y.c" /* yacc.c:1646 */ +#line 2371 "hyp_y.c" /* yacc.c:1646 */ break; case 206: -#line 500 "hyp_y.y" /* yacc.c:1646 */ +#line 501 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad_sy = yylval.floatval; h.via_pad_sy_set = pcb_true; } -#line 2376 "hyp_y.c" /* yacc.c:1646 */ +#line 2377 "hyp_y.c" /* yacc.c:1646 */ break; case 207: -#line 501 "hyp_y.y" /* yacc.c:1646 */ +#line 502 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad_angle = yylval.floatval; h.via_pad_angle_set = pcb_true; } -#line 2382 "hyp_y.c" /* yacc.c:1646 */ +#line 2383 "hyp_y.c" /* yacc.c:1646 */ break; case 208: -#line 502 "hyp_y.y" /* yacc.c:1646 */ +#line 503 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad1_shape = yylval.strval; h.via_pad1_shape_set = pcb_true; } -#line 2388 "hyp_y.c" /* yacc.c:1646 */ +#line 2389 "hyp_y.c" /* yacc.c:1646 */ break; case 209: -#line 503 "hyp_y.y" /* yacc.c:1646 */ +#line 504 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad1_sx = yylval.floatval; h.via_pad1_sx_set = pcb_true; } -#line 2394 "hyp_y.c" /* yacc.c:1646 */ +#line 2395 "hyp_y.c" /* yacc.c:1646 */ break; case 210: -#line 504 "hyp_y.y" /* yacc.c:1646 */ +#line 505 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad1_sy = yylval.floatval; h.via_pad1_sy_set = pcb_true; } -#line 2400 "hyp_y.c" /* yacc.c:1646 */ +#line 2401 "hyp_y.c" /* yacc.c:1646 */ break; case 211: -#line 505 "hyp_y.y" /* yacc.c:1646 */ +#line 506 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad1_angle = yylval.floatval; h.via_pad1_angle_set = pcb_true; } -#line 2406 "hyp_y.c" /* yacc.c:1646 */ +#line 2407 "hyp_y.c" /* yacc.c:1646 */ break; case 212: -#line 506 "hyp_y.y" /* yacc.c:1646 */ +#line 507 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad2_shape = yylval.strval; h.via_pad2_shape_set = pcb_true; } -#line 2412 "hyp_y.c" /* yacc.c:1646 */ +#line 2413 "hyp_y.c" /* yacc.c:1646 */ break; case 213: -#line 507 "hyp_y.y" /* yacc.c:1646 */ +#line 508 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad2_sx = yylval.floatval; h.via_pad2_sx_set = pcb_true; } -#line 2418 "hyp_y.c" /* yacc.c:1646 */ +#line 2419 "hyp_y.c" /* yacc.c:1646 */ break; case 214: -#line 508 "hyp_y.y" /* yacc.c:1646 */ +#line 509 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad2_sy = yylval.floatval; h.via_pad2_sy_set = pcb_true; } -#line 2424 "hyp_y.c" /* yacc.c:1646 */ +#line 2425 "hyp_y.c" /* yacc.c:1646 */ break; case 215: -#line 509 "hyp_y.y" /* yacc.c:1646 */ +#line 510 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad2_angle = yylval.floatval; h.via_pad2_angle_set = pcb_true; } -#line 2430 "hyp_y.c" /* yacc.c:1646 */ +#line 2431 "hyp_y.c" /* yacc.c:1646 */ break; case 216: -#line 513 "hyp_y.y" /* yacc.c:1646 */ +#line 514 "hyp_y.y" /* yacc.c:1646 */ { h.padstack_name = yylval.strval; h.padstack_name_set = pcb_true; } -#line 2436 "hyp_y.c" /* yacc.c:1646 */ +#line 2437 "hyp_y.c" /* yacc.c:1646 */ break; case 217: -#line 516 "hyp_y.y" /* yacc.c:1646 */ +#line 517 "hyp_y.y" /* yacc.c:1646 */ { h.layer1_name = yylval.strval; h.layer1_name_set = pcb_true; } -#line 2442 "hyp_y.c" /* yacc.c:1646 */ +#line 2443 "hyp_y.c" /* yacc.c:1646 */ break; case 218: -#line 519 "hyp_y.y" /* yacc.c:1646 */ +#line 520 "hyp_y.y" /* yacc.c:1646 */ { h.layer2_name = yylval.strval; h.layer2_name_set = pcb_true; } -#line 2448 "hyp_y.c" /* yacc.c:1646 */ +#line 2449 "hyp_y.c" /* yacc.c:1646 */ break; case 219: -#line 522 "hyp_y.y" /* yacc.c:1646 */ +#line 523 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2454 "hyp_y.c" /* yacc.c:1646 */ +#line 2455 "hyp_y.c" /* yacc.c:1646 */ break; case 220: -#line 522 "hyp_y.y" /* yacc.c:1646 */ +#line 523 "hyp_y.y" /* yacc.c:1646 */ { if (exec_pin(&h)) YYERROR; } -#line 2460 "hyp_y.c" /* yacc.c:1646 */ +#line 2461 "hyp_y.c" /* yacc.c:1646 */ break; case 225: -#line 535 "hyp_y.y" /* yacc.c:1646 */ +#line 536 "hyp_y.y" /* yacc.c:1646 */ { h.pin_reference = yylval.strval; h.pin_reference_set = pcb_true; } -#line 2466 "hyp_y.c" /* yacc.c:1646 */ +#line 2467 "hyp_y.c" /* yacc.c:1646 */ break; case 226: -#line 538 "hyp_y.y" /* yacc.c:1646 */ +#line 539 "hyp_y.y" /* yacc.c:1646 */ { h.pin_function = PIN_SIM_OUT; h.pin_function_set = pcb_true; } -#line 2472 "hyp_y.c" /* yacc.c:1646 */ +#line 2473 "hyp_y.c" /* yacc.c:1646 */ break; case 227: -#line 539 "hyp_y.y" /* yacc.c:1646 */ +#line 540 "hyp_y.y" /* yacc.c:1646 */ { h.pin_function = PIN_SIM_IN; h.pin_function_set = pcb_true; } -#line 2478 "hyp_y.c" /* yacc.c:1646 */ +#line 2479 "hyp_y.c" /* yacc.c:1646 */ break; case 228: -#line 540 "hyp_y.y" /* yacc.c:1646 */ +#line 541 "hyp_y.y" /* yacc.c:1646 */ { h.pin_function = PIN_SIM_BOTH; h.pin_function_set = pcb_true; } -#line 2484 "hyp_y.c" /* yacc.c:1646 */ +#line 2485 "hyp_y.c" /* yacc.c:1646 */ break; case 229: -#line 541 "hyp_y.y" /* yacc.c:1646 */ +#line 542 "hyp_y.y" /* yacc.c:1646 */ { h.pin_function = PIN_SIM_BOTH; h.pin_function_set = pcb_true; hyyerror("warning: SIM_BOTH assumed"); } -#line 2490 "hyp_y.c" /* yacc.c:1646 */ +#line 2491 "hyp_y.c" /* yacc.c:1646 */ break; case 230: -#line 545 "hyp_y.y" /* yacc.c:1646 */ +#line 546 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2496 "hyp_y.c" /* yacc.c:1646 */ +#line 2497 "hyp_y.c" /* yacc.c:1646 */ break; case 231: -#line 545 "hyp_y.y" /* yacc.c:1646 */ +#line 546 "hyp_y.y" /* yacc.c:1646 */ { if (exec_pad(&h)) YYERROR; } -#line 2502 "hyp_y.c" /* yacc.c:1646 */ +#line 2503 "hyp_y.c" /* yacc.c:1646 */ break; case 235: -#line 554 "hyp_y.y" /* yacc.c:1646 */ +#line 555 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad_shape = yylval.strval; h.via_pad_shape_set = pcb_true; } -#line 2508 "hyp_y.c" /* yacc.c:1646 */ +#line 2509 "hyp_y.c" /* yacc.c:1646 */ break; case 236: -#line 555 "hyp_y.y" /* yacc.c:1646 */ +#line 556 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad_sx = yylval.floatval; h.via_pad_sx_set = pcb_true; } -#line 2514 "hyp_y.c" /* yacc.c:1646 */ +#line 2515 "hyp_y.c" /* yacc.c:1646 */ break; case 237: -#line 556 "hyp_y.y" /* yacc.c:1646 */ +#line 557 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad_sy = yylval.floatval; h.via_pad_sy_set = pcb_true; } -#line 2520 "hyp_y.c" /* yacc.c:1646 */ +#line 2521 "hyp_y.c" /* yacc.c:1646 */ break; case 238: -#line 557 "hyp_y.y" /* yacc.c:1646 */ +#line 558 "hyp_y.y" /* yacc.c:1646 */ { h.via_pad_angle = yylval.floatval; h.via_pad_angle_set = pcb_true; } -#line 2526 "hyp_y.c" /* yacc.c:1646 */ +#line 2527 "hyp_y.c" /* yacc.c:1646 */ break; case 239: -#line 561 "hyp_y.y" /* yacc.c:1646 */ +#line 562 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2532 "hyp_y.c" /* yacc.c:1646 */ +#line 2533 "hyp_y.c" /* yacc.c:1646 */ break; case 240: -#line 561 "hyp_y.y" /* yacc.c:1646 */ +#line 562 "hyp_y.y" /* yacc.c:1646 */ { if (exec_useg(&h)) YYERROR; } -#line 2538 "hyp_y.c" /* yacc.c:1646 */ +#line 2539 "hyp_y.c" /* yacc.c:1646 */ break; case 243: -#line 569 "hyp_y.y" /* yacc.c:1646 */ +#line 570 "hyp_y.y" /* yacc.c:1646 */ { h.zlayer_name = yylval.strval; h.zlayer_name_set = pcb_true; } -#line 2544 "hyp_y.c" /* yacc.c:1646 */ +#line 2545 "hyp_y.c" /* yacc.c:1646 */ break; case 244: -#line 570 "hyp_y.y" /* yacc.c:1646 */ +#line 571 "hyp_y.y" /* yacc.c:1646 */ { h.width = yylval.floatval; } -#line 2550 "hyp_y.c" /* yacc.c:1646 */ +#line 2551 "hyp_y.c" /* yacc.c:1646 */ break; case 245: -#line 571 "hyp_y.y" /* yacc.c:1646 */ +#line 572 "hyp_y.y" /* yacc.c:1646 */ { h.length = yylval.floatval; } -#line 2556 "hyp_y.c" /* yacc.c:1646 */ +#line 2557 "hyp_y.c" /* yacc.c:1646 */ break; case 247: -#line 576 "hyp_y.y" /* yacc.c:1646 */ +#line 577 "hyp_y.y" /* yacc.c:1646 */ { h.impedance = yylval.floatval; h.impedance_set = pcb_true; } -#line 2562 "hyp_y.c" /* yacc.c:1646 */ +#line 2563 "hyp_y.c" /* yacc.c:1646 */ break; case 248: -#line 577 "hyp_y.y" /* yacc.c:1646 */ +#line 578 "hyp_y.y" /* yacc.c:1646 */ { h.delay = yylval.floatval; } -#line 2568 "hyp_y.c" /* yacc.c:1646 */ +#line 2569 "hyp_y.c" /* yacc.c:1646 */ break; case 250: -#line 581 "hyp_y.y" /* yacc.c:1646 */ +#line 582 "hyp_y.y" /* yacc.c:1646 */ { h.resistance = yylval.floatval; h.resistance_set = pcb_true;} -#line 2574 "hyp_y.c" /* yacc.c:1646 */ +#line 2575 "hyp_y.c" /* yacc.c:1646 */ break; case 253: -#line 587 "hyp_y.y" /* yacc.c:1646 */ +#line 588 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2580 "hyp_y.c" /* yacc.c:1646 */ +#line 2581 "hyp_y.c" /* yacc.c:1646 */ break; case 254: -#line 587 "hyp_y.y" /* yacc.c:1646 */ +#line 588 "hyp_y.y" /* yacc.c:1646 */ { if (exec_polygon_begin(&h)) YYERROR; } -#line 2586 "hyp_y.c" /* yacc.c:1646 */ +#line 2587 "hyp_y.c" /* yacc.c:1646 */ break; case 255: -#line 588 "hyp_y.y" /* yacc.c:1646 */ +#line 589 "hyp_y.y" /* yacc.c:1646 */ { if (exec_polygon_end(&h)) YYERROR; } -#line 2592 "hyp_y.c" /* yacc.c:1646 */ +#line 2593 "hyp_y.c" /* yacc.c:1646 */ break; case 262: -#line 603 "hyp_y.y" /* yacc.c:1646 */ +#line 604 "hyp_y.y" /* yacc.c:1646 */ { h.id = yylval.intval; h.id_set = pcb_true; } -#line 2598 "hyp_y.c" /* yacc.c:1646 */ +#line 2599 "hyp_y.c" /* yacc.c:1646 */ break; case 263: -#line 607 "hyp_y.y" /* yacc.c:1646 */ +#line 608 "hyp_y.y" /* yacc.c:1646 */ { h.polygon_type = POLYGON_TYPE_POUR; h.polygon_type_set = pcb_true; } -#line 2604 "hyp_y.c" /* yacc.c:1646 */ +#line 2605 "hyp_y.c" /* yacc.c:1646 */ break; case 264: -#line 608 "hyp_y.y" /* yacc.c:1646 */ +#line 609 "hyp_y.y" /* yacc.c:1646 */ { h.polygon_type = POLYGON_TYPE_PLANE; h.polygon_type_set = pcb_true; } -#line 2610 "hyp_y.c" /* yacc.c:1646 */ +#line 2611 "hyp_y.c" /* yacc.c:1646 */ break; case 265: -#line 609 "hyp_y.y" /* yacc.c:1646 */ +#line 610 "hyp_y.y" /* yacc.c:1646 */ { h.polygon_type = POLYGON_TYPE_COPPER; h.polygon_type_set = pcb_true; } -#line 2616 "hyp_y.c" /* yacc.c:1646 */ +#line 2617 "hyp_y.c" /* yacc.c:1646 */ break; case 266: -#line 613 "hyp_y.y" /* yacc.c:1646 */ +#line 614 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2622 "hyp_y.c" /* yacc.c:1646 */ +#line 2623 "hyp_y.c" /* yacc.c:1646 */ break; case 267: -#line 613 "hyp_y.y" /* yacc.c:1646 */ +#line 614 "hyp_y.y" /* yacc.c:1646 */ { if (exec_polyvoid_begin(&h)) YYERROR; } -#line 2628 "hyp_y.c" /* yacc.c:1646 */ +#line 2629 "hyp_y.c" /* yacc.c:1646 */ break; case 268: -#line 614 "hyp_y.y" /* yacc.c:1646 */ +#line 615 "hyp_y.y" /* yacc.c:1646 */ { if (exec_polyvoid_end(&h)) YYERROR; } -#line 2634 "hyp_y.c" /* yacc.c:1646 */ +#line 2635 "hyp_y.c" /* yacc.c:1646 */ break; case 269: -#line 617 "hyp_y.y" /* yacc.c:1646 */ +#line 618 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2640 "hyp_y.c" /* yacc.c:1646 */ +#line 2641 "hyp_y.c" /* yacc.c:1646 */ break; case 270: -#line 617 "hyp_y.y" /* yacc.c:1646 */ +#line 618 "hyp_y.y" /* yacc.c:1646 */ { if (exec_polyline_begin(&h)) YYERROR; } -#line 2646 "hyp_y.c" /* yacc.c:1646 */ +#line 2647 "hyp_y.c" /* yacc.c:1646 */ break; case 271: -#line 618 "hyp_y.y" /* yacc.c:1646 */ +#line 619 "hyp_y.y" /* yacc.c:1646 */ { if (exec_polyline_end(&h)) YYERROR; } -#line 2652 "hyp_y.c" /* yacc.c:1646 */ +#line 2653 "hyp_y.c" /* yacc.c:1646 */ break; case 276: -#line 628 "hyp_y.y" /* yacc.c:1646 */ +#line 629 "hyp_y.y" /* yacc.c:1646 */ { hyyerror("warning: unexpected ')'"); } -#line 2658 "hyp_y.c" /* yacc.c:1646 */ +#line 2659 "hyp_y.c" /* yacc.c:1646 */ break; case 278: -#line 633 "hyp_y.y" /* yacc.c:1646 */ +#line 634 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2664 "hyp_y.c" /* yacc.c:1646 */ +#line 2665 "hyp_y.c" /* yacc.c:1646 */ break; case 279: -#line 633 "hyp_y.y" /* yacc.c:1646 */ +#line 634 "hyp_y.y" /* yacc.c:1646 */ { if (exec_line(&h)) YYERROR; } -#line 2670 "hyp_y.c" /* yacc.c:1646 */ +#line 2671 "hyp_y.c" /* yacc.c:1646 */ break; case 280: -#line 636 "hyp_y.y" /* yacc.c:1646 */ +#line 637 "hyp_y.y" /* yacc.c:1646 */ { new_record(); } -#line 2676 "hyp_y.c" /* yacc.c:1646 */ +#line 2677 "hyp_y.c" /* yacc.c:1646 */ break; case 281: -#line 636 "hyp_y.y" /* yacc.c:1646 */ +#line 637 "hyp_y.y" /* yacc.c:1646 */ { if (exec_curve(&h)) YYERROR; } -#line 2682 "hyp_y.c" /* yacc.c:1646 */ +#line 2683 "hyp_y.c" /* yacc.c:1646 */ break; case 282: -#line 639 "hyp_y.y" /* yacc.c:1646 */ +#line 640 "hyp_y.y" /* yacc.c:1646 */ { h.name = yylval.strval; } -#line 2688 "hyp_y.c" /* yacc.c:1646 */ +#line 2689 "hyp_y.c" /* yacc.c:1646 */ break; case 283: -#line 639 "hyp_y.y" /* yacc.c:1646 */ +#line 640 "hyp_y.y" /* yacc.c:1646 */ { h.value = yylval.strval; } -#line 2694 "hyp_y.c" /* yacc.c:1646 */ +#line 2695 "hyp_y.c" /* yacc.c:1646 */ break; case 284: -#line 639 "hyp_y.y" /* yacc.c:1646 */ +#line 640 "hyp_y.y" /* yacc.c:1646 */ { if (exec_net_attribute(&h)) YYERROR; } -#line 2700 "hyp_y.c" /* yacc.c:1646 */ +#line 2701 "hyp_y.c" /* yacc.c:1646 */ break; case 285: -#line 644 "hyp_y.y" /* yacc.c:1646 */ +#line 645 "hyp_y.y" /* yacc.c:1646 */ { h.net_class_name = yylval.strval; if (exec_net_class(&h)) YYERROR; } -#line 2706 "hyp_y.c" /* yacc.c:1646 */ +#line 2707 "hyp_y.c" /* yacc.c:1646 */ break; case 294: -#line 663 "hyp_y.y" /* yacc.c:1646 */ +#line 664 "hyp_y.y" /* yacc.c:1646 */ { h.net_name = yylval.strval; } -#line 2712 "hyp_y.c" /* yacc.c:1646 */ +#line 2713 "hyp_y.c" /* yacc.c:1646 */ break; case 295: -#line 663 "hyp_y.y" /* yacc.c:1646 */ +#line 664 "hyp_y.y" /* yacc.c:1646 */ { if (exec_net_class_element(&h)) YYERROR; } -#line 2718 "hyp_y.c" /* yacc.c:1646 */ +#line 2719 "hyp_y.c" /* yacc.c:1646 */ break; case 296: -#line 666 "hyp_y.y" /* yacc.c:1646 */ +#line 667 "hyp_y.y" /* yacc.c:1646 */ { h.name = yylval.strval; } -#line 2724 "hyp_y.c" /* yacc.c:1646 */ +#line 2725 "hyp_y.c" /* yacc.c:1646 */ break; case 297: -#line 666 "hyp_y.y" /* yacc.c:1646 */ +#line 667 "hyp_y.y" /* yacc.c:1646 */ { h.value = yylval.strval; } -#line 2730 "hyp_y.c" /* yacc.c:1646 */ +#line 2731 "hyp_y.c" /* yacc.c:1646 */ break; case 298: -#line 666 "hyp_y.y" /* yacc.c:1646 */ +#line 667 "hyp_y.y" /* yacc.c:1646 */ { if (exec_net_class_attribute(&h)) YYERROR; } -#line 2736 "hyp_y.c" /* yacc.c:1646 */ +#line 2737 "hyp_y.c" /* yacc.c:1646 */ break; case 299: -#line 671 "hyp_y.y" /* yacc.c:1646 */ +#line 672 "hyp_y.y" /* yacc.c:1646 */ { if (exec_end(&h)) YYERROR; } -#line 2742 "hyp_y.c" /* yacc.c:1646 */ +#line 2743 "hyp_y.c" /* yacc.c:1646 */ break; case 300: -#line 676 "hyp_y.y" /* yacc.c:1646 */ +#line 677 "hyp_y.y" /* yacc.c:1646 */ { h.key = yylval.strval; } -#line 2748 "hyp_y.c" /* yacc.c:1646 */ +#line 2749 "hyp_y.c" /* yacc.c:1646 */ break; case 301: -#line 676 "hyp_y.y" /* yacc.c:1646 */ +#line 677 "hyp_y.y" /* yacc.c:1646 */ { if (exec_key(&h)) YYERROR; } -#line 2754 "hyp_y.c" /* yacc.c:1646 */ +#line 2755 "hyp_y.c" /* yacc.c:1646 */ break; case 302: -#line 681 "hyp_y.y" /* yacc.c:1646 */ +#line 682 "hyp_y.y" /* yacc.c:1646 */ { h.x = yylval.floatval; } -#line 2760 "hyp_y.c" /* yacc.c:1646 */ +#line 2761 "hyp_y.c" /* yacc.c:1646 */ break; case 303: -#line 681 "hyp_y.y" /* yacc.c:1646 */ +#line 682 "hyp_y.y" /* yacc.c:1646 */ { h.y = yylval.floatval; } -#line 2766 "hyp_y.c" /* yacc.c:1646 */ +#line 2767 "hyp_y.c" /* yacc.c:1646 */ break; case 304: -#line 684 "hyp_y.y" /* yacc.c:1646 */ +#line 685 "hyp_y.y" /* yacc.c:1646 */ { h.x1 = yylval.floatval; } -#line 2772 "hyp_y.c" /* yacc.c:1646 */ +#line 2773 "hyp_y.c" /* yacc.c:1646 */ break; case 305: -#line 684 "hyp_y.y" /* yacc.c:1646 */ +#line 685 "hyp_y.y" /* yacc.c:1646 */ { h.y1 = yylval.floatval; } -#line 2778 "hyp_y.c" /* yacc.c:1646 */ +#line 2779 "hyp_y.c" /* yacc.c:1646 */ break; case 306: -#line 687 "hyp_y.y" /* yacc.c:1646 */ +#line 688 "hyp_y.y" /* yacc.c:1646 */ { h.x2 = yylval.floatval; } -#line 2784 "hyp_y.c" /* yacc.c:1646 */ +#line 2785 "hyp_y.c" /* yacc.c:1646 */ break; case 307: -#line 687 "hyp_y.y" /* yacc.c:1646 */ +#line 688 "hyp_y.y" /* yacc.c:1646 */ { h.y2 = yylval.floatval; } -#line 2790 "hyp_y.c" /* yacc.c:1646 */ +#line 2791 "hyp_y.c" /* yacc.c:1646 */ break; case 309: -#line 693 "hyp_y.y" /* yacc.c:1646 */ +#line 694 "hyp_y.y" /* yacc.c:1646 */ { h.xc = yylval.floatval; } -#line 2796 "hyp_y.c" /* yacc.c:1646 */ +#line 2797 "hyp_y.c" /* yacc.c:1646 */ break; case 310: -#line 693 "hyp_y.y" /* yacc.c:1646 */ +#line 694 "hyp_y.y" /* yacc.c:1646 */ { h.yc = yylval.floatval; } -#line 2802 "hyp_y.c" /* yacc.c:1646 */ +#line 2803 "hyp_y.c" /* yacc.c:1646 */ break; case 311: -#line 693 "hyp_y.y" /* yacc.c:1646 */ +#line 694 "hyp_y.y" /* yacc.c:1646 */ { h.r = yylval.floatval; } -#line 2808 "hyp_y.c" /* yacc.c:1646 */ +#line 2809 "hyp_y.c" /* yacc.c:1646 */ break; -#line 2812 "hyp_y.c" /* yacc.c:1646 */ +#line 2813 "hyp_y.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -3036,7 +3037,7 @@ #endif return yyresult; } -#line 695 "hyp_y.y" /* yacc.c:1906 */ +#line 696 "hyp_y.y" /* yacc.c:1906 */ /* Index: src_plugins/io_hyp/hyp_y.y =================================================================== --- src_plugins/io_hyp/hyp_y.y (revision 10440) +++ src_plugins/io_hyp/hyp_y.y (revision 10441) @@ -39,6 +39,7 @@ #include #include #include +#include "hyp_l.h" void hyyerror(const char *); Index: src_plugins/io_hyp/parser.c =================================================================== --- src_plugins/io_hyp/parser.c (revision 10440) +++ src_plugins/io_hyp/parser.c (revision 10441) @@ -329,6 +329,9 @@ /* set shared board */ hyp_dest = dest; + /* reset line number to first line */ + hyyset_lineno(1); + /* parse hyperlynx file */ hyyin = fopen(fname, "r"); if (hyyin == NULL)