Index: hyp_y.c =================================================================== --- hyp_y.c (revision 24882) +++ hyp_y.c (revision 24883) @@ -1,8 +1,9 @@ -/* A Bison parser, made by GNU Bison 3.0.2. */ +/* A Bison parser, made by GNU Bison 3.3.2. */ /* Bison implementation for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation, + Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -40,11 +41,14 @@ define necessary library symbols; they are noted "INFRINGES ON USER NAME SPACE" below. */ +/* Undocumented macros, especially those whose name start with YY_, + are private implementation details. Do not rely on them. */ + /* Identify Bison output. */ #define YYBISON 1 /* Bison version. */ -#define YYBISON_VERSION "3.0.2" +#define YYBISON_VERSION "3.3.2" /* Skeleton name. */ #define YYSKELETON_NAME "yacc.c" @@ -70,15 +74,16 @@ #define yylval hyylval #define yychar hyychar -/* Copy the first part of user declarations. */ -#line 76 "hyp_y.c" /* yacc.c:339 */ - # ifndef YY_NULLPTR -# if defined __cplusplus && 201103L <= __cplusplus -# define YY_NULLPTR nullptr +# if defined __cplusplus +# if 201103L <= __cplusplus +# define YY_NULLPTR nullptr +# else +# define YY_NULLPTR 0 +# endif # else -# define YY_NULLPTR 0 +# define YY_NULLPTR ((void*)0) # endif # endif @@ -110,11 +115,11 @@ extern int hyydebug; #endif /* "%code requires" blocks. */ -#line 21 "hyp_y.y" /* yacc.c:355 */ +#line 21 "hyp_y.y" /* yacc.c:352 */ #include "parser.h" -#line 118 "hyp_y.c" /* yacc.c:355 */ +#line 123 "hyp_y.c" /* yacc.c:352 */ /* Token type. */ #ifndef HYYTOKENTYPE @@ -227,10 +232,10 @@ /* Value type. */ #if ! defined HYYSTYPE && ! defined HYYSTYPE_IS_DECLARED -typedef union HYYSTYPE HYYSTYPE; + union HYYSTYPE { -#line 30 "hyp_y.y" /* yacc.c:355 */ +#line 30 "hyp_y.y" /* yacc.c:352 */ int boolval; int intval; @@ -237,8 +242,10 @@ double floatval; char* strval; -#line 241 "hyp_y.c" /* yacc.c:355 */ +#line 246 "hyp_y.c" /* yacc.c:352 */ }; + +typedef union HYYSTYPE HYYSTYPE; # define HYYSTYPE_IS_TRIVIAL 1 # define HYYSTYPE_IS_DECLARED 1 #endif @@ -250,8 +257,8 @@ #endif /* !YY_HYY_HYP_Y_H_INCLUDED */ -/* Copy the second part of user declarations. */ -#line 37 "hyp_y.y" /* yacc.c:358 */ +/* Second part of user prologue. */ +#line 37 "hyp_y.y" /* yacc.c:354 */ #include #include @@ -272,7 +279,7 @@ static parse_param h; -#line 276 "hyp_y.c" /* yacc.c:358 */ +#line 283 "hyp_y.c" /* yacc.c:354 */ #ifdef short # undef short @@ -293,13 +300,13 @@ #ifdef YYTYPE_UINT16 typedef YYTYPE_UINT16 yytype_uint16; #else -typedef unsigned short int yytype_uint16; +typedef unsigned short yytype_uint16; #endif #ifdef YYTYPE_INT16 typedef YYTYPE_INT16 yytype_int16; #else -typedef short int yytype_int16; +typedef short yytype_int16; #endif #ifndef YYSIZE_T @@ -311,7 +318,7 @@ # include /* INFRINGES ON USER NAME SPACE */ # define YYSIZE_T size_t # else -# define YYSIZE_T unsigned int +# define YYSIZE_T unsigned # endif #endif @@ -347,15 +354,6 @@ # define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__)) #endif -#if !defined _Noreturn \ - && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112) -# if defined _MSC_VER && 1200 <= _MSC_VER -# define _Noreturn __declspec (noreturn) -# else -# define _Noreturn YY_ATTRIBUTE ((__noreturn__)) -# endif -#endif - /* Suppress unused-variable warnings by "using" E. */ #if ! defined lint || defined __GNUC__ # define YYUSE(E) ((void) (E)) @@ -363,7 +361,7 @@ # define YYUSE(E) /* empty */ #endif -#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ +#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__ /* Suppress an incorrect diagnostic about yylval being uninitialized. */ # define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \ _Pragma ("GCC diagnostic push") \ @@ -525,16 +523,16 @@ /* YYNSTATES -- Number of states. */ #define YYNSTATES 620 -/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned - by yylex, with out-of-bounds checking. */ #define YYUNDEFTOK 2 #define YYMAXUTOK 358 +/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM + as returned by yylex, with out-of-bounds checking. */ #define YYTRANSLATE(YYX) \ - ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) + ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK) /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM - as returned by yylex, without out-of-bounds checking. */ + as returned by yylex. */ static const yytype_uint8 yytranslate[] = { 0, 2, 2, 2, 2, 2, 2, 2, 2, 2, @@ -1204,22 +1202,22 @@ #define YYRECOVERING() (!!yyerrstatus) -#define YYBACKUP(Token, Value) \ -do \ - if (yychar == YYEMPTY) \ - { \ - yychar = (Token); \ - yylval = (Value); \ - YYPOPSTACK (yylen); \ - yystate = *yyssp; \ - goto yybackup; \ - } \ - else \ - { \ - yyerror (YY_("syntax error: cannot back up")); \ - YYERROR; \ - } \ -while (0) +#define YYBACKUP(Token, Value) \ + do \ + if (yychar == YYEMPTY) \ + { \ + yychar = (Token); \ + yylval = (Value); \ + YYPOPSTACK (yylen); \ + yystate = *yyssp; \ + goto yybackup; \ + } \ + else \ + { \ + yyerror (YY_("syntax error: cannot back up")); \ + YYERROR; \ + } \ + while (0) /* Error token number */ #define YYTERROR 1 @@ -1259,37 +1257,37 @@ } while (0) -/*----------------------------------------. -| Print this symbol's value on YYOUTPUT. | -`----------------------------------------*/ +/*-----------------------------------. +| Print this symbol's value on YYO. | +`-----------------------------------*/ static void -yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep) { - FILE *yyo = yyoutput; - YYUSE (yyo); + FILE *yyoutput = yyo; + YYUSE (yyoutput); if (!yyvaluep) return; # ifdef YYPRINT if (yytype < YYNTOKENS) - YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep); + YYPRINT (yyo, yytoknum[yytype], *yyvaluep); # endif YYUSE (yytype); } -/*--------------------------------. -| Print this symbol on YYOUTPUT. | -`--------------------------------*/ +/*---------------------------. +| Print this symbol on YYO. | +`---------------------------*/ static void -yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep) +yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep) { - YYFPRINTF (yyoutput, "%s %s (", + YYFPRINTF (yyo, "%s %s (", yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]); - yy_symbol_value_print (yyoutput, yytype, yyvaluep); - YYFPRINTF (yyoutput, ")"); + yy_symbol_value_print (yyo, yytype, yyvaluep); + YYFPRINTF (yyo, ")"); } /*------------------------------------------------------------------. @@ -1323,7 +1321,7 @@ static void yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule) { - unsigned long int yylno = yyrline[yyrule]; + unsigned long yylno = yyrline[yyrule]; int yynrhs = yyr2[yyrule]; int yyi; YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n", @@ -1334,7 +1332,7 @@ YYFPRINTF (stderr, " $%d = ", yyi + 1); yy_symbol_print (stderr, yystos[yyssp[yyi + 1 - yynrhs]], - &(yyvsp[(yyi + 1) - (yynrhs)]) + &yyvsp[(yyi + 1) - (yynrhs)] ); YYFPRINTF (stderr, "\n"); } @@ -1438,7 +1436,10 @@ case '\\': if (*++yyp != '\\') goto do_not_strip_quotes; - /* Fall through. */ + else + goto append; + + append: default: if (yyres) yyres[yyn] = *yyp; @@ -1456,7 +1457,7 @@ if (! yyres) return yystrlen (yystr); - return yystpcpy (yyres, yystr) - yyres; + return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres); } # endif @@ -1534,10 +1535,10 @@ yyarg[yycount++] = yytname[yyx]; { YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]); - if (! (yysize <= yysize1 - && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) + yysize = yysize1; + else return 2; - yysize = yysize1; } } } @@ -1549,6 +1550,7 @@ case N: \ yyformat = S; \ break + default: /* Avoid compiler warnings. */ YYCASE_(0, YY_("syntax error")); YYCASE_(1, YY_("syntax error, unexpected %s")); YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s")); @@ -1560,9 +1562,10 @@ { YYSIZE_T yysize1 = yysize + yystrlen (yyformat); - if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)) + if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM) + yysize = yysize1; + else return 2; - yysize = yysize1; } if (*yymsg_alloc < yysize) @@ -1688,23 +1691,31 @@ yychar = YYEMPTY; /* Cause a token to be read. */ goto yysetstate; + /*------------------------------------------------------------. -| yynewstate -- Push a new state, which is found in yystate. | +| yynewstate -- push a new state, which is found in yystate. | `------------------------------------------------------------*/ - yynewstate: +yynewstate: /* In all cases, when you get here, the value and location stacks have just been pushed. So pushing a state here evens the stacks. */ yyssp++; - yysetstate: - *yyssp = yystate; +/*--------------------------------------------------------------------. +| yynewstate -- set current state (the top of the stack) to yystate. | +`--------------------------------------------------------------------*/ +yysetstate: + *yyssp = (yytype_int16) yystate; + if (yyss + yystacksize - 1 <= yyssp) +#if !defined yyoverflow && !defined YYSTACK_RELOCATE + goto yyexhaustedlab; +#else { /* Get the current used size of the three stacks, in elements. */ - YYSIZE_T yysize = yyssp - yyss + 1; + YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1); -#ifdef yyoverflow +# if defined yyoverflow { /* Give user a chance to reallocate the stack. Use copies of these so that the &'s don't force the real ones into @@ -1720,14 +1731,10 @@ &yyss1, yysize * sizeof (*yyssp), &yyvs1, yysize * sizeof (*yyvsp), &yystacksize); - yyss = yyss1; yyvs = yyvs1; } -#else /* no yyoverflow */ -# ifndef YYSTACK_RELOCATE - goto yyexhaustedlab; -# else +# else /* defined YYSTACK_RELOCATE */ /* Extend the stack our own way. */ if (YYMAXDEPTH <= yystacksize) goto yyexhaustedlab; @@ -1743,22 +1750,22 @@ goto yyexhaustedlab; YYSTACK_RELOCATE (yyss_alloc, yyss); YYSTACK_RELOCATE (yyvs_alloc, yyvs); -# undef YYSTACK_RELOCATE +# undef YYSTACK_RELOCATE if (yyss1 != yyssa) YYSTACK_FREE (yyss1); } # endif -#endif /* no yyoverflow */ yyssp = yyss + yysize - 1; yyvsp = yyvs + yysize - 1; YYDPRINTF ((stderr, "Stack size increased to %lu\n", - (unsigned long int) yystacksize)); + (unsigned long) yystacksize)); if (yyss + yystacksize - 1 <= yyssp) YYABORT; } +#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */ YYDPRINTF ((stderr, "Entering state %d\n", yystate)); @@ -1767,11 +1774,11 @@ goto yybackup; + /*-----------. | yybackup. | `-----------*/ yybackup: - /* Do appropriate processing given the current state. Read a lookahead token if we need one and don't already have one. */ @@ -1844,7 +1851,7 @@ /*-----------------------------. -| yyreduce -- Do a reduction. | +| yyreduce -- do a reduction. | `-----------------------------*/ yyreduce: /* yyn is the number of a rule to reduce with. */ @@ -1865,949 +1872,949 @@ switch (yyn) { case 19: -#line 151 "hyp_y.y" /* yacc.c:1646 */ +#line 151 "hyp_y.y" /* yacc.c:1652 */ { if (exec_board_file(&h)) YYERROR; } -#line 1871 "hyp_y.c" /* yacc.c:1646 */ +#line 1878 "hyp_y.c" /* yacc.c:1652 */ break; case 21: -#line 156 "hyp_y.y" /* yacc.c:1646 */ +#line 156 "hyp_y.y" /* yacc.c:1652 */ { h.vers = yylval.floatval; } -#line 1877 "hyp_y.c" /* yacc.c:1646 */ +#line 1884 "hyp_y.c" /* yacc.c:1652 */ break; case 22: -#line 156 "hyp_y.y" /* yacc.c:1646 */ +#line 156 "hyp_y.y" /* yacc.c:1652 */ { if (exec_version(&h)) YYERROR; } -#line 1883 "hyp_y.c" /* yacc.c:1646 */ +#line 1890 "hyp_y.c" /* yacc.c:1652 */ break; case 23: -#line 161 "hyp_y.y" /* yacc.c:1646 */ +#line 161 "hyp_y.y" /* yacc.c:1652 */ { if (exec_data_mode(&h)) YYERROR; } -#line 1889 "hyp_y.c" /* yacc.c:1646 */ +#line 1896 "hyp_y.c" /* yacc.c:1652 */ break; case 24: -#line 164 "hyp_y.y" /* yacc.c:1646 */ +#line 164 "hyp_y.y" /* yacc.c:1652 */ { h.detailed = pcb_false; } -#line 1895 "hyp_y.c" /* yacc.c:1646 */ +#line 1902 "hyp_y.c" /* yacc.c:1652 */ break; case 25: -#line 165 "hyp_y.y" /* yacc.c:1646 */ +#line 165 "hyp_y.y" /* yacc.c:1652 */ { h.detailed = pcb_true; } -#line 1901 "hyp_y.c" /* yacc.c:1646 */ +#line 1908 "hyp_y.c" /* yacc.c:1652 */ break; case 26: -#line 170 "hyp_y.y" /* yacc.c:1646 */ +#line 170 "hyp_y.y" /* yacc.c:1652 */ { if (exec_units(&h)) YYERROR; } -#line 1907 "hyp_y.c" /* yacc.c:1646 */ +#line 1914 "hyp_y.c" /* yacc.c:1652 */ break; case 27: -#line 173 "hyp_y.y" /* yacc.c:1646 */ +#line 173 "hyp_y.y" /* yacc.c:1652 */ { h.unit_system_english = pcb_true; } -#line 1913 "hyp_y.c" /* yacc.c:1646 */ +#line 1920 "hyp_y.c" /* yacc.c:1652 */ break; case 28: -#line 174 "hyp_y.y" /* yacc.c:1646 */ +#line 174 "hyp_y.y" /* yacc.c:1652 */ { h.unit_system_english = pcb_false; } -#line 1919 "hyp_y.c" /* yacc.c:1646 */ +#line 1926 "hyp_y.c" /* yacc.c:1652 */ break; case 29: -#line 177 "hyp_y.y" /* yacc.c:1646 */ +#line 177 "hyp_y.y" /* yacc.c:1652 */ { h.metal_thickness_weight = pcb_true; } -#line 1925 "hyp_y.c" /* yacc.c:1646 */ +#line 1932 "hyp_y.c" /* yacc.c:1652 */ break; case 30: -#line 178 "hyp_y.y" /* yacc.c:1646 */ +#line 178 "hyp_y.y" /* yacc.c:1652 */ { h.metal_thickness_weight = pcb_false; } -#line 1931 "hyp_y.c" /* yacc.c:1646 */ +#line 1938 "hyp_y.c" /* yacc.c:1652 */ break; case 31: -#line 182 "hyp_y.y" /* yacc.c:1646 */ +#line 182 "hyp_y.y" /* yacc.c:1652 */ { h.default_plane_separation = yylval.floatval; } -#line 1937 "hyp_y.c" /* yacc.c:1646 */ +#line 1944 "hyp_y.c" /* yacc.c:1652 */ break; case 32: -#line 182 "hyp_y.y" /* yacc.c:1646 */ +#line 182 "hyp_y.y" /* yacc.c:1652 */ { if (exec_plane_sep(&h)) YYERROR; } -#line 1943 "hyp_y.c" /* yacc.c:1646 */ +#line 1950 "hyp_y.c" /* yacc.c:1652 */ break; case 38: -#line 196 "hyp_y.y" /* yacc.c:1646 */ +#line 196 "hyp_y.y" /* yacc.c:1652 */ { hyyerror("warning: missing ')'"); } -#line 1949 "hyp_y.c" /* yacc.c:1646 */ +#line 1956 "hyp_y.c" /* yacc.c:1652 */ break; case 43: -#line 206 "hyp_y.y" /* yacc.c:1646 */ +#line 206 "hyp_y.y" /* yacc.c:1652 */ { if (exec_perimeter_segment(&h)) YYERROR; } -#line 1955 "hyp_y.c" /* yacc.c:1646 */ +#line 1962 "hyp_y.c" /* yacc.c:1652 */ break; case 44: -#line 209 "hyp_y.y" /* yacc.c:1646 */ +#line 209 "hyp_y.y" /* yacc.c:1652 */ { if (exec_perimeter_arc(&h)) YYERROR; } -#line 1961 "hyp_y.c" /* yacc.c:1646 */ +#line 1968 "hyp_y.c" /* yacc.c:1652 */ break; case 45: -#line 212 "hyp_y.y" /* yacc.c:1646 */ +#line 212 "hyp_y.y" /* yacc.c:1652 */ { h.name = yylval.strval; } -#line 1967 "hyp_y.c" /* yacc.c:1646 */ +#line 1974 "hyp_y.c" /* yacc.c:1652 */ break; case 46: -#line 212 "hyp_y.y" /* yacc.c:1646 */ +#line 212 "hyp_y.y" /* yacc.c:1652 */ { h.value = yylval.strval; } -#line 1973 "hyp_y.c" /* yacc.c:1646 */ +#line 1980 "hyp_y.c" /* yacc.c:1652 */ break; case 47: -#line 212 "hyp_y.y" /* yacc.c:1646 */ +#line 212 "hyp_y.y" /* yacc.c:1652 */ { if (exec_board_attribute(&h)) YYERROR; } -#line 1979 "hyp_y.c" /* yacc.c:1646 */ +#line 1986 "hyp_y.c" /* yacc.c:1652 */ break; case 56: -#line 231 "hyp_y.y" /* yacc.c:1646 */ +#line 231 "hyp_y.y" /* yacc.c:1652 */ { if (exec_options(&h)) YYERROR; } -#line 1985 "hyp_y.c" /* yacc.c:1646 */ +#line 1992 "hyp_y.c" /* yacc.c:1652 */ break; case 57: -#line 234 "hyp_y.y" /* yacc.c:1646 */ +#line 234 "hyp_y.y" /* yacc.c:1652 */ { h.use_die_for_metal = yylval.boolval; } -#line 1991 "hyp_y.c" /* yacc.c:1646 */ +#line 1998 "hyp_y.c" /* yacc.c:1652 */ break; case 60: -#line 239 "hyp_y.y" /* yacc.c:1646 */ +#line 239 "hyp_y.y" /* yacc.c:1652 */ { new_record(); } -#line 1997 "hyp_y.c" /* yacc.c:1646 */ +#line 2004 "hyp_y.c" /* yacc.c:1652 */ break; case 61: -#line 239 "hyp_y.y" /* yacc.c:1646 */ +#line 239 "hyp_y.y" /* yacc.c:1652 */ { if (exec_signal(&h)) YYERROR; } -#line 2003 "hyp_y.c" /* yacc.c:1646 */ +#line 2010 "hyp_y.c" /* yacc.c:1652 */ break; case 66: -#line 248 "hyp_y.y" /* yacc.c:1646 */ +#line 248 "hyp_y.y" /* yacc.c:1652 */ { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = pcb_true; } -#line 2009 "hyp_y.c" /* yacc.c:1646 */ +#line 2016 "hyp_y.c" /* yacc.c:1652 */ break; case 74: -#line 258 "hyp_y.y" /* yacc.c:1646 */ +#line 258 "hyp_y.y" /* yacc.c:1652 */ { new_record(); } -#line 2015 "hyp_y.c" /* yacc.c:1646 */ +#line 2022 "hyp_y.c" /* yacc.c:1652 */ break; case 75: -#line 258 "hyp_y.y" /* yacc.c:1646 */ +#line 258 "hyp_y.y" /* yacc.c:1652 */ { if (exec_dielectric(&h)) YYERROR; } -#line 2021 "hyp_y.c" /* yacc.c:1646 */ +#line 2028 "hyp_y.c" /* yacc.c:1652 */ break; case 79: -#line 266 "hyp_y.y" /* yacc.c:1646 */ +#line 266 "hyp_y.y" /* yacc.c:1652 */ { h.epsilon_r = yylval.floatval; h.epsilon_r_set = pcb_true; } -#line 2027 "hyp_y.c" /* yacc.c:1646 */ +#line 2034 "hyp_y.c" /* yacc.c:1652 */ break; case 86: -#line 276 "hyp_y.y" /* yacc.c:1646 */ +#line 276 "hyp_y.y" /* yacc.c:1652 */ { new_record(); } -#line 2033 "hyp_y.c" /* yacc.c:1646 */ +#line 2040 "hyp_y.c" /* yacc.c:1652 */ break; case 87: -#line 276 "hyp_y.y" /* yacc.c:1646 */ +#line 276 "hyp_y.y" /* yacc.c:1652 */ { if (exec_plane(&h)) YYERROR; } -#line 2039 "hyp_y.c" /* yacc.c:1646 */ +#line 2046 "hyp_y.c" /* yacc.c:1652 */ break; case 91: -#line 284 "hyp_y.y" /* yacc.c:1646 */ +#line 284 "hyp_y.y" /* yacc.c:1652 */ { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = pcb_true; } -#line 2045 "hyp_y.c" /* yacc.c:1646 */ +#line 2052 "hyp_y.c" /* yacc.c:1652 */ break; case 99: -#line 294 "hyp_y.y" /* yacc.c:1646 */ +#line 294 "hyp_y.y" /* yacc.c:1652 */ { h.thickness = yylval.floatval; h.thickness_set = pcb_true; } -#line 2051 "hyp_y.c" /* yacc.c:1646 */ +#line 2058 "hyp_y.c" /* yacc.c:1652 */ break; case 100: -#line 297 "hyp_y.y" /* yacc.c:1646 */ +#line 297 "hyp_y.y" /* yacc.c:1652 */ { h.plating_thickness = yylval.floatval; h.plating_thickness_set = pcb_true; } -#line 2057 "hyp_y.c" /* yacc.c:1646 */ +#line 2064 "hyp_y.c" /* yacc.c:1652 */ break; case 101: -#line 300 "hyp_y.y" /* yacc.c:1646 */ +#line 300 "hyp_y.y" /* yacc.c:1652 */ { h.bulk_resistivity = yylval.floatval; h.bulk_resistivity_set = pcb_true; } -#line 2063 "hyp_y.c" /* yacc.c:1646 */ +#line 2070 "hyp_y.c" /* yacc.c:1652 */ break; case 102: -#line 303 "hyp_y.y" /* yacc.c:1646 */ +#line 303 "hyp_y.y" /* yacc.c:1652 */ { h.temperature_coefficient = yylval.floatval; h.temperature_coefficient_set = pcb_true; } -#line 2069 "hyp_y.c" /* yacc.c:1646 */ +#line 2076 "hyp_y.c" /* yacc.c:1652 */ break; case 103: -#line 306 "hyp_y.y" /* yacc.c:1646 */ +#line 306 "hyp_y.y" /* yacc.c:1652 */ { h.epsilon_r = yylval.floatval; h.epsilon_r_set = pcb_true; } -#line 2075 "hyp_y.c" /* yacc.c:1646 */ +#line 2082 "hyp_y.c" /* yacc.c:1652 */ break; case 104: -#line 309 "hyp_y.y" /* yacc.c:1646 */ +#line 309 "hyp_y.y" /* yacc.c:1652 */ { h.loss_tangent = yylval.floatval; h.loss_tangent_set = pcb_true; } -#line 2081 "hyp_y.c" /* yacc.c:1646 */ +#line 2088 "hyp_y.c" /* yacc.c:1652 */ break; case 105: -#line 312 "hyp_y.y" /* yacc.c:1646 */ +#line 312 "hyp_y.y" /* yacc.c:1652 */ { h.layer_name = yylval.strval; h.layer_name_set = pcb_true; } -#line 2087 "hyp_y.c" /* yacc.c:1646 */ +#line 2094 "hyp_y.c" /* yacc.c:1652 */ break; case 106: -#line 315 "hyp_y.y" /* yacc.c:1646 */ +#line 315 "hyp_y.y" /* yacc.c:1652 */ { h.material_name = yylval.strval; h.material_name_set = pcb_true; } -#line 2093 "hyp_y.c" /* yacc.c:1646 */ +#line 2100 "hyp_y.c" /* yacc.c:1652 */ break; case 107: -#line 318 "hyp_y.y" /* yacc.c:1646 */ +#line 318 "hyp_y.y" /* yacc.c:1652 */ { h.plane_separation = yylval.floatval; h.plane_separation_set = pcb_true; } -#line 2099 "hyp_y.c" /* yacc.c:1646 */ +#line 2106 "hyp_y.c" /* yacc.c:1652 */ break; case 108: -#line 321 "hyp_y.y" /* yacc.c:1646 */ +#line 321 "hyp_y.y" /* yacc.c:1652 */ { h.conformal = yylval.boolval; h.conformal_set = pcb_true; } -#line 2105 "hyp_y.c" /* yacc.c:1646 */ +#line 2112 "hyp_y.c" /* yacc.c:1652 */ break; case 109: -#line 324 "hyp_y.y" /* yacc.c:1646 */ +#line 324 "hyp_y.y" /* yacc.c:1652 */ { h.prepreg = yylval.boolval; h.prepreg_set = pcb_true; } -#line 2111 "hyp_y.c" /* yacc.c:1646 */ +#line 2118 "hyp_y.c" /* yacc.c:1652 */ break; case 114: -#line 337 "hyp_y.y" /* yacc.c:1646 */ +#line 337 "hyp_y.y" /* yacc.c:1652 */ { new_record(); } -#line 2117 "hyp_y.c" /* yacc.c:1646 */ +#line 2124 "hyp_y.c" /* yacc.c:1652 */ break; case 115: -#line 337 "hyp_y.y" /* yacc.c:1646 */ +#line 337 "hyp_y.y" /* yacc.c:1652 */ { h.device_type = yylval.strval; } -#line 2123 "hyp_y.c" /* yacc.c:1646 */ +#line 2130 "hyp_y.c" /* yacc.c:1652 */ break; case 116: -#line 337 "hyp_y.y" /* yacc.c:1646 */ +#line 337 "hyp_y.y" /* yacc.c:1652 */ { h.ref = yylval.strval; } -#line 2129 "hyp_y.c" /* yacc.c:1646 */ +#line 2136 "hyp_y.c" /* yacc.c:1652 */ break; case 117: -#line 337 "hyp_y.y" /* yacc.c:1646 */ +#line 337 "hyp_y.y" /* yacc.c:1652 */ { if (exec_devices(&h)) YYERROR; } -#line 2135 "hyp_y.c" /* yacc.c:1646 */ +#line 2142 "hyp_y.c" /* yacc.c:1652 */ break; case 125: -#line 356 "hyp_y.y" /* yacc.c:1646 */ +#line 356 "hyp_y.y" /* yacc.c:1652 */ { h.name = yylval.strval; h.name_set = pcb_true; } -#line 2141 "hyp_y.c" /* yacc.c:1646 */ +#line 2148 "hyp_y.c" /* yacc.c:1652 */ break; case 128: -#line 364 "hyp_y.y" /* yacc.c:1646 */ +#line 364 "hyp_y.y" /* yacc.c:1652 */ { h.value_float = yylval.floatval; h.value_float_set = pcb_true; } -#line 2147 "hyp_y.c" /* yacc.c:1646 */ +#line 2154 "hyp_y.c" /* yacc.c:1652 */ break; case 129: -#line 367 "hyp_y.y" /* yacc.c:1646 */ +#line 367 "hyp_y.y" /* yacc.c:1652 */ { h.value_string = yylval.strval; h.value_string_set = pcb_true; } -#line 2153 "hyp_y.c" /* yacc.c:1646 */ +#line 2160 "hyp_y.c" /* yacc.c:1652 */ break; case 130: -#line 370 "hyp_y.y" /* yacc.c:1646 */ +#line 370 "hyp_y.y" /* yacc.c:1652 */ { h.package = yylval.strval; h.package_set = pcb_true; } -#line 2159 "hyp_y.c" /* yacc.c:1646 */ +#line 2166 "hyp_y.c" /* yacc.c:1652 */ break; case 134: -#line 382 "hyp_y.y" /* yacc.c:1646 */ +#line 382 "hyp_y.y" /* yacc.c:1652 */ { if (exec_supplies(&h)) YYERROR; } -#line 2165 "hyp_y.c" /* yacc.c:1646 */ +#line 2172 "hyp_y.c" /* yacc.c:1652 */ break; case 136: -#line 386 "hyp_y.y" /* yacc.c:1646 */ +#line 386 "hyp_y.y" /* yacc.c:1652 */ { h.voltage_specified = yylval.boolval; } -#line 2171 "hyp_y.c" /* yacc.c:1646 */ +#line 2178 "hyp_y.c" /* yacc.c:1652 */ break; case 137: -#line 389 "hyp_y.y" /* yacc.c:1646 */ +#line 389 "hyp_y.y" /* yacc.c:1652 */ { h.conversion = yylval.boolval; } -#line 2177 "hyp_y.c" /* yacc.c:1646 */ +#line 2184 "hyp_y.c" /* yacc.c:1652 */ break; case 138: -#line 394 "hyp_y.y" /* yacc.c:1646 */ +#line 394 "hyp_y.y" /* yacc.c:1652 */ { new_record(); } -#line 2183 "hyp_y.c" /* yacc.c:1646 */ +#line 2190 "hyp_y.c" /* yacc.c:1652 */ break; case 139: -#line 394 "hyp_y.y" /* yacc.c:1646 */ +#line 394 "hyp_y.y" /* yacc.c:1652 */ { h.padstack_name = yylval.strval; h.padstack_name_set = pcb_true; } -#line 2189 "hyp_y.c" /* yacc.c:1646 */ +#line 2196 "hyp_y.c" /* yacc.c:1652 */ break; case 140: -#line 394 "hyp_y.y" /* yacc.c:1646 */ +#line 394 "hyp_y.y" /* yacc.c:1652 */ { if (exec_pstk_end(&h)) YYERROR; } -#line 2195 "hyp_y.c" /* yacc.c:1646 */ +#line 2202 "hyp_y.c" /* yacc.c:1652 */ break; case 141: -#line 397 "hyp_y.y" /* yacc.c:1646 */ +#line 397 "hyp_y.y" /* yacc.c:1652 */ { h.drill_size = yylval.floatval; h.drill_size_set = pcb_true; } -#line 2201 "hyp_y.c" /* yacc.c:1646 */ +#line 2208 "hyp_y.c" /* yacc.c:1652 */ break; case 147: -#line 406 "hyp_y.y" /* yacc.c:1646 */ +#line 406 "hyp_y.y" /* yacc.c:1652 */ { h.layer_name = yylval.strval; h.layer_name_set = pcb_true; } -#line 2207 "hyp_y.c" /* yacc.c:1646 */ +#line 2214 "hyp_y.c" /* yacc.c:1652 */ break; case 148: -#line 406 "hyp_y.y" /* yacc.c:1646 */ +#line 406 "hyp_y.y" /* yacc.c:1652 */ { if (exec_pstk_element(&h)) YYERROR; new_record(); } -#line 2213 "hyp_y.c" /* yacc.c:1646 */ +#line 2220 "hyp_y.c" /* yacc.c:1652 */ break; case 150: -#line 410 "hyp_y.y" /* yacc.c:1646 */ +#line 410 "hyp_y.y" /* yacc.c:1652 */ { h.pad_shape = yylval.floatval; } -#line 2219 "hyp_y.c" /* yacc.c:1646 */ +#line 2226 "hyp_y.c" /* yacc.c:1652 */ break; case 152: -#line 411 "hyp_y.y" /* yacc.c:1646 */ +#line 411 "hyp_y.y" /* yacc.c:1652 */ { h.pad_shape = -1; } -#line 2225 "hyp_y.c" /* yacc.c:1646 */ +#line 2232 "hyp_y.c" /* yacc.c:1652 */ break; case 153: -#line 415 "hyp_y.y" /* yacc.c:1646 */ +#line 415 "hyp_y.y" /* yacc.c:1652 */ { h.pad_sx = yylval.floatval; } -#line 2231 "hyp_y.c" /* yacc.c:1646 */ +#line 2238 "hyp_y.c" /* yacc.c:1652 */ break; case 154: -#line 415 "hyp_y.y" /* yacc.c:1646 */ +#line 415 "hyp_y.y" /* yacc.c:1652 */ { h.pad_sy = yylval.floatval; } -#line 2237 "hyp_y.c" /* yacc.c:1646 */ +#line 2244 "hyp_y.c" /* yacc.c:1652 */ break; case 155: -#line 415 "hyp_y.y" /* yacc.c:1646 */ +#line 415 "hyp_y.y" /* yacc.c:1652 */ { h.pad_angle = yylval.floatval; } -#line 2243 "hyp_y.c" /* yacc.c:1646 */ +#line 2250 "hyp_y.c" /* yacc.c:1652 */ break; case 157: -#line 419 "hyp_y.y" /* yacc.c:1646 */ +#line 419 "hyp_y.y" /* yacc.c:1652 */ { h.pad_type = PAD_TYPE_METAL; h.pad_type_set = pcb_true; } -#line 2249 "hyp_y.c" /* yacc.c:1646 */ +#line 2256 "hyp_y.c" /* yacc.c:1652 */ break; case 158: -#line 420 "hyp_y.y" /* yacc.c:1646 */ +#line 420 "hyp_y.y" /* yacc.c:1652 */ { h.pad_type = PAD_TYPE_ANTIPAD; h.pad_type_set = pcb_true; } -#line 2255 "hyp_y.c" /* yacc.c:1646 */ +#line 2262 "hyp_y.c" /* yacc.c:1652 */ break; case 159: -#line 421 "hyp_y.y" /* yacc.c:1646 */ +#line 421 "hyp_y.y" /* yacc.c:1652 */ { h.thermal_clear_shape = yylval.floatval; } -#line 2261 "hyp_y.c" /* yacc.c:1646 */ +#line 2268 "hyp_y.c" /* yacc.c:1652 */ break; case 160: -#line 422 "hyp_y.y" /* yacc.c:1646 */ +#line 422 "hyp_y.y" /* yacc.c:1652 */ { h.thermal_clear_sx = yylval.floatval; } -#line 2267 "hyp_y.c" /* yacc.c:1646 */ +#line 2274 "hyp_y.c" /* yacc.c:1652 */ break; case 161: -#line 423 "hyp_y.y" /* yacc.c:1646 */ +#line 423 "hyp_y.y" /* yacc.c:1652 */ { h.thermal_clear_sy = yylval.floatval; } -#line 2273 "hyp_y.c" /* yacc.c:1646 */ +#line 2280 "hyp_y.c" /* yacc.c:1652 */ break; case 162: -#line 424 "hyp_y.y" /* yacc.c:1646 */ +#line 424 "hyp_y.y" /* yacc.c:1652 */ { h.thermal_clear_angle = yylval.floatval; } -#line 2279 "hyp_y.c" /* yacc.c:1646 */ +#line 2286 "hyp_y.c" /* yacc.c:1652 */ break; case 163: -#line 425 "hyp_y.y" /* yacc.c:1646 */ +#line 425 "hyp_y.y" /* yacc.c:1652 */ { h.pad_type = PAD_TYPE_THERMAL_RELIEF; h.pad_type_set = pcb_true; } -#line 2285 "hyp_y.c" /* yacc.c:1646 */ +#line 2292 "hyp_y.c" /* yacc.c:1652 */ break; case 164: -#line 431 "hyp_y.y" /* yacc.c:1646 */ +#line 431 "hyp_y.y" /* yacc.c:1652 */ { h.net_name = yylval.strval; if (exec_net(&h)) YYERROR; } -#line 2291 "hyp_y.c" /* yacc.c:1646 */ +#line 2298 "hyp_y.c" /* yacc.c:1652 */ break; case 166: -#line 434 "hyp_y.y" /* yacc.c:1646 */ +#line 434 "hyp_y.y" /* yacc.c:1652 */ { if (exec_net_plane_separation(&h)) YYERROR; } -#line 2297 "hyp_y.c" /* yacc.c:1646 */ +#line 2304 "hyp_y.c" /* yacc.c:1652 */ break; case 170: -#line 440 "hyp_y.y" /* yacc.c:1646 */ +#line 440 "hyp_y.y" /* yacc.c:1652 */ { hyyerror("warning: empty net"); } -#line 2303 "hyp_y.c" /* yacc.c:1646 */ +#line 2310 "hyp_y.c" /* yacc.c:1652 */ break; case 186: -#line 463 "hyp_y.y" /* yacc.c:1646 */ +#line 463 "hyp_y.y" /* yacc.c:1652 */ { new_record(); } -#line 2309 "hyp_y.c" /* yacc.c:1646 */ +#line 2316 "hyp_y.c" /* yacc.c:1652 */ break; case 187: -#line 463 "hyp_y.y" /* yacc.c:1646 */ +#line 463 "hyp_y.y" /* yacc.c:1652 */ { if (exec_seg(&h)) YYERROR; } -#line 2315 "hyp_y.c" /* yacc.c:1646 */ +#line 2322 "hyp_y.c" /* yacc.c:1652 */ break; case 188: -#line 466 "hyp_y.y" /* yacc.c:1646 */ +#line 466 "hyp_y.y" /* yacc.c:1652 */ { new_record(); } -#line 2321 "hyp_y.c" /* yacc.c:1646 */ +#line 2328 "hyp_y.c" /* yacc.c:1652 */ break; case 189: -#line 466 "hyp_y.y" /* yacc.c:1646 */ +#line 466 "hyp_y.y" /* yacc.c:1652 */ { if (exec_arc(&h)) YYERROR; } -#line 2327 "hyp_y.c" /* yacc.c:1646 */ +#line 2334 "hyp_y.c" /* yacc.c:1652 */ break; case 194: -#line 479 "hyp_y.y" /* yacc.c:1646 */ +#line 479 "hyp_y.y" /* yacc.c:1652 */ { h.width = yylval.floatval; h.width_set = pcb_true; } -#line 2333 "hyp_y.c" /* yacc.c:1646 */ +#line 2340 "hyp_y.c" /* yacc.c:1652 */ break; case 195: -#line 482 "hyp_y.y" /* yacc.c:1646 */ +#line 482 "hyp_y.y" /* yacc.c:1652 */ { h.left_plane_separation = yylval.floatval; h.left_plane_separation_set = pcb_true; } -#line 2339 "hyp_y.c" /* yacc.c:1646 */ +#line 2346 "hyp_y.c" /* yacc.c:1652 */ break; case 196: -#line 485 "hyp_y.y" /* yacc.c:1646 */ +#line 485 "hyp_y.y" /* yacc.c:1652 */ { new_record(); } -#line 2345 "hyp_y.c" /* yacc.c:1646 */ +#line 2352 "hyp_y.c" /* yacc.c:1652 */ break; case 197: -#line 485 "hyp_y.y" /* yacc.c:1646 */ +#line 485 "hyp_y.y" /* yacc.c:1652 */ { if (exec_via(&h)) YYERROR; } -#line 2351 "hyp_y.c" /* yacc.c:1646 */ +#line 2358 "hyp_y.c" /* yacc.c:1652 */ break; case 201: -#line 496 "hyp_y.y" /* yacc.c:1646 */ +#line 496 "hyp_y.y" /* yacc.c:1652 */ { h.drill_size = yylval.floatval; h.drill_size_set = pcb_true; } -#line 2357 "hyp_y.c" /* yacc.c:1646 */ +#line 2364 "hyp_y.c" /* yacc.c:1652 */ break; case 204: -#line 499 "hyp_y.y" /* yacc.c:1646 */ +#line 499 "hyp_y.y" /* yacc.c:1652 */ { h.via_pad_shape = yylval.strval; h.via_pad_shape_set = pcb_true; } -#line 2363 "hyp_y.c" /* yacc.c:1646 */ +#line 2370 "hyp_y.c" /* yacc.c:1652 */ break; case 205: -#line 500 "hyp_y.y" /* yacc.c:1646 */ +#line 500 "hyp_y.y" /* yacc.c:1652 */ { h.via_pad_sx = yylval.floatval; h.via_pad_sx_set = pcb_true; } -#line 2369 "hyp_y.c" /* yacc.c:1646 */ +#line 2376 "hyp_y.c" /* yacc.c:1652 */ break; case 206: -#line 501 "hyp_y.y" /* yacc.c:1646 */ +#line 501 "hyp_y.y" /* yacc.c:1652 */ { h.via_pad_sy = yylval.floatval; h.via_pad_sy_set = pcb_true; } -#line 2375 "hyp_y.c" /* yacc.c:1646 */ +#line 2382 "hyp_y.c" /* yacc.c:1652 */ break; case 207: -#line 502 "hyp_y.y" /* yacc.c:1646 */ +#line 502 "hyp_y.y" /* yacc.c:1652 */ { h.via_pad_angle = yylval.floatval; h.via_pad_angle_set = pcb_true; } -#line 2381 "hyp_y.c" /* yacc.c:1646 */ +#line 2388 "hyp_y.c" /* yacc.c:1652 */ break; case 208: -#line 503 "hyp_y.y" /* yacc.c:1646 */ +#line 503 "hyp_y.y" /* yacc.c:1652 */ { h.via_pad1_shape = yylval.strval; h.via_pad1_shape_set = pcb_true; } -#line 2387 "hyp_y.c" /* yacc.c:1646 */ +#line 2394 "hyp_y.c" /* yacc.c:1652 */ break; case 209: -#line 504 "hyp_y.y" /* yacc.c:1646 */ +#line 504 "hyp_y.y" /* yacc.c:1652 */ { h.via_pad1_sx = yylval.floatval; h.via_pad1_sx_set = pcb_true; } -#line 2393 "hyp_y.c" /* yacc.c:1646 */ +#line 2400 "hyp_y.c" /* yacc.c:1652 */ break; case 210: -#line 505 "hyp_y.y" /* yacc.c:1646 */ +#line 505 "hyp_y.y" /* yacc.c:1652 */ { h.via_pad1_sy = yylval.floatval; h.via_pad1_sy_set = pcb_true; } -#line 2399 "hyp_y.c" /* yacc.c:1646 */ +#line 2406 "hyp_y.c" /* yacc.c:1652 */ break; case 211: -#line 506 "hyp_y.y" /* yacc.c:1646 */ +#line 506 "hyp_y.y" /* yacc.c:1652 */ { h.via_pad1_angle = yylval.floatval; h.via_pad1_angle_set = pcb_true; } -#line 2405 "hyp_y.c" /* yacc.c:1646 */ +#line 2412 "hyp_y.c" /* yacc.c:1652 */ break; case 212: -#line 507 "hyp_y.y" /* yacc.c:1646 */ +#line 507 "hyp_y.y" /* yacc.c:1652 */ { h.via_pad2_shape = yylval.strval; h.via_pad2_shape_set = pcb_true; } -#line 2411 "hyp_y.c" /* yacc.c:1646 */ +#line 2418 "hyp_y.c" /* yacc.c:1652 */ break; case 213: -#line 508 "hyp_y.y" /* yacc.c:1646 */ +#line 508 "hyp_y.y" /* yacc.c:1652 */ { h.via_pad2_sx = yylval.floatval; h.via_pad2_sx_set = pcb_true; } -#line 2417 "hyp_y.c" /* yacc.c:1646 */ +#line 2424 "hyp_y.c" /* yacc.c:1652 */ break; case 214: -#line 509 "hyp_y.y" /* yacc.c:1646 */ +#line 509 "hyp_y.y" /* yacc.c:1652 */ { h.via_pad2_sy = yylval.floatval; h.via_pad2_sy_set = pcb_true; } -#line 2423 "hyp_y.c" /* yacc.c:1646 */ +#line 2430 "hyp_y.c" /* yacc.c:1652 */ break; case 215: -#line 510 "hyp_y.y" /* yacc.c:1646 */ +#line 510 "hyp_y.y" /* yacc.c:1652 */ { h.via_pad2_angle = yylval.floatval; h.via_pad2_angle_set = pcb_true; } -#line 2429 "hyp_y.c" /* yacc.c:1646 */ +#line 2436 "hyp_y.c" /* yacc.c:1652 */ break; case 216: -#line 514 "hyp_y.y" /* yacc.c:1646 */ +#line 514 "hyp_y.y" /* yacc.c:1652 */ { h.padstack_name = yylval.strval; h.padstack_name_set = pcb_true; } -#line 2435 "hyp_y.c" /* yacc.c:1646 */ +#line 2442 "hyp_y.c" /* yacc.c:1652 */ break; case 217: -#line 517 "hyp_y.y" /* yacc.c:1646 */ +#line 517 "hyp_y.y" /* yacc.c:1652 */ { h.layer1_name = yylval.strval; h.layer1_name_set = pcb_true; } -#line 2441 "hyp_y.c" /* yacc.c:1646 */ +#line 2448 "hyp_y.c" /* yacc.c:1652 */ break; case 218: -#line 520 "hyp_y.y" /* yacc.c:1646 */ +#line 520 "hyp_y.y" /* yacc.c:1652 */ { h.layer2_name = yylval.strval; h.layer2_name_set = pcb_true; } -#line 2447 "hyp_y.c" /* yacc.c:1646 */ +#line 2454 "hyp_y.c" /* yacc.c:1652 */ break; case 219: -#line 523 "hyp_y.y" /* yacc.c:1646 */ +#line 523 "hyp_y.y" /* yacc.c:1652 */ { new_record(); } -#line 2453 "hyp_y.c" /* yacc.c:1646 */ +#line 2460 "hyp_y.c" /* yacc.c:1652 */ break; case 220: -#line 523 "hyp_y.y" /* yacc.c:1646 */ +#line 523 "hyp_y.y" /* yacc.c:1652 */ { if (exec_pin(&h)) YYERROR; } -#line 2459 "hyp_y.c" /* yacc.c:1646 */ +#line 2466 "hyp_y.c" /* yacc.c:1652 */ break; case 225: -#line 536 "hyp_y.y" /* yacc.c:1646 */ +#line 536 "hyp_y.y" /* yacc.c:1652 */ { h.pin_reference = yylval.strval; h.pin_reference_set = pcb_true; } -#line 2465 "hyp_y.c" /* yacc.c:1646 */ +#line 2472 "hyp_y.c" /* yacc.c:1652 */ break; case 226: -#line 539 "hyp_y.y" /* yacc.c:1646 */ +#line 539 "hyp_y.y" /* yacc.c:1652 */ { h.pin_function = PIN_SIM_OUT; h.pin_function_set = pcb_true; } -#line 2471 "hyp_y.c" /* yacc.c:1646 */ +#line 2478 "hyp_y.c" /* yacc.c:1652 */ break; case 227: -#line 540 "hyp_y.y" /* yacc.c:1646 */ +#line 540 "hyp_y.y" /* yacc.c:1652 */ { h.pin_function = PIN_SIM_IN; h.pin_function_set = pcb_true; } -#line 2477 "hyp_y.c" /* yacc.c:1646 */ +#line 2484 "hyp_y.c" /* yacc.c:1652 */ break; case 228: -#line 541 "hyp_y.y" /* yacc.c:1646 */ +#line 541 "hyp_y.y" /* yacc.c:1652 */ { h.pin_function = PIN_SIM_BOTH; h.pin_function_set = pcb_true; } -#line 2483 "hyp_y.c" /* yacc.c:1646 */ +#line 2490 "hyp_y.c" /* yacc.c:1652 */ break; case 229: -#line 542 "hyp_y.y" /* yacc.c:1646 */ +#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"); } -#line 2489 "hyp_y.c" /* yacc.c:1646 */ +#line 2496 "hyp_y.c" /* yacc.c:1652 */ break; case 230: -#line 546 "hyp_y.y" /* yacc.c:1646 */ +#line 546 "hyp_y.y" /* yacc.c:1652 */ { new_record(); } -#line 2495 "hyp_y.c" /* yacc.c:1646 */ +#line 2502 "hyp_y.c" /* yacc.c:1652 */ break; case 231: -#line 546 "hyp_y.y" /* yacc.c:1646 */ +#line 546 "hyp_y.y" /* yacc.c:1652 */ { if (exec_pad(&h)) YYERROR; } -#line 2501 "hyp_y.c" /* yacc.c:1646 */ +#line 2508 "hyp_y.c" /* yacc.c:1652 */ break; case 235: -#line 555 "hyp_y.y" /* yacc.c:1646 */ +#line 555 "hyp_y.y" /* yacc.c:1652 */ { h.via_pad_shape = yylval.strval; h.via_pad_shape_set = pcb_true; } -#line 2507 "hyp_y.c" /* yacc.c:1646 */ +#line 2514 "hyp_y.c" /* yacc.c:1652 */ break; case 236: -#line 556 "hyp_y.y" /* yacc.c:1646 */ +#line 556 "hyp_y.y" /* yacc.c:1652 */ { h.via_pad_sx = yylval.floatval; h.via_pad_sx_set = pcb_true; } -#line 2513 "hyp_y.c" /* yacc.c:1646 */ +#line 2520 "hyp_y.c" /* yacc.c:1652 */ break; case 237: -#line 557 "hyp_y.y" /* yacc.c:1646 */ +#line 557 "hyp_y.y" /* yacc.c:1652 */ { h.via_pad_sy = yylval.floatval; h.via_pad_sy_set = pcb_true; } -#line 2519 "hyp_y.c" /* yacc.c:1646 */ +#line 2526 "hyp_y.c" /* yacc.c:1652 */ break; case 238: -#line 558 "hyp_y.y" /* yacc.c:1646 */ +#line 558 "hyp_y.y" /* yacc.c:1652 */ { h.via_pad_angle = yylval.floatval; h.via_pad_angle_set = pcb_true; } -#line 2525 "hyp_y.c" /* yacc.c:1646 */ +#line 2532 "hyp_y.c" /* yacc.c:1652 */ break; case 239: -#line 562 "hyp_y.y" /* yacc.c:1646 */ +#line 562 "hyp_y.y" /* yacc.c:1652 */ { new_record(); } -#line 2531 "hyp_y.c" /* yacc.c:1646 */ +#line 2538 "hyp_y.c" /* yacc.c:1652 */ break; case 240: -#line 562 "hyp_y.y" /* yacc.c:1646 */ +#line 562 "hyp_y.y" /* yacc.c:1652 */ { if (exec_useg(&h)) YYERROR; } -#line 2537 "hyp_y.c" /* yacc.c:1646 */ +#line 2544 "hyp_y.c" /* yacc.c:1652 */ break; case 243: -#line 570 "hyp_y.y" /* yacc.c:1646 */ +#line 570 "hyp_y.y" /* yacc.c:1652 */ { h.zlayer_name = yylval.strval; h.zlayer_name_set = pcb_true; } -#line 2543 "hyp_y.c" /* yacc.c:1646 */ +#line 2550 "hyp_y.c" /* yacc.c:1652 */ break; case 244: -#line 571 "hyp_y.y" /* yacc.c:1646 */ +#line 571 "hyp_y.y" /* yacc.c:1652 */ { h.width = yylval.floatval; } -#line 2549 "hyp_y.c" /* yacc.c:1646 */ +#line 2556 "hyp_y.c" /* yacc.c:1652 */ break; case 245: -#line 572 "hyp_y.y" /* yacc.c:1646 */ +#line 572 "hyp_y.y" /* yacc.c:1652 */ { h.length = yylval.floatval; } -#line 2555 "hyp_y.c" /* yacc.c:1646 */ +#line 2562 "hyp_y.c" /* yacc.c:1652 */ break; case 247: -#line 577 "hyp_y.y" /* yacc.c:1646 */ +#line 577 "hyp_y.y" /* yacc.c:1652 */ { h.impedance = yylval.floatval; h.impedance_set = pcb_true; } -#line 2561 "hyp_y.c" /* yacc.c:1646 */ +#line 2568 "hyp_y.c" /* yacc.c:1652 */ break; case 248: -#line 578 "hyp_y.y" /* yacc.c:1646 */ +#line 578 "hyp_y.y" /* yacc.c:1652 */ { h.delay = yylval.floatval; } -#line 2567 "hyp_y.c" /* yacc.c:1646 */ +#line 2574 "hyp_y.c" /* yacc.c:1652 */ break; case 250: -#line 582 "hyp_y.y" /* yacc.c:1646 */ +#line 582 "hyp_y.y" /* yacc.c:1652 */ { h.resistance = yylval.floatval; h.resistance_set = pcb_true;} -#line 2573 "hyp_y.c" /* yacc.c:1646 */ +#line 2580 "hyp_y.c" /* yacc.c:1652 */ break; case 253: -#line 588 "hyp_y.y" /* yacc.c:1646 */ +#line 588 "hyp_y.y" /* yacc.c:1652 */ { new_record(); } -#line 2579 "hyp_y.c" /* yacc.c:1646 */ +#line 2586 "hyp_y.c" /* yacc.c:1652 */ break; case 254: -#line 588 "hyp_y.y" /* yacc.c:1646 */ +#line 588 "hyp_y.y" /* yacc.c:1652 */ { if (exec_polygon_begin(&h)) YYERROR; } -#line 2585 "hyp_y.c" /* yacc.c:1646 */ +#line 2592 "hyp_y.c" /* yacc.c:1652 */ break; case 255: -#line 589 "hyp_y.y" /* yacc.c:1646 */ +#line 589 "hyp_y.y" /* yacc.c:1652 */ { if (exec_polygon_end(&h)) YYERROR; } -#line 2591 "hyp_y.c" /* yacc.c:1646 */ +#line 2598 "hyp_y.c" /* yacc.c:1652 */ break; case 262: -#line 604 "hyp_y.y" /* yacc.c:1646 */ +#line 604 "hyp_y.y" /* yacc.c:1652 */ { h.id = yylval.intval; h.id_set = pcb_true; } -#line 2597 "hyp_y.c" /* yacc.c:1646 */ +#line 2604 "hyp_y.c" /* yacc.c:1652 */ break; case 263: -#line 608 "hyp_y.y" /* yacc.c:1646 */ +#line 608 "hyp_y.y" /* yacc.c:1652 */ { h.polygon_type = POLYGON_TYPE_POUR; h.polygon_type_set = pcb_true; } -#line 2603 "hyp_y.c" /* yacc.c:1646 */ +#line 2610 "hyp_y.c" /* yacc.c:1652 */ break; case 264: -#line 609 "hyp_y.y" /* yacc.c:1646 */ +#line 609 "hyp_y.y" /* yacc.c:1652 */ { h.polygon_type = POLYGON_TYPE_PLANE; h.polygon_type_set = pcb_true; } -#line 2609 "hyp_y.c" /* yacc.c:1646 */ +#line 2616 "hyp_y.c" /* yacc.c:1652 */ break; case 265: -#line 610 "hyp_y.y" /* yacc.c:1646 */ +#line 610 "hyp_y.y" /* yacc.c:1652 */ { h.polygon_type = POLYGON_TYPE_COPPER; h.polygon_type_set = pcb_true; } -#line 2615 "hyp_y.c" /* yacc.c:1646 */ +#line 2622 "hyp_y.c" /* yacc.c:1652 */ break; case 266: -#line 614 "hyp_y.y" /* yacc.c:1646 */ +#line 614 "hyp_y.y" /* yacc.c:1652 */ { new_record(); } -#line 2621 "hyp_y.c" /* yacc.c:1646 */ +#line 2628 "hyp_y.c" /* yacc.c:1652 */ break; case 267: -#line 614 "hyp_y.y" /* yacc.c:1646 */ +#line 614 "hyp_y.y" /* yacc.c:1652 */ { if (exec_polyvoid_begin(&h)) YYERROR; } -#line 2627 "hyp_y.c" /* yacc.c:1646 */ +#line 2634 "hyp_y.c" /* yacc.c:1652 */ break; case 268: -#line 615 "hyp_y.y" /* yacc.c:1646 */ +#line 615 "hyp_y.y" /* yacc.c:1652 */ { if (exec_polyvoid_end(&h)) YYERROR; } -#line 2633 "hyp_y.c" /* yacc.c:1646 */ +#line 2640 "hyp_y.c" /* yacc.c:1652 */ break; case 269: -#line 618 "hyp_y.y" /* yacc.c:1646 */ +#line 618 "hyp_y.y" /* yacc.c:1652 */ { new_record(); } -#line 2639 "hyp_y.c" /* yacc.c:1646 */ +#line 2646 "hyp_y.c" /* yacc.c:1652 */ break; case 270: -#line 618 "hyp_y.y" /* yacc.c:1646 */ +#line 618 "hyp_y.y" /* yacc.c:1652 */ { if (exec_polyline_begin(&h)) YYERROR; } -#line 2645 "hyp_y.c" /* yacc.c:1646 */ +#line 2652 "hyp_y.c" /* yacc.c:1652 */ break; case 271: -#line 619 "hyp_y.y" /* yacc.c:1646 */ +#line 619 "hyp_y.y" /* yacc.c:1652 */ { if (exec_polyline_end(&h)) YYERROR; } -#line 2651 "hyp_y.c" /* yacc.c:1646 */ +#line 2658 "hyp_y.c" /* yacc.c:1652 */ break; case 276: -#line 629 "hyp_y.y" /* yacc.c:1646 */ +#line 629 "hyp_y.y" /* yacc.c:1652 */ { hyyerror("warning: unexpected ')'"); } -#line 2657 "hyp_y.c" /* yacc.c:1646 */ +#line 2664 "hyp_y.c" /* yacc.c:1652 */ break; case 278: -#line 634 "hyp_y.y" /* yacc.c:1646 */ +#line 634 "hyp_y.y" /* yacc.c:1652 */ { new_record(); } -#line 2663 "hyp_y.c" /* yacc.c:1646 */ +#line 2670 "hyp_y.c" /* yacc.c:1652 */ break; case 279: -#line 634 "hyp_y.y" /* yacc.c:1646 */ +#line 634 "hyp_y.y" /* yacc.c:1652 */ { if (exec_line(&h)) YYERROR; } -#line 2669 "hyp_y.c" /* yacc.c:1646 */ +#line 2676 "hyp_y.c" /* yacc.c:1652 */ break; case 280: -#line 637 "hyp_y.y" /* yacc.c:1646 */ +#line 637 "hyp_y.y" /* yacc.c:1652 */ { new_record(); } -#line 2675 "hyp_y.c" /* yacc.c:1646 */ +#line 2682 "hyp_y.c" /* yacc.c:1652 */ break; case 281: -#line 637 "hyp_y.y" /* yacc.c:1646 */ +#line 637 "hyp_y.y" /* yacc.c:1652 */ { if (exec_curve(&h)) YYERROR; } -#line 2681 "hyp_y.c" /* yacc.c:1646 */ +#line 2688 "hyp_y.c" /* yacc.c:1652 */ break; case 282: -#line 640 "hyp_y.y" /* yacc.c:1646 */ +#line 640 "hyp_y.y" /* yacc.c:1652 */ { h.name = yylval.strval; } -#line 2687 "hyp_y.c" /* yacc.c:1646 */ +#line 2694 "hyp_y.c" /* yacc.c:1652 */ break; case 283: -#line 640 "hyp_y.y" /* yacc.c:1646 */ +#line 640 "hyp_y.y" /* yacc.c:1652 */ { h.value = yylval.strval; } -#line 2693 "hyp_y.c" /* yacc.c:1646 */ +#line 2700 "hyp_y.c" /* yacc.c:1652 */ break; case 284: -#line 640 "hyp_y.y" /* yacc.c:1646 */ +#line 640 "hyp_y.y" /* yacc.c:1652 */ { if (exec_net_attribute(&h)) YYERROR; } -#line 2699 "hyp_y.c" /* yacc.c:1646 */ +#line 2706 "hyp_y.c" /* yacc.c:1652 */ break; case 285: -#line 645 "hyp_y.y" /* yacc.c:1646 */ +#line 645 "hyp_y.y" /* yacc.c:1652 */ { h.net_class_name = yylval.strval; if (exec_net_class(&h)) YYERROR; } -#line 2705 "hyp_y.c" /* yacc.c:1646 */ +#line 2712 "hyp_y.c" /* yacc.c:1652 */ break; case 294: -#line 664 "hyp_y.y" /* yacc.c:1646 */ +#line 664 "hyp_y.y" /* yacc.c:1652 */ { h.net_name = yylval.strval; } -#line 2711 "hyp_y.c" /* yacc.c:1646 */ +#line 2718 "hyp_y.c" /* yacc.c:1652 */ break; case 295: -#line 664 "hyp_y.y" /* yacc.c:1646 */ +#line 664 "hyp_y.y" /* yacc.c:1652 */ { if (exec_net_class_element(&h)) YYERROR; } -#line 2717 "hyp_y.c" /* yacc.c:1646 */ +#line 2724 "hyp_y.c" /* yacc.c:1652 */ break; case 296: -#line 667 "hyp_y.y" /* yacc.c:1646 */ +#line 667 "hyp_y.y" /* yacc.c:1652 */ { h.name = yylval.strval; } -#line 2723 "hyp_y.c" /* yacc.c:1646 */ +#line 2730 "hyp_y.c" /* yacc.c:1652 */ break; case 297: -#line 667 "hyp_y.y" /* yacc.c:1646 */ +#line 667 "hyp_y.y" /* yacc.c:1652 */ { h.value = yylval.strval; } -#line 2729 "hyp_y.c" /* yacc.c:1646 */ +#line 2736 "hyp_y.c" /* yacc.c:1652 */ break; case 298: -#line 667 "hyp_y.y" /* yacc.c:1646 */ +#line 667 "hyp_y.y" /* yacc.c:1652 */ { if (exec_net_class_attribute(&h)) YYERROR; } -#line 2735 "hyp_y.c" /* yacc.c:1646 */ +#line 2742 "hyp_y.c" /* yacc.c:1652 */ break; case 299: -#line 672 "hyp_y.y" /* yacc.c:1646 */ +#line 672 "hyp_y.y" /* yacc.c:1652 */ { if (exec_end(&h)) YYERROR; } -#line 2741 "hyp_y.c" /* yacc.c:1646 */ +#line 2748 "hyp_y.c" /* yacc.c:1652 */ break; case 300: -#line 677 "hyp_y.y" /* yacc.c:1646 */ +#line 677 "hyp_y.y" /* yacc.c:1652 */ { h.key = yylval.strval; } -#line 2747 "hyp_y.c" /* yacc.c:1646 */ +#line 2754 "hyp_y.c" /* yacc.c:1652 */ break; case 301: -#line 677 "hyp_y.y" /* yacc.c:1646 */ +#line 677 "hyp_y.y" /* yacc.c:1652 */ { if (exec_key(&h)) YYERROR; } -#line 2753 "hyp_y.c" /* yacc.c:1646 */ +#line 2760 "hyp_y.c" /* yacc.c:1652 */ break; case 302: -#line 682 "hyp_y.y" /* yacc.c:1646 */ +#line 682 "hyp_y.y" /* yacc.c:1652 */ { h.x = yylval.floatval; } -#line 2759 "hyp_y.c" /* yacc.c:1646 */ +#line 2766 "hyp_y.c" /* yacc.c:1652 */ break; case 303: -#line 682 "hyp_y.y" /* yacc.c:1646 */ +#line 682 "hyp_y.y" /* yacc.c:1652 */ { h.y = yylval.floatval; } -#line 2765 "hyp_y.c" /* yacc.c:1646 */ +#line 2772 "hyp_y.c" /* yacc.c:1652 */ break; case 304: -#line 685 "hyp_y.y" /* yacc.c:1646 */ +#line 685 "hyp_y.y" /* yacc.c:1652 */ { h.x1 = yylval.floatval; } -#line 2771 "hyp_y.c" /* yacc.c:1646 */ +#line 2778 "hyp_y.c" /* yacc.c:1652 */ break; case 305: -#line 685 "hyp_y.y" /* yacc.c:1646 */ +#line 685 "hyp_y.y" /* yacc.c:1652 */ { h.y1 = yylval.floatval; } -#line 2777 "hyp_y.c" /* yacc.c:1646 */ +#line 2784 "hyp_y.c" /* yacc.c:1652 */ break; case 306: -#line 688 "hyp_y.y" /* yacc.c:1646 */ +#line 688 "hyp_y.y" /* yacc.c:1652 */ { h.x2 = yylval.floatval; } -#line 2783 "hyp_y.c" /* yacc.c:1646 */ +#line 2790 "hyp_y.c" /* yacc.c:1652 */ break; case 307: -#line 688 "hyp_y.y" /* yacc.c:1646 */ +#line 688 "hyp_y.y" /* yacc.c:1652 */ { h.y2 = yylval.floatval; } -#line 2789 "hyp_y.c" /* yacc.c:1646 */ +#line 2796 "hyp_y.c" /* yacc.c:1652 */ break; case 309: -#line 694 "hyp_y.y" /* yacc.c:1646 */ +#line 694 "hyp_y.y" /* yacc.c:1652 */ { h.xc = yylval.floatval; } -#line 2795 "hyp_y.c" /* yacc.c:1646 */ +#line 2802 "hyp_y.c" /* yacc.c:1652 */ break; case 310: -#line 694 "hyp_y.y" /* yacc.c:1646 */ +#line 694 "hyp_y.y" /* yacc.c:1652 */ { h.yc = yylval.floatval; } -#line 2801 "hyp_y.c" /* yacc.c:1646 */ +#line 2808 "hyp_y.c" /* yacc.c:1652 */ break; case 311: -#line 694 "hyp_y.y" /* yacc.c:1646 */ +#line 694 "hyp_y.y" /* yacc.c:1652 */ { h.r = yylval.floatval; } -#line 2807 "hyp_y.c" /* yacc.c:1646 */ +#line 2814 "hyp_y.c" /* yacc.c:1652 */ break; -#line 2811 "hyp_y.c" /* yacc.c:1646 */ +#line 2818 "hyp_y.c" /* yacc.c:1652 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -2832,15 +2839,14 @@ /* Now 'shift' the result of the reduction. Determine what state that goes to, based on the state we popped back to and the rule number reduced by. */ + { + const int yylhs = yyr1[yyn] - YYNTOKENS; + const int yyi = yypgoto[yylhs] + *yyssp; + yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp + ? yytable[yyi] + : yydefgoto[yylhs]); + } - yyn = yyr1[yyn]; - - yystate = yypgoto[yyn - YYNTOKENS] + *yyssp; - if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp) - yystate = yytable[yystate]; - else - yystate = yydefgoto[yyn - YYNTOKENS]; - goto yynewstate; @@ -2922,13 +2928,11 @@ | yyerrorlab -- error raised explicitly by YYERROR. | `---------------------------------------------------*/ yyerrorlab: + /* Pacify compilers when the user code never invokes YYERROR and the + label yyerrorlab therefore never appears in user code. */ + if (0) + YYERROR; - /* Pacify compilers like GCC when the user code never invokes - YYERROR and the label yyerrorlab therefore never appears in user - code. */ - if (/*CONSTCOND*/ 0) - goto yyerrorlab; - /* Do not reclaim the symbols of the rule whose action triggered this YYERROR. */ YYPOPSTACK (yylen); @@ -2989,6 +2993,7 @@ yyresult = 0; goto yyreturn; + /*-----------------------------------. | yyabortlab -- YYABORT comes here. | `-----------------------------------*/ @@ -2996,6 +3001,7 @@ yyresult = 1; goto yyreturn; + #if !defined yyoverflow || YYERROR_VERBOSE /*-------------------------------------------------. | yyexhaustedlab -- memory exhaustion comes here. | @@ -3006,6 +3012,10 @@ /* Fall through. */ #endif + +/*-----------------------------------------------------. +| yyreturn -- parsing is finished, return the result. | +`-----------------------------------------------------*/ yyreturn: if (yychar != YYEMPTY) { @@ -3035,7 +3045,7 @@ #endif return yyresult; } -#line 696 "hyp_y.y" /* yacc.c:1906 */ +#line 696 "hyp_y.y" /* yacc.c:1918 */ /* Index: hyp_y.h =================================================================== --- hyp_y.h (revision 24882) +++ hyp_y.h (revision 24883) @@ -1,8 +1,9 @@ -/* A Bison parser, made by GNU Bison 3.0.2. */ +/* A Bison parser, made by GNU Bison 3.3.2. */ /* Bison interface for Yacc-like parsers in C - Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc. + Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation, + Inc. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -30,6 +31,9 @@ This special exception was added by the Free Software Foundation in version 2.2 of Bison. */ +/* Undocumented macros, especially those whose name start with YY_, + are private implementation details. Do not rely on them. */ + #ifndef YY_HYY_HYP_Y_H_INCLUDED # define YY_HYY_HYP_Y_H_INCLUDED /* Debug traces. */ @@ -48,11 +52,11 @@ extern int hyydebug; #endif /* "%code requires" blocks. */ -#line 21 "hyp_y.y" /* yacc.c:1909 */ +#line 21 "hyp_y.y" /* yacc.c:1921 */ #include "parser.h" -#line 56 "hyp_y.h" /* yacc.c:1909 */ +#line 60 "hyp_y.h" /* yacc.c:1921 */ /* Token type. */ #ifndef HYYTOKENTYPE @@ -165,10 +169,10 @@ /* Value type. */ #if ! defined HYYSTYPE && ! defined HYYSTYPE_IS_DECLARED -typedef union HYYSTYPE HYYSTYPE; + union HYYSTYPE { -#line 30 "hyp_y.y" /* yacc.c:1909 */ +#line 30 "hyp_y.y" /* yacc.c:1921 */ int boolval; int intval; @@ -175,8 +179,10 @@ double floatval; char* strval; -#line 179 "hyp_y.h" /* yacc.c:1909 */ +#line 183 "hyp_y.h" /* yacc.c:1921 */ }; + +typedef union HYYSTYPE HYYSTYPE; # define HYYSTYPE_IS_TRIVIAL 1 # define HYYSTYPE_IS_DECLARED 1 #endif Index: parser.c =================================================================== --- parser.c (revision 24882) +++ parser.c (revision 24883) @@ -650,11 +650,11 @@ } } - width = max(PCB->MaxWidth, x_max - x_min + slack); - height = max(PCB->MaxHeight, y_max - y_min + slack); + width = max(PCB->hidlib.size_x, x_max - x_min + slack); + height = max(PCB->hidlib.size_y, y_max - y_min + slack); /* resize if board too small */ - if ((width > PCB->MaxWidth) || (height > PCB->MaxHeight)) + if ((width > PCB->hidlib.size_x) || (height > PCB->hidlib.size_y)) pcb_board_resize(width, height); return; Index: write.c =================================================================== --- write.c (revision 24882) +++ write.c (revision 24883) @@ -59,7 +59,7 @@ /* pcb-rnd y-axis points down; hyperlynx y-axis points up */ static pcb_coord_t flip(pcb_coord_t y) { - return (PCB->MaxHeight - y); + return (PCB->hidlib.size_y - y); } static void hyp_grp_init(hyp_wr_t *wr) @@ -371,10 +371,10 @@ if (!has_outline) { /* implicit outline */ fprintf(wr->f, "* implicit outline derived from board width and height\n"); - write_pr_line(wr, 0, 0, PCB->MaxWidth, 0); - write_pr_line(wr, 0, 0, 0, PCB->MaxHeight); - write_pr_line(wr, PCB->MaxWidth, 0, PCB->MaxWidth, PCB->MaxHeight); - write_pr_line(wr, 0, PCB->MaxHeight, PCB->MaxWidth, PCB->MaxHeight); + write_pr_line(wr, 0, 0, PCB->hidlib.size_x, 0); + write_pr_line(wr, 0, 0, 0, PCB->hidlib.size_y); + write_pr_line(wr, PCB->hidlib.size_x, 0, PCB->hidlib.size_x, PCB->hidlib.size_y); + write_pr_line(wr, 0, PCB->hidlib.size_y, PCB->hidlib.size_x, PCB->hidlib.size_y); } else { /* explicit outline */ for(i = 0, g = PCB->LayerGroups.grp; i < PCB->LayerGroups.len; i++,g++) {