Index: parse_y.c =================================================================== --- parse_y.c (revision 23600) +++ parse_y.c (revision 23601) @@ -599,27 +599,27 @@ static const yytype_uint16 yyrline[] = { 0, 145, 145, 146, 147, 148, 152, 152, 226, 226, - 247, 247, 266, 267, 272, 272, 294, 296, 306, 313, - 320, 330, 331, 332, 335, 343, 358, 373, 377, 381, - 384, 386, 393, 395, 401, 403, 404, 405, 409, 419, - 430, 442, 446, 451, 455, 459, 463, 472, 481, 485, - 486, 490, 491, 495, 496, 496, 497, 498, 500, 500, - 507, 511, 512, 513, 514, 515, 520, 530, 541, 551, - 561, 577, 582, 592, 591, 622, 623, 627, 628, 632, - 633, 634, 635, 636, 637, 639, 644, 645, 646, 647, - 647, 648, 652, 661, 670, 681, 690, 699, 708, 718, - 736, 761, 760, 799, 801, 806, 805, 812, 814, 819, - 823, 830, 831, 832, 833, 834, 842, 841, 860, 859, - 878, 877, 898, 896, 920, 918, 943, 944, 948, 949, - 950, 951, 952, 954, 959, 964, 969, 974, 979, 984, - 984, 988, 989, 993, 994, 995, 996, 998, 1004, 1011, - 1016, 1021, 1021, 1027, 1040, 1052, 1063, 1079, 1098, 1113, - 1126, 1137, 1148, 1149, 1153, 1154, 1157, 1159, 1175, 1194, - 1195, 1198, 1200, 1201, 1206, 1213, 1219, 1220, 1224, 1229, - 1230, 1234, 1235, 1241, 1240, 1252, 1253, 1257, 1258, 1262, - 1279, 1280, 1284, 1289, 1290, 1294, 1295, 1310, 1311, 1312, - 1316, 1329, 1330, 1334, 1335, 1340, 1341, 1342, 1343, 1344, - 1345, 1346, 1347, 1348, 1349 + 247, 247, 266, 267, 272, 272, 292, 294, 304, 311, + 318, 328, 329, 330, 333, 341, 356, 371, 375, 379, + 382, 384, 391, 393, 399, 401, 402, 403, 407, 417, + 428, 440, 444, 449, 453, 457, 461, 470, 479, 483, + 484, 488, 489, 493, 494, 494, 495, 496, 498, 498, + 505, 509, 510, 511, 512, 513, 518, 528, 539, 549, + 559, 575, 580, 590, 589, 620, 621, 625, 626, 630, + 631, 632, 633, 634, 635, 637, 642, 643, 644, 645, + 645, 646, 650, 659, 668, 679, 688, 697, 706, 716, + 734, 759, 758, 797, 799, 804, 803, 810, 812, 817, + 821, 828, 829, 830, 831, 832, 840, 839, 858, 857, + 876, 875, 896, 894, 918, 916, 941, 942, 946, 947, + 948, 949, 950, 952, 957, 962, 967, 972, 977, 982, + 982, 986, 987, 991, 992, 993, 994, 996, 1002, 1009, + 1014, 1019, 1019, 1025, 1038, 1050, 1061, 1077, 1096, 1111, + 1124, 1135, 1146, 1147, 1151, 1152, 1155, 1157, 1173, 1192, + 1193, 1196, 1198, 1199, 1204, 1211, 1217, 1218, 1222, 1227, + 1228, 1232, 1233, 1239, 1238, 1250, 1251, 1255, 1256, 1260, + 1277, 1278, 1282, 1287, 1288, 1292, 1293, 1308, 1309, 1310, + 1314, 1327, 1328, 1332, 1333, 1338, 1339, 1340, 1341, 1342, + 1343, 1344, 1345, 1346, 1347 }; #endif @@ -1921,8 +1921,6 @@ #line 272 "parse_y.y" /* yacc.c:1646 */ { /* mark all symbols invalid */ - int i; - if (!yyFont) { pcb_message(PCB_MSG_ERROR, "illegal fileformat\n"); @@ -1934,20 +1932,20 @@ } *yyFontkitValid = pcb_false; } -#line 1938 "parse_y.c" /* yacc.c:1646 */ +#line 1936 "parse_y.c" /* yacc.c:1646 */ break; case 15: -#line 288 "parse_y.y" /* yacc.c:1646 */ +#line 286 "parse_y.y" /* yacc.c:1646 */ { *yyFontkitValid = pcb_true; pcb_font_set_info(yyFont); } -#line 1947 "parse_y.c" /* yacc.c:1646 */ +#line 1945 "parse_y.c" /* yacc.c:1646 */ break; case 17: -#line 297 "parse_y.y" /* yacc.c:1646 */ +#line 295 "parse_y.y" /* yacc.c:1646 */ { if (check_file_version ((yyvsp[-1].integer)) != 0) { @@ -1954,11 +1952,11 @@ YYABORT; } } -#line 1958 "parse_y.c" /* yacc.c:1646 */ +#line 1956 "parse_y.c" /* yacc.c:1646 */ break; case 18: -#line 307 "parse_y.y" /* yacc.c:1646 */ +#line 305 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Name = (yyvsp[-1].string); yyPCB->MaxWidth = PCB_MAX_COORD; @@ -1965,11 +1963,11 @@ yyPCB->MaxHeight = PCB_MAX_COORD; old_fmt = 1; } -#line 1969 "parse_y.c" /* yacc.c:1646 */ +#line 1967 "parse_y.c" /* yacc.c:1646 */ break; case 19: -#line 314 "parse_y.y" /* yacc.c:1646 */ +#line 312 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Name = (yyvsp[-3].string); yyPCB->MaxWidth = OU ((yyvsp[-2].measure)); @@ -1976,11 +1974,11 @@ yyPCB->MaxHeight = OU ((yyvsp[-1].measure)); old_fmt = 1; } -#line 1980 "parse_y.c" /* yacc.c:1646 */ +#line 1978 "parse_y.c" /* yacc.c:1646 */ break; case 20: -#line 321 "parse_y.y" /* yacc.c:1646 */ +#line 319 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Name = (yyvsp[-3].string); yyPCB->MaxWidth = NU ((yyvsp[-2].measure)); @@ -1987,21 +1985,21 @@ yyPCB->MaxHeight = NU ((yyvsp[-1].measure)); old_fmt = 0; } -#line 1991 "parse_y.c" /* yacc.c:1646 */ +#line 1989 "parse_y.c" /* yacc.c:1646 */ break; case 24: -#line 336 "parse_y.y" /* yacc.c:1646 */ +#line 334 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Grid = OU ((yyvsp[-3].measure)); yyPCB->GridOffsetX = OU ((yyvsp[-2].measure)); yyPCB->GridOffsetY = OU ((yyvsp[-1].measure)); } -#line 2001 "parse_y.c" /* yacc.c:1646 */ +#line 1999 "parse_y.c" /* yacc.c:1646 */ break; case 25: -#line 344 "parse_y.y" /* yacc.c:1646 */ +#line 342 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Grid = OU ((yyvsp[-4].measure)); yyPCB->GridOffsetX = OU ((yyvsp[-3].measure)); @@ -2013,11 +2011,11 @@ conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", POL_OVERWRITE); } } -#line 2017 "parse_y.c" /* yacc.c:1646 */ +#line 2015 "parse_y.c" /* yacc.c:1646 */ break; case 26: -#line 359 "parse_y.y" /* yacc.c:1646 */ +#line 357 "parse_y.y" /* yacc.c:1646 */ { yyPCB->Grid = NU ((yyvsp[-4].measure)); yyPCB->GridOffsetX = NU ((yyvsp[-3].measure)); @@ -2029,44 +2027,44 @@ conf_set(yy_settings_dest, "editor/draw_grid", -1, "false", POL_OVERWRITE); } } -#line 2033 "parse_y.c" /* yacc.c:1646 */ +#line 2031 "parse_y.c" /* yacc.c:1646 */ break; case 27: -#line 374 "parse_y.y" /* yacc.c:1646 */ +#line 372 "parse_y.y" /* yacc.c:1646 */ { /* Not loading cursor position and zoom anymore */ } -#line 2041 "parse_y.c" /* yacc.c:1646 */ +#line 2039 "parse_y.c" /* yacc.c:1646 */ break; case 28: -#line 378 "parse_y.y" /* yacc.c:1646 */ +#line 376 "parse_y.y" /* yacc.c:1646 */ { /* Not loading cursor position and zoom anymore */ } -#line 2049 "parse_y.c" /* yacc.c:1646 */ +#line 2047 "parse_y.c" /* yacc.c:1646 */ break; case 31: -#line 387 "parse_y.y" /* yacc.c:1646 */ +#line 385 "parse_y.y" /* yacc.c:1646 */ { /* Read in cmil^2 for now; in future this should be a noop. */ load_meta_float("design/poly_isle_area", PCB_MIL_TO_COORD(PCB_MIL_TO_COORD ((yyvsp[-1].number)) / 100.0) / 100.0); } -#line 2058 "parse_y.c" /* yacc.c:1646 */ +#line 2056 "parse_y.c" /* yacc.c:1646 */ break; case 33: -#line 396 "parse_y.y" /* yacc.c:1646 */ +#line 394 "parse_y.y" /* yacc.c:1646 */ { yyPCB->ThermScale = (yyvsp[-1].number); } -#line 2066 "parse_y.c" /* yacc.c:1646 */ +#line 2064 "parse_y.c" /* yacc.c:1646 */ break; case 38: -#line 410 "parse_y.y" /* yacc.c:1646 */ +#line 408 "parse_y.y" /* yacc.c:1646 */ { load_meta_coord("design/bloat", NU((yyvsp[-3].measure))); load_meta_coord("design/shrink", NU((yyvsp[-2].measure))); @@ -2073,11 +2071,11 @@ load_meta_coord("design/min_wid", NU((yyvsp[-1].measure))); load_meta_coord("design/min_ring", NU((yyvsp[-1].measure))); } -#line 2077 "parse_y.c" /* yacc.c:1646 */ +#line 2075 "parse_y.c" /* yacc.c:1646 */ break; case 39: -#line 420 "parse_y.y" /* yacc.c:1646 */ +#line 418 "parse_y.y" /* yacc.c:1646 */ { load_meta_coord("design/bloat", NU((yyvsp[-4].measure))); load_meta_coord("design/shrink", NU((yyvsp[-3].measure))); @@ -2085,11 +2083,11 @@ load_meta_coord("design/min_slk", NU((yyvsp[-1].measure))); load_meta_coord("design/min_ring", NU((yyvsp[-2].measure))); } -#line 2089 "parse_y.c" /* yacc.c:1646 */ +#line 2087 "parse_y.c" /* yacc.c:1646 */ break; case 40: -#line 431 "parse_y.y" /* yacc.c:1646 */ +#line 429 "parse_y.y" /* yacc.c:1646 */ { load_meta_coord("design/bloat", NU((yyvsp[-6].measure))); load_meta_coord("design/shrink", NU((yyvsp[-5].measure))); @@ -2098,36 +2096,36 @@ load_meta_coord("design/min_drill", NU((yyvsp[-2].measure))); load_meta_coord("design/min_ring", NU((yyvsp[-1].measure))); } -#line 2102 "parse_y.c" /* yacc.c:1646 */ +#line 2100 "parse_y.c" /* yacc.c:1646 */ break; case 41: -#line 443 "parse_y.y" /* yacc.c:1646 */ +#line 441 "parse_y.y" /* yacc.c:1646 */ { yy_pcb_flags = pcb_flag_make((yyvsp[-1].integer) & PCB_FLAGS); } -#line 2110 "parse_y.c" /* yacc.c:1646 */ +#line 2108 "parse_y.c" /* yacc.c:1646 */ break; case 42: -#line 447 "parse_y.y" /* yacc.c:1646 */ +#line 445 "parse_y.y" /* yacc.c:1646 */ { yy_pcb_flags = pcb_strflg_board_s2f((yyvsp[-1].string), yyerror); free((yyvsp[-1].string)); } -#line 2119 "parse_y.c" /* yacc.c:1646 */ +#line 2117 "parse_y.c" /* yacc.c:1646 */ break; case 44: -#line 456 "parse_y.y" /* yacc.c:1646 */ +#line 454 "parse_y.y" /* yacc.c:1646 */ { layer_group_string = (yyvsp[-1].string); } -#line 2127 "parse_y.c" /* yacc.c:1646 */ +#line 2125 "parse_y.c" /* yacc.c:1646 */ break; case 46: -#line 464 "parse_y.y" /* yacc.c:1646 */ +#line 462 "parse_y.y" /* yacc.c:1646 */ { if (pcb_route_string_parse((yyvsp[-1].string), &yyPCB->RouteStyle, "mil")) { @@ -2136,11 +2134,11 @@ } free((yyvsp[-1].string)); } -#line 2140 "parse_y.c" /* yacc.c:1646 */ +#line 2138 "parse_y.c" /* yacc.c:1646 */ break; case 47: -#line 473 "parse_y.y" /* yacc.c:1646 */ +#line 471 "parse_y.y" /* yacc.c:1646 */ { if (pcb_route_string_parse(((yyvsp[-1].string) == NULL ? "" : (yyvsp[-1].string)), &yyPCB->RouteStyle, "cmil")) { @@ -2149,17 +2147,17 @@ } free((yyvsp[-1].string)); } -#line 2153 "parse_y.c" /* yacc.c:1646 */ +#line 2151 "parse_y.c" /* yacc.c:1646 */ break; case 54: -#line 496 "parse_y.y" /* yacc.c:1646 */ +#line 494 "parse_y.y" /* yacc.c:1646 */ { attr_list = & yyPCB->Attributes; } -#line 2159 "parse_y.c" /* yacc.c:1646 */ +#line 2157 "parse_y.c" /* yacc.c:1646 */ break; case 58: -#line 500 "parse_y.y" /* yacc.c:1646 */ +#line 498 "parse_y.y" /* yacc.c:1646 */ { /* clear pointer to force memory allocation by * the appropriate subroutine @@ -2166,57 +2164,57 @@ */ yysubc = NULL; } -#line 2170 "parse_y.c" /* yacc.c:1646 */ +#line 2168 "parse_y.c" /* yacc.c:1646 */ break; case 60: -#line 507 "parse_y.y" /* yacc.c:1646 */ +#line 505 "parse_y.y" /* yacc.c:1646 */ { YYABORT; } -#line 2176 "parse_y.c" /* yacc.c:1646 */ +#line 2174 "parse_y.c" /* yacc.c:1646 */ break; case 66: -#line 521 "parse_y.y" /* yacc.c:1646 */ +#line 519 "parse_y.y" /* yacc.c:1646 */ { pcb_old_via_new(yyData, -1, NU ((yyvsp[-8].measure)), NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), (yyvsp[-2].string), (yyvsp[-1].flagtype)); free ((yyvsp[-2].string)); } -#line 2186 "parse_y.c" /* yacc.c:1646 */ +#line 2184 "parse_y.c" /* yacc.c:1646 */ break; case 67: -#line 531 "parse_y.y" /* yacc.c:1646 */ +#line 529 "parse_y.y" /* yacc.c:1646 */ { pcb_old_via_new(yyData, -1, OU ((yyvsp[-8].measure)), OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2196 "parse_y.c" /* yacc.c:1646 */ +#line 2194 "parse_y.c" /* yacc.c:1646 */ break; case 68: -#line 542 "parse_y.y" /* yacc.c:1646 */ +#line 540 "parse_y.y" /* yacc.c:1646 */ { pcb_old_via_new(yyData, -1, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-5].measure)) + OU((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2206 "parse_y.c" /* yacc.c:1646 */ +#line 2204 "parse_y.c" /* yacc.c:1646 */ break; case 69: -#line 552 "parse_y.y" /* yacc.c:1646 */ +#line 550 "parse_y.y" /* yacc.c:1646 */ { pcb_old_via_new(yyData, -1, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), 2*PCB_GROUNDPLANEFRAME, OU((yyvsp[-4].measure)) + 2*PCB_MASKFRAME, OU ((yyvsp[-3].measure)), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2216 "parse_y.c" /* yacc.c:1646 */ +#line 2214 "parse_y.c" /* yacc.c:1646 */ break; case 70: -#line 562 "parse_y.y" /* yacc.c:1646 */ +#line 560 "parse_y.y" /* yacc.c:1646 */ { pcb_coord_t hole = (OU((yyvsp[-3].measure)) * PCB_DEFAULT_DRILLINGHOLE); @@ -2229,29 +2227,29 @@ OU((yyvsp[-3].measure)) + 2*PCB_MASKFRAME, hole, (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2233 "parse_y.c" /* yacc.c:1646 */ +#line 2231 "parse_y.c" /* yacc.c:1646 */ break; case 71: -#line 578 "parse_y.y" /* yacc.c:1646 */ +#line 576 "parse_y.y" /* yacc.c:1646 */ { pcb_rat_new(yyData, -1, NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), (yyvsp[-5].integer), (yyvsp[-2].integer), conf_core.appearance.rat_thickness, (yyvsp[-1].flagtype)); } -#line 2242 "parse_y.c" /* yacc.c:1646 */ +#line 2240 "parse_y.c" /* yacc.c:1646 */ break; case 72: -#line 583 "parse_y.y" /* yacc.c:1646 */ +#line 581 "parse_y.y" /* yacc.c:1646 */ { pcb_rat_new(yyData, -1, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-5].integer), (yyvsp[-2].integer), conf_core.appearance.rat_thickness, pcb_flag_old((yyvsp[-1].integer))); } -#line 2251 "parse_y.c" /* yacc.c:1646 */ +#line 2249 "parse_y.c" /* yacc.c:1646 */ break; case 73: -#line 592 "parse_y.y" /* yacc.c:1646 */ +#line 590 "parse_y.y" /* yacc.c:1646 */ { if ((yyvsp[-4].integer) <= 0 || (yyvsp[-4].integer) > PCB_MAX_LAYER) { @@ -2278,44 +2276,44 @@ if ((yyvsp[-2].string) != NULL) free((yyvsp[-2].string)); } -#line 2282 "parse_y.c" /* yacc.c:1646 */ +#line 2280 "parse_y.c" /* yacc.c:1646 */ break; case 85: -#line 640 "parse_y.y" /* yacc.c:1646 */ +#line 638 "parse_y.y" /* yacc.c:1646 */ { pcb_poly_new_from_rectangle(Layer, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-5].measure)) + OU ((yyvsp[-3].measure)), OU ((yyvsp[-4].measure)) + OU ((yyvsp[-2].measure)), 0, pcb_flag_old((yyvsp[-1].integer))); } -#line 2291 "parse_y.c" /* yacc.c:1646 */ +#line 2289 "parse_y.c" /* yacc.c:1646 */ break; case 89: -#line 647 "parse_y.y" /* yacc.c:1646 */ +#line 645 "parse_y.y" /* yacc.c:1646 */ { attr_list = & Layer->Attributes; } -#line 2297 "parse_y.c" /* yacc.c:1646 */ +#line 2295 "parse_y.c" /* yacc.c:1646 */ break; case 92: -#line 653 "parse_y.y" /* yacc.c:1646 */ +#line 651 "parse_y.y" /* yacc.c:1646 */ { pcb_line_new(Layer, NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), NU ((yyvsp[-2].measure)), (yyvsp[-1].flagtype)); } -#line 2306 "parse_y.c" /* yacc.c:1646 */ +#line 2304 "parse_y.c" /* yacc.c:1646 */ break; case 93: -#line 662 "parse_y.y" /* yacc.c:1646 */ +#line 660 "parse_y.y" /* yacc.c:1646 */ { pcb_line_new(Layer, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), pcb_flag_old((yyvsp[-1].integer))); } -#line 2315 "parse_y.c" /* yacc.c:1646 */ +#line 2313 "parse_y.c" /* yacc.c:1646 */ break; case 94: -#line 671 "parse_y.y" /* yacc.c:1646 */ +#line 669 "parse_y.y" /* yacc.c:1646 */ { /* eliminate old-style rat-lines */ if ((IV ((yyvsp[-1].measure)) & PCB_FLAG_RAT) == 0) @@ -2322,48 +2320,48 @@ pcb_line_new(Layer, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), 200*PCB_GROUNDPLANEFRAME, pcb_flag_old(IV ((yyvsp[-1].measure)))); } -#line 2326 "parse_y.c" /* yacc.c:1646 */ +#line 2324 "parse_y.c" /* yacc.c:1646 */ break; case 95: -#line 682 "parse_y.y" /* yacc.c:1646 */ +#line 680 "parse_y.y" /* yacc.c:1646 */ { pcb_arc_new(Layer, NU ((yyvsp[-9].measure)), NU ((yyvsp[-8].measure)), NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), (yyvsp[-3].number), (yyvsp[-2].number), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), (yyvsp[-1].flagtype), pcb_true); } -#line 2335 "parse_y.c" /* yacc.c:1646 */ +#line 2333 "parse_y.c" /* yacc.c:1646 */ break; case 96: -#line 691 "parse_y.y" /* yacc.c:1646 */ +#line 689 "parse_y.y" /* yacc.c:1646 */ { pcb_arc_new(Layer, OU ((yyvsp[-9].measure)), OU ((yyvsp[-8].measure)), OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), (yyvsp[-3].number), (yyvsp[-2].number), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), pcb_flag_old((yyvsp[-1].integer)), pcb_true); } -#line 2344 "parse_y.c" /* yacc.c:1646 */ +#line 2342 "parse_y.c" /* yacc.c:1646 */ break; case 97: -#line 700 "parse_y.y" /* yacc.c:1646 */ +#line 698 "parse_y.y" /* yacc.c:1646 */ { pcb_arc_new(Layer, OU ((yyvsp[-8].measure)), OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-6].measure)), IV ((yyvsp[-3].measure)), (yyvsp[-2].number), OU ((yyvsp[-4].measure)), 200*PCB_GROUNDPLANEFRAME, pcb_flag_old((yyvsp[-1].integer)), pcb_true); } -#line 2353 "parse_y.c" /* yacc.c:1646 */ +#line 2351 "parse_y.c" /* yacc.c:1646 */ break; case 98: -#line 709 "parse_y.y" /* yacc.c:1646 */ +#line 707 "parse_y.y" /* yacc.c:1646 */ { /* use a default scale of 100% */ pcb_text_new(Layer,yyFont,OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].number) * 90.0, 100, 0, (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2363 "parse_y.c" /* yacc.c:1646 */ +#line 2361 "parse_y.c" /* yacc.c:1646 */ break; case 99: -#line 719 "parse_y.y" /* yacc.c:1646 */ +#line 717 "parse_y.y" /* yacc.c:1646 */ { if ((yyvsp[-1].integer) & PCB_FLAG_ONSILK) { @@ -2378,11 +2376,11 @@ pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2382 "parse_y.c" /* yacc.c:1646 */ +#line 2380 "parse_y.c" /* yacc.c:1646 */ break; case 100: -#line 737 "parse_y.y" /* yacc.c:1646 */ +#line 735 "parse_y.y" /* yacc.c:1646 */ { /* FIXME: shouldn't know about .f */ /* I don't think this matters because anything with hi_format @@ -2402,19 +2400,19 @@ pcb_text_new(Layer, yyFont, NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), (yyvsp[-4].number) * 90.0, (yyvsp[-3].number), 0, (yyvsp[-2].string), (yyvsp[-1].flagtype)); free ((yyvsp[-2].string)); } -#line 2406 "parse_y.c" /* yacc.c:1646 */ +#line 2404 "parse_y.c" /* yacc.c:1646 */ break; case 101: -#line 761 "parse_y.y" /* yacc.c:1646 */ +#line 759 "parse_y.y" /* yacc.c:1646 */ { Polygon = pcb_poly_new(Layer, 0, (yyvsp[-2].flagtype)); } -#line 2414 "parse_y.c" /* yacc.c:1646 */ +#line 2412 "parse_y.c" /* yacc.c:1646 */ break; case 102: -#line 766 "parse_y.y" /* yacc.c:1646 */ +#line 764 "parse_y.y" /* yacc.c:1646 */ { pcb_cardinal_t contour, contour_start, contour_end; pcb_bool bad_contour_found = pcb_false; @@ -2446,35 +2444,35 @@ pcb_r_insert_entry(Layer->polygon_tree, (pcb_box_t *) Polygon); } } -#line 2450 "parse_y.c" /* yacc.c:1646 */ +#line 2448 "parse_y.c" /* yacc.c:1646 */ break; case 105: -#line 806 "parse_y.y" /* yacc.c:1646 */ +#line 804 "parse_y.y" /* yacc.c:1646 */ { pcb_poly_hole_new(Polygon); } -#line 2458 "parse_y.c" /* yacc.c:1646 */ +#line 2456 "parse_y.c" /* yacc.c:1646 */ break; case 109: -#line 820 "parse_y.y" /* yacc.c:1646 */ +#line 818 "parse_y.y" /* yacc.c:1646 */ { pcb_poly_point_new(Polygon, OU ((yyvsp[-2].measure)), OU ((yyvsp[-1].measure))); } -#line 2466 "parse_y.c" /* yacc.c:1646 */ +#line 2464 "parse_y.c" /* yacc.c:1646 */ break; case 110: -#line 824 "parse_y.y" /* yacc.c:1646 */ +#line 822 "parse_y.y" /* yacc.c:1646 */ { pcb_poly_point_new(Polygon, NU ((yyvsp[-2].measure)), NU ((yyvsp[-1].measure))); } -#line 2474 "parse_y.c" /* yacc.c:1646 */ +#line 2472 "parse_y.c" /* yacc.c:1646 */ break; case 116: -#line 842 "parse_y.y" /* yacc.c:1646 */ +#line 840 "parse_y.y" /* yacc.c:1646 */ { yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_no_flags(), (yyvsp[-6].string), (yyvsp[-5].string), NULL, OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), (yyvsp[-2].integer), 100, pcb_no_flags(), pcb_false); @@ -2482,19 +2480,19 @@ free ((yyvsp[-5].string)); pin_num = 1; } -#line 2486 "parse_y.c" /* yacc.c:1646 */ +#line 2484 "parse_y.c" /* yacc.c:1646 */ break; case 117: -#line 850 "parse_y.y" /* yacc.c:1646 */ +#line 848 "parse_y.y" /* yacc.c:1646 */ { io_pcb_element_fin(yyData); } -#line 2494 "parse_y.c" /* yacc.c:1646 */ +#line 2492 "parse_y.c" /* yacc.c:1646 */ break; case 118: -#line 860 "parse_y.y" /* yacc.c:1646 */ +#line 858 "parse_y.y" /* yacc.c:1646 */ { yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_flag_old((yyvsp[-9].integer)), (yyvsp[-8].string), (yyvsp[-7].string), NULL, OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), IV ((yyvsp[-4].measure)), IV ((yyvsp[-3].measure)), pcb_flag_old((yyvsp[-2].integer)), pcb_false); @@ -2502,19 +2500,19 @@ free ((yyvsp[-7].string)); pin_num = 1; } -#line 2506 "parse_y.c" /* yacc.c:1646 */ +#line 2504 "parse_y.c" /* yacc.c:1646 */ break; case 119: -#line 868 "parse_y.y" /* yacc.c:1646 */ +#line 866 "parse_y.y" /* yacc.c:1646 */ { io_pcb_element_fin(yyData); } -#line 2514 "parse_y.c" /* yacc.c:1646 */ +#line 2512 "parse_y.c" /* yacc.c:1646 */ break; case 120: -#line 878 "parse_y.y" /* yacc.c:1646 */ +#line 876 "parse_y.y" /* yacc.c:1646 */ { yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_flag_old((yyvsp[-10].integer)), (yyvsp[-9].string), (yyvsp[-8].string), (yyvsp[-7].string), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), IV ((yyvsp[-4].measure)), IV ((yyvsp[-3].measure)), pcb_flag_old((yyvsp[-2].integer)), pcb_false); @@ -2523,19 +2521,19 @@ free ((yyvsp[-7].string)); pin_num = 1; } -#line 2527 "parse_y.c" /* yacc.c:1646 */ +#line 2525 "parse_y.c" /* yacc.c:1646 */ break; case 121: -#line 887 "parse_y.y" /* yacc.c:1646 */ +#line 885 "parse_y.y" /* yacc.c:1646 */ { io_pcb_element_fin(yyData); } -#line 2535 "parse_y.c" /* yacc.c:1646 */ +#line 2533 "parse_y.c" /* yacc.c:1646 */ break; case 122: -#line 898 "parse_y.y" /* yacc.c:1646 */ +#line 896 "parse_y.y" /* yacc.c:1646 */ { yysubc = io_pcb_element_new(yyData, yysubc, yyFont, pcb_flag_old((yyvsp[-12].integer)), (yyvsp[-11].string), (yyvsp[-10].string), (yyvsp[-9].string), OU ((yyvsp[-8].measure)) + OU ((yyvsp[-6].measure)), OU ((yyvsp[-7].measure)) + OU ((yyvsp[-5].measure)), @@ -2546,19 +2544,19 @@ free ((yyvsp[-10].string)); free ((yyvsp[-9].string)); } -#line 2550 "parse_y.c" /* yacc.c:1646 */ +#line 2548 "parse_y.c" /* yacc.c:1646 */ break; case 123: -#line 909 "parse_y.y" /* yacc.c:1646 */ +#line 907 "parse_y.y" /* yacc.c:1646 */ { io_pcb_element_fin(yyData); } -#line 2558 "parse_y.c" /* yacc.c:1646 */ +#line 2556 "parse_y.c" /* yacc.c:1646 */ break; case 124: -#line 920 "parse_y.y" /* yacc.c:1646 */ +#line 918 "parse_y.y" /* yacc.c:1646 */ { yysubc = io_pcb_element_new(yyData, yysubc, yyFont, (yyvsp[-12].flagtype), (yyvsp[-11].string), (yyvsp[-10].string), (yyvsp[-9].string), NU ((yyvsp[-8].measure)) + NU ((yyvsp[-6].measure)), NU ((yyvsp[-7].measure)) + NU ((yyvsp[-5].measure)), @@ -2569,11 +2567,11 @@ free ((yyvsp[-10].string)); free ((yyvsp[-9].string)); } -#line 2573 "parse_y.c" /* yacc.c:1646 */ +#line 2571 "parse_y.c" /* yacc.c:1646 */ break; case 125: -#line 931 "parse_y.y" /* yacc.c:1646 */ +#line 929 "parse_y.y" /* yacc.c:1646 */ { if (pcb_subc_is_empty(yysubc)) { pcb_subc_free(yysubc); @@ -2583,111 +2581,111 @@ io_pcb_element_fin(yyData); } } -#line 2587 "parse_y.c" /* yacc.c:1646 */ +#line 2585 "parse_y.c" /* yacc.c:1646 */ break; case 133: -#line 955 "parse_y.y" /* yacc.c:1646 */ +#line 953 "parse_y.y" /* yacc.c:1646 */ { io_pcb_element_line_new(yysubc, NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), NU ((yyvsp[-2].measure)), NU ((yyvsp[-1].measure))); } -#line 2595 "parse_y.c" /* yacc.c:1646 */ +#line 2593 "parse_y.c" /* yacc.c:1646 */ break; case 134: -#line 960 "parse_y.y" /* yacc.c:1646 */ +#line 958 "parse_y.y" /* yacc.c:1646 */ { io_pcb_element_line_new(yysubc, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), OU ((yyvsp[-1].measure))); } -#line 2603 "parse_y.c" /* yacc.c:1646 */ +#line 2601 "parse_y.c" /* yacc.c:1646 */ break; case 135: -#line 965 "parse_y.y" /* yacc.c:1646 */ +#line 963 "parse_y.y" /* yacc.c:1646 */ { io_pcb_element_arc_new(yysubc, NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), (yyvsp[-3].number), (yyvsp[-2].number), NU ((yyvsp[-1].measure))); } -#line 2611 "parse_y.c" /* yacc.c:1646 */ +#line 2609 "parse_y.c" /* yacc.c:1646 */ break; case 136: -#line 970 "parse_y.y" /* yacc.c:1646 */ +#line 968 "parse_y.y" /* yacc.c:1646 */ { io_pcb_element_arc_new(yysubc, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].number), (yyvsp[-2].number), OU ((yyvsp[-1].measure))); } -#line 2619 "parse_y.c" /* yacc.c:1646 */ +#line 2617 "parse_y.c" /* yacc.c:1646 */ break; case 137: -#line 975 "parse_y.y" /* yacc.c:1646 */ +#line 973 "parse_y.y" /* yacc.c:1646 */ { yysubc_ox = NU ((yyvsp[-2].measure)); yysubc_oy = NU ((yyvsp[-1].measure)); } -#line 2628 "parse_y.c" /* yacc.c:1646 */ +#line 2626 "parse_y.c" /* yacc.c:1646 */ break; case 138: -#line 980 "parse_y.y" /* yacc.c:1646 */ +#line 978 "parse_y.y" /* yacc.c:1646 */ { yysubc_ox = OU ((yyvsp[-2].measure)); yysubc_oy = OU ((yyvsp[-1].measure)); } -#line 2637 "parse_y.c" /* yacc.c:1646 */ +#line 2635 "parse_y.c" /* yacc.c:1646 */ break; case 139: -#line 984 "parse_y.y" /* yacc.c:1646 */ +#line 982 "parse_y.y" /* yacc.c:1646 */ { attr_list = & yysubc->Attributes; } -#line 2643 "parse_y.c" /* yacc.c:1646 */ +#line 2641 "parse_y.c" /* yacc.c:1646 */ break; case 147: -#line 999 "parse_y.y" /* yacc.c:1646 */ +#line 997 "parse_y.y" /* yacc.c:1646 */ { io_pcb_element_line_new(yysubc, NU ((yyvsp[-5].measure)) + yysubc_ox, NU ((yyvsp[-4].measure)) + yysubc_oy, NU ((yyvsp[-3].measure)) + yysubc_ox, NU ((yyvsp[-2].measure)) + yysubc_oy, NU ((yyvsp[-1].measure))); } -#line 2653 "parse_y.c" /* yacc.c:1646 */ +#line 2651 "parse_y.c" /* yacc.c:1646 */ break; case 148: -#line 1005 "parse_y.y" /* yacc.c:1646 */ +#line 1003 "parse_y.y" /* yacc.c:1646 */ { io_pcb_element_line_new(yysubc, OU ((yyvsp[-5].measure)) + yysubc_ox, OU ((yyvsp[-4].measure)) + yysubc_oy, OU ((yyvsp[-3].measure)) + yysubc_ox, OU ((yyvsp[-2].measure)) + yysubc_oy, OU ((yyvsp[-1].measure))); } -#line 2663 "parse_y.c" /* yacc.c:1646 */ +#line 2661 "parse_y.c" /* yacc.c:1646 */ break; case 149: -#line 1012 "parse_y.y" /* yacc.c:1646 */ +#line 1010 "parse_y.y" /* yacc.c:1646 */ { io_pcb_element_arc_new(yysubc, NU ((yyvsp[-7].measure)) + yysubc_ox, NU ((yyvsp[-6].measure)) + yysubc_oy, NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), (yyvsp[-3].number), (yyvsp[-2].number), NU ((yyvsp[-1].measure))); } -#line 2672 "parse_y.c" /* yacc.c:1646 */ +#line 2670 "parse_y.c" /* yacc.c:1646 */ break; case 150: -#line 1017 "parse_y.y" /* yacc.c:1646 */ +#line 1015 "parse_y.y" /* yacc.c:1646 */ { io_pcb_element_arc_new(yysubc, OU ((yyvsp[-7].measure)) + yysubc_ox, OU ((yyvsp[-6].measure)) + yysubc_oy, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].number), (yyvsp[-2].number), OU ((yyvsp[-1].measure))); } -#line 2681 "parse_y.c" /* yacc.c:1646 */ +#line 2679 "parse_y.c" /* yacc.c:1646 */ break; case 151: -#line 1021 "parse_y.y" /* yacc.c:1646 */ +#line 1019 "parse_y.y" /* yacc.c:1646 */ { attr_list = & yysubc->Attributes; } -#line 2687 "parse_y.c" /* yacc.c:1646 */ +#line 2685 "parse_y.c" /* yacc.c:1646 */ break; case 153: -#line 1028 "parse_y.y" /* yacc.c:1646 */ +#line 1026 "parse_y.y" /* yacc.c:1646 */ { pcb_pstk_t *pin = io_pcb_element_pin_new(yysubc, NU ((yyvsp[-9].measure)) + yysubc_ox, NU ((yyvsp[-8].measure)) + yysubc_oy, NU ((yyvsp[-7].measure)), NU ((yyvsp[-6].measure)), NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), (yyvsp[-3].string), @@ -2696,11 +2694,11 @@ free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } -#line 2700 "parse_y.c" /* yacc.c:1646 */ +#line 2698 "parse_y.c" /* yacc.c:1646 */ break; case 154: -#line 1041 "parse_y.y" /* yacc.c:1646 */ +#line 1039 "parse_y.y" /* yacc.c:1646 */ { io_pcb_element_pin_new(yysubc, OU ((yyvsp[-9].measure)) + yysubc_ox, OU ((yyvsp[-8].measure)) + yysubc_oy, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), (yyvsp[-3].string), @@ -2708,11 +2706,11 @@ free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } -#line 2712 "parse_y.c" /* yacc.c:1646 */ +#line 2710 "parse_y.c" /* yacc.c:1646 */ break; case 155: -#line 1053 "parse_y.y" /* yacc.c:1646 */ +#line 1051 "parse_y.y" /* yacc.c:1646 */ { io_pcb_element_pin_new(yysubc, OU ((yyvsp[-7].measure)), OU ((yyvsp[-6].measure)), OU ((yyvsp[-5].measure)), 2*PCB_GROUNDPLANEFRAME, OU ((yyvsp[-5].measure)) + 2*PCB_MASKFRAME, OU ((yyvsp[-4].measure)), (yyvsp[-3].string), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); @@ -2719,11 +2717,11 @@ free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } -#line 2723 "parse_y.c" /* yacc.c:1646 */ +#line 2721 "parse_y.c" /* yacc.c:1646 */ break; case 156: -#line 1064 "parse_y.y" /* yacc.c:1646 */ +#line 1062 "parse_y.y" /* yacc.c:1646 */ { char p_number[8]; @@ -2733,11 +2731,11 @@ free ((yyvsp[-2].string)); } -#line 2737 "parse_y.c" /* yacc.c:1646 */ +#line 2735 "parse_y.c" /* yacc.c:1646 */ break; case 157: -#line 1080 "parse_y.y" /* yacc.c:1646 */ +#line 1078 "parse_y.y" /* yacc.c:1646 */ { pcb_coord_t hole = OU ((yyvsp[-3].measure)) * PCB_DEFAULT_DRILLINGHOLE; char p_number[8]; @@ -2752,11 +2750,11 @@ OU ((yyvsp[-3].measure)) + 2*PCB_MASKFRAME, hole, (yyvsp[-2].string), p_number, pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2756 "parse_y.c" /* yacc.c:1646 */ +#line 2754 "parse_y.c" /* yacc.c:1646 */ break; case 158: -#line 1099 "parse_y.y" /* yacc.c:1646 */ +#line 1097 "parse_y.y" /* yacc.c:1646 */ { pcb_pstk_t *pad = io_pcb_element_pad_new(yysubc, NU ((yyvsp[-10].measure)) + yysubc_ox, NU ((yyvsp[-9].measure)) + yysubc_oy, @@ -2767,11 +2765,11 @@ free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } -#line 2771 "parse_y.c" /* yacc.c:1646 */ +#line 2769 "parse_y.c" /* yacc.c:1646 */ break; case 159: -#line 1114 "parse_y.y" /* yacc.c:1646 */ +#line 1112 "parse_y.y" /* yacc.c:1646 */ { io_pcb_element_pad_new(yysubc,OU ((yyvsp[-10].measure)) + yysubc_ox, OU ((yyvsp[-9].measure)) + yysubc_oy, OU ((yyvsp[-8].measure)) + yysubc_ox, @@ -2780,11 +2778,11 @@ free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } -#line 2784 "parse_y.c" /* yacc.c:1646 */ +#line 2782 "parse_y.c" /* yacc.c:1646 */ break; case 160: -#line 1127 "parse_y.y" /* yacc.c:1646 */ +#line 1125 "parse_y.y" /* yacc.c:1646 */ { io_pcb_element_pad_new(yysubc,OU ((yyvsp[-8].measure)),OU ((yyvsp[-7].measure)),OU ((yyvsp[-6].measure)),OU ((yyvsp[-5].measure)),OU ((yyvsp[-4].measure)), 2*PCB_GROUNDPLANEFRAME, OU ((yyvsp[-4].measure)) + 2*PCB_MASKFRAME, (yyvsp[-3].string), (yyvsp[-2].string), pcb_flag_old((yyvsp[-1].integer))); @@ -2791,11 +2789,11 @@ free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } -#line 2795 "parse_y.c" /* yacc.c:1646 */ +#line 2793 "parse_y.c" /* yacc.c:1646 */ break; case 161: -#line 1138 "parse_y.y" /* yacc.c:1646 */ +#line 1136 "parse_y.y" /* yacc.c:1646 */ { char p_number[8]; @@ -2804,23 +2802,23 @@ OU ((yyvsp[-3].measure)) + 2*PCB_MASKFRAME, (yyvsp[-2].string),p_number, pcb_flag_old((yyvsp[-1].integer))); free ((yyvsp[-2].string)); } -#line 2808 "parse_y.c" /* yacc.c:1646 */ +#line 2806 "parse_y.c" /* yacc.c:1646 */ break; case 162: -#line 1148 "parse_y.y" /* yacc.c:1646 */ +#line 1146 "parse_y.y" /* yacc.c:1646 */ { (yyval.flagtype) = pcb_flag_old((yyvsp[0].integer)); } -#line 2814 "parse_y.c" /* yacc.c:1646 */ +#line 2812 "parse_y.c" /* yacc.c:1646 */ break; case 163: -#line 1149 "parse_y.y" /* yacc.c:1646 */ +#line 1147 "parse_y.y" /* yacc.c:1646 */ { (yyval.flagtype) = pcb_strflg_s2f((yyvsp[0].string), yyerror, &yy_intconn, 1); free((yyvsp[0].string)); } -#line 2820 "parse_y.c" /* yacc.c:1646 */ +#line 2818 "parse_y.c" /* yacc.c:1646 */ break; case 167: -#line 1160 "parse_y.y" /* yacc.c:1646 */ +#line 1158 "parse_y.y" /* yacc.c:1646 */ { if ((yyvsp[-3].integer) <= 0 || (yyvsp[-3].integer) > PCB_MAX_FONTPOSITION) { @@ -2836,11 +2834,11 @@ Symbol->Valid = pcb_true; Symbol->Delta = NU ((yyvsp[-2].measure)); } -#line 2840 "parse_y.c" /* yacc.c:1646 */ +#line 2838 "parse_y.c" /* yacc.c:1646 */ break; case 168: -#line 1176 "parse_y.y" /* yacc.c:1646 */ +#line 1174 "parse_y.y" /* yacc.c:1646 */ { if ((yyvsp[-3].integer) <= 0 || (yyvsp[-3].integer) > PCB_MAX_FONTPOSITION) { @@ -2856,27 +2854,27 @@ Symbol->Valid = pcb_true; Symbol->Delta = OU ((yyvsp[-2].measure)); } -#line 2860 "parse_y.c" /* yacc.c:1646 */ +#line 2858 "parse_y.c" /* yacc.c:1646 */ break; case 174: -#line 1207 "parse_y.y" /* yacc.c:1646 */ +#line 1205 "parse_y.y" /* yacc.c:1646 */ { pcb_font_new_line_in_sym(Symbol, OU ((yyvsp[-5].measure)), OU ((yyvsp[-4].measure)), OU ((yyvsp[-3].measure)), OU ((yyvsp[-2].measure)), OU ((yyvsp[-1].measure))); } -#line 2868 "parse_y.c" /* yacc.c:1646 */ +#line 2866 "parse_y.c" /* yacc.c:1646 */ break; case 175: -#line 1214 "parse_y.y" /* yacc.c:1646 */ +#line 1212 "parse_y.y" /* yacc.c:1646 */ { pcb_font_new_line_in_sym(Symbol, NU ((yyvsp[-5].measure)), NU ((yyvsp[-4].measure)), NU ((yyvsp[-3].measure)), NU ((yyvsp[-2].measure)), NU ((yyvsp[-1].measure))); } -#line 2876 "parse_y.c" /* yacc.c:1646 */ +#line 2874 "parse_y.c" /* yacc.c:1646 */ break; case 183: -#line 1241 "parse_y.y" /* yacc.c:1646 */ +#line 1239 "parse_y.y" /* yacc.c:1646 */ { currnet = pcb_net_get(yyPCB, &yyPCB->netlist[PCB_NETLIST_INPUT], (yyvsp[-3].string), 1); if (((yyvsp[-2].string) != NULL) && (*(yyvsp[-2].string) != '\0')) @@ -2884,38 +2882,38 @@ free ((yyvsp[-3].string)); free ((yyvsp[-2].string)); } -#line 2888 "parse_y.c" /* yacc.c:1646 */ +#line 2886 "parse_y.c" /* yacc.c:1646 */ break; case 189: -#line 1263 "parse_y.y" /* yacc.c:1646 */ +#line 1261 "parse_y.y" /* yacc.c:1646 */ { pcb_net_term_get_by_pinname(currnet, (yyvsp[-1].string), 1); free ((yyvsp[-1].string)); } -#line 2897 "parse_y.c" /* yacc.c:1646 */ +#line 2895 "parse_y.c" /* yacc.c:1646 */ break; case 197: -#line 1310 "parse_y.y" /* yacc.c:1646 */ +#line 1308 "parse_y.y" /* yacc.c:1646 */ { pcb_ratspatch_append(yyPCB, RATP_ADD_CONN, (yyvsp[-2].string), (yyvsp[-1].string), NULL); free((yyvsp[-2].string)); free((yyvsp[-1].string)); } -#line 2903 "parse_y.c" /* yacc.c:1646 */ +#line 2901 "parse_y.c" /* yacc.c:1646 */ break; case 198: -#line 1311 "parse_y.y" /* yacc.c:1646 */ +#line 1309 "parse_y.y" /* yacc.c:1646 */ { pcb_ratspatch_append(yyPCB, RATP_DEL_CONN, (yyvsp[-2].string), (yyvsp[-1].string), NULL); free((yyvsp[-2].string)); free((yyvsp[-1].string)); } -#line 2909 "parse_y.c" /* yacc.c:1646 */ +#line 2907 "parse_y.c" /* yacc.c:1646 */ break; case 199: -#line 1312 "parse_y.y" /* yacc.c:1646 */ +#line 1310 "parse_y.y" /* yacc.c:1646 */ { pcb_ratspatch_append(yyPCB, RATP_CHANGE_ATTRIB, (yyvsp[-3].string), (yyvsp[-2].string), (yyvsp[-1].string)); free((yyvsp[-3].string)); free((yyvsp[-2].string)); free((yyvsp[-1].string)); } -#line 2915 "parse_y.c" /* yacc.c:1646 */ +#line 2913 "parse_y.c" /* yacc.c:1646 */ break; case 200: -#line 1317 "parse_y.y" /* yacc.c:1646 */ +#line 1315 "parse_y.y" /* yacc.c:1646 */ { char *old_val, *key = (yyvsp[-2].string), *val = (yyvsp[-1].string) ? (yyvsp[-1].string) : (char *)""; old_val = pcb_attribute_get(attr_list, key); @@ -2926,95 +2924,95 @@ free(key); free(val); } -#line 2930 "parse_y.c" /* yacc.c:1646 */ +#line 2928 "parse_y.c" /* yacc.c:1646 */ break; case 201: -#line 1329 "parse_y.y" /* yacc.c:1646 */ +#line 1327 "parse_y.y" /* yacc.c:1646 */ { (yyval.string) = (yyvsp[0].string); } -#line 2936 "parse_y.c" /* yacc.c:1646 */ +#line 2934 "parse_y.c" /* yacc.c:1646 */ break; case 202: -#line 1330 "parse_y.y" /* yacc.c:1646 */ +#line 1328 "parse_y.y" /* yacc.c:1646 */ { (yyval.string) = 0; } -#line 2942 "parse_y.c" /* yacc.c:1646 */ +#line 2940 "parse_y.c" /* yacc.c:1646 */ break; case 203: -#line 1334 "parse_y.y" /* yacc.c:1646 */ +#line 1332 "parse_y.y" /* yacc.c:1646 */ { (yyval.number) = (yyvsp[0].number); } -#line 2948 "parse_y.c" /* yacc.c:1646 */ +#line 2946 "parse_y.c" /* yacc.c:1646 */ break; case 204: -#line 1335 "parse_y.y" /* yacc.c:1646 */ +#line 1333 "parse_y.y" /* yacc.c:1646 */ { (yyval.number) = (yyvsp[0].integer); } -#line 2954 "parse_y.c" /* yacc.c:1646 */ +#line 2952 "parse_y.c" /* yacc.c:1646 */ break; case 205: -#line 1340 "parse_y.y" /* yacc.c:1646 */ +#line 1338 "parse_y.y" /* yacc.c:1646 */ { do_measure(&(yyval.measure), (yyvsp[0].number), PCB_MIL_TO_COORD ((yyvsp[0].number)) / 100.0, 0); } -#line 2960 "parse_y.c" /* yacc.c:1646 */ +#line 2958 "parse_y.c" /* yacc.c:1646 */ break; case 206: -#line 1341 "parse_y.y" /* yacc.c:1646 */ +#line 1339 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), PCB_MIL_TO_COORD ((yyvsp[-1].number)) / 100000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } -#line 2966 "parse_y.c" /* yacc.c:1646 */ +#line 2964 "parse_y.c" /* yacc.c:1646 */ break; case 207: -#line 1342 "parse_y.y" /* yacc.c:1646 */ +#line 1340 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), PCB_MIL_TO_COORD ((yyvsp[-1].number)) / 100.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } -#line 2972 "parse_y.c" /* yacc.c:1646 */ +#line 2970 "parse_y.c" /* yacc.c:1646 */ break; case 208: -#line 1343 "parse_y.y" /* yacc.c:1646 */ +#line 1341 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), PCB_MIL_TO_COORD ((yyvsp[-1].number))); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } -#line 2978 "parse_y.c" /* yacc.c:1646 */ +#line 2976 "parse_y.c" /* yacc.c:1646 */ break; case 209: -#line 1344 "parse_y.y" /* yacc.c:1646 */ +#line 1342 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), PCB_INCH_TO_COORD ((yyvsp[-1].number))); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } -#line 2984 "parse_y.c" /* yacc.c:1646 */ +#line 2982 "parse_y.c" /* yacc.c:1646 */ break; case 210: -#line 1345 "parse_y.y" /* yacc.c:1646 */ +#line 1343 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) / 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_NANOMETER; } -#line 2990 "parse_y.c" /* yacc.c:1646 */ +#line 2988 "parse_y.c" /* yacc.c:1646 */ break; case 211: -#line 1346 "parse_y.y" /* yacc.c:1646 */ +#line 1344 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) / 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } -#line 2996 "parse_y.c" /* yacc.c:1646 */ +#line 2994 "parse_y.c" /* yacc.c:1646 */ break; case 212: -#line 1347 "parse_y.y" /* yacc.c:1646 */ +#line 1345 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number))); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } -#line 3002 "parse_y.c" /* yacc.c:1646 */ +#line 3000 "parse_y.c" /* yacc.c:1646 */ break; case 213: -#line 1348 "parse_y.y" /* yacc.c:1646 */ +#line 1346 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) * 1000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } -#line 3008 "parse_y.c" /* yacc.c:1646 */ +#line 3006 "parse_y.c" /* yacc.c:1646 */ break; case 214: -#line 1349 "parse_y.y" /* yacc.c:1646 */ +#line 1347 "parse_y.y" /* yacc.c:1646 */ { M ((yyval.measure), (yyvsp[-1].number), PCB_MM_TO_COORD ((yyvsp[-1].number)) * 1000000.0); pcb_io_pcb_usty_seen |= PCB_USTY_UNITS; } -#line 3014 "parse_y.c" /* yacc.c:1646 */ +#line 3012 "parse_y.c" /* yacc.c:1646 */ break; -#line 3018 "parse_y.c" /* yacc.c:1646 */ +#line 3016 "parse_y.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -3242,7 +3240,7 @@ #endif return yyresult; } -#line 1352 "parse_y.y" /* yacc.c:1906 */ +#line 1350 "parse_y.y" /* yacc.c:1906 */ /* --------------------------------------------------------------------------- Index: parse_y.y =================================================================== --- parse_y.y (revision 23600) +++ parse_y.y (revision 23601) @@ -271,8 +271,6 @@ : { /* mark all symbols invalid */ - int i; - if (!yyFont) { pcb_message(PCB_MSG_ERROR, "illegal fileformat\n");