summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/groff/files
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2019-08-05 12:34:29 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-06 11:24:27 +0100
commit09992cb5a48b958970e256280f642033cd09df25 (patch)
tree5481a79f5fc7d2b2c05f8e2352b39e36a668f43e /meta/recipes-extended/groff/files
parentcd671da06dbc6b504caae7bfe1cff2155654d755 (diff)
downloadpoky-09992cb5a48b958970e256280f642033cd09df25.tar.gz
groff: Fix math.h inclusion from system headers issue
groff has system headers overrides in its sourcecode which it generates as fallbacks but in some cases when a system header includes math.h via include <> directive it lands in the override header and causes compile issues, seen with clang+libc++, this patch makes sure that right defines are available before including it (From OE-Core rev: e9beba2a33b46d31bfdd926211d22ebf2abb6c90) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/groff/files')
-rw-r--r--meta/recipes-extended/groff/files/0001-Include-config.h.patch1228
1 files changed, 1228 insertions, 0 deletions
diff --git a/meta/recipes-extended/groff/files/0001-Include-config.h.patch b/meta/recipes-extended/groff/files/0001-Include-config.h.patch
new file mode 100644
index 0000000000..348a61d9df
--- /dev/null
+++ b/meta/recipes-extended/groff/files/0001-Include-config.h.patch
@@ -0,0 +1,1228 @@
1From 6cfa9f8126c1d6ec26f120d273e714fb19108873 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 4 Aug 2019 16:32:41 -0700
4Subject: [PATCH] Include config.h
5
6This helps avoid the include conflicts where <stdlib.h> is including
7<math.h> and since -I./lib is used and a local math.h wrapper is
8residing in there, the build breaks since stdlib.h really wants the
9standard system math.h to be included, this ensures that right macros
10are predefined and included before stdlib.h is included
11
12fixes
13In file included from src/libs/libgroff/assert.cpp:20:
14In file included from TOPDIR/build/tmp/work/aarch64-yoe-linux-musl/groff/1.22.4-r0/recipe-sysroot/usr/include/c++/v1/stdlib.h:100:
15./lib/math.h:38:3: error: "Please include config.h first."
16 #error "Please include config.h first."
17 ^
18./lib/math.h:40:1: error: unknown type name '_GL_INLINE_HEADER_BEGIN'
19
20Upstream-Status: Pending
21Signed-off-by: Khem Raj <raj.khem@gmail.com>
22---
23 src/libs/libgroff/assert.cpp | 4 +
24 src/libs/libgroff/curtime.cpp | 4 +
25 src/libs/libgroff/device.cpp | 4 +
26 src/libs/libgroff/error.cpp | 4 +
27 src/libs/libgroff/fatal.cpp | 4 +
28 src/libs/libgroff/string.cpp | 4 +
29 src/libs/libgroff/strsave.cpp | 4 +
30 src/preproc/eqn/eqn.cpp | 450 ++++++++++++++++++----------------
31 src/preproc/eqn/eqn.hpp | 12 +-
32 src/preproc/eqn/eqn.ypp | 4 +
33 src/preproc/eqn/other.cpp | 4 +
34 src/preproc/eqn/text.cpp | 4 +
35 src/preproc/pic/object.cpp | 4 +
36 13 files changed, 285 insertions(+), 221 deletions(-)
37
38diff --git a/src/libs/libgroff/assert.cpp b/src/libs/libgroff/assert.cpp
39index aceed05..97780d6 100644
40--- a/src/libs/libgroff/assert.cpp
41+++ b/src/libs/libgroff/assert.cpp
42@@ -16,6 +16,10 @@ for more details.
43 You should have received a copy of the GNU General Public License
44 along with this program. If not, see <http://www.gnu.org/licenses/>. */
45
46+#if HAVE_CONFIG_H
47+# include <config.h>
48+#endif
49+
50 #include <stdio.h>
51 #include <stdlib.h>
52 #include "assert.h"
53diff --git a/src/libs/libgroff/curtime.cpp b/src/libs/libgroff/curtime.cpp
54index 72fe067..9ddba08 100644
55--- a/src/libs/libgroff/curtime.cpp
56+++ b/src/libs/libgroff/curtime.cpp
57@@ -15,6 +15,10 @@ for more details.
58 The GNU General Public License version 2 (GPL2) is available in the
59 internet at <http://www.gnu.org/licenses/gpl-2.0.txt>. */
60
61+#if HAVE_CONFIG_H
62+# include <config.h>
63+#endif
64+
65 #include <errno.h>
66 #include <limits.h>
67 #include <stdlib.h>
68diff --git a/src/libs/libgroff/device.cpp b/src/libs/libgroff/device.cpp
69index 0d28b85..c211f85 100644
70--- a/src/libs/libgroff/device.cpp
71+++ b/src/libs/libgroff/device.cpp
72@@ -17,6 +17,10 @@ for more details.
73 You should have received a copy of the GNU General Public License
74 along with this program. If not, see <http://www.gnu.org/licenses/>. */
75
76+#if HAVE_CONFIG_H
77+# include <config.h>
78+#endif
79+
80 #include <stdlib.h>
81 #include "device.h"
82 #include "defs.h"
83diff --git a/src/libs/libgroff/error.cpp b/src/libs/libgroff/error.cpp
84index 9a18803..7b63d3d 100644
85--- a/src/libs/libgroff/error.cpp
86+++ b/src/libs/libgroff/error.cpp
87@@ -17,6 +17,10 @@ for more details.
88 You should have received a copy of the GNU General Public License
89 along with this program. If not, see <http://www.gnu.org/licenses/>. */
90
91+#if HAVE_CONFIG_H
92+# include <config.h>
93+#endif
94+
95 #include <stdio.h>
96 #include <stdlib.h>
97 #include <string.h>
98diff --git a/src/libs/libgroff/fatal.cpp b/src/libs/libgroff/fatal.cpp
99index c0dcb35..fd6003e 100644
100--- a/src/libs/libgroff/fatal.cpp
101+++ b/src/libs/libgroff/fatal.cpp
102@@ -16,6 +16,10 @@ for more details.
103 You should have received a copy of the GNU General Public License
104 along with this program. If not, see <http://www.gnu.org/licenses/>. */
105
106+#if HAVE_CONFIG_H
107+# include <config.h>
108+#endif
109+
110 #include <stdlib.h>
111
112 #define FATAL_ERROR_EXIT_CODE 3
113diff --git a/src/libs/libgroff/string.cpp b/src/libs/libgroff/string.cpp
114index 46c015c..449f3a6 100644
115--- a/src/libs/libgroff/string.cpp
116+++ b/src/libs/libgroff/string.cpp
117@@ -17,6 +17,10 @@ for more details.
118 You should have received a copy of the GNU General Public License
119 along with this program. If not, see <http://www.gnu.org/licenses/>. */
120
121+#if HAVE_CONFIG_H
122+# include <config.h>
123+#endif
124+
125 #include <stdlib.h>
126
127 #include "lib.h"
128diff --git a/src/libs/libgroff/strsave.cpp b/src/libs/libgroff/strsave.cpp
129index f95c05e..d875045 100644
130--- a/src/libs/libgroff/strsave.cpp
131+++ b/src/libs/libgroff/strsave.cpp
132@@ -17,6 +17,10 @@ for more details.
133 You should have received a copy of the GNU General Public License
134 along with this program. If not, see <http://www.gnu.org/licenses/>. */
135
136+#if HAVE_CONFIG_H
137+# include <config.h>
138+#endif
139+
140 #include <string.h>
141 #include <stdlib.h>
142
143diff --git a/src/preproc/eqn/eqn.cpp b/src/preproc/eqn/eqn.cpp
144index 4ede465..fdd9484 100644
145--- a/src/preproc/eqn/eqn.cpp
146+++ b/src/preproc/eqn/eqn.cpp
147@@ -1,8 +1,9 @@
148-/* A Bison parser, made by GNU Bison 3.2. */
149+/* A Bison parser, made by GNU Bison 3.4.1. */
150
151 /* Bison implementation for Yacc-like parsers in C
152
153- Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc.
154+ Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
155+ Inc.
156
157 This program is free software: you can redistribute it and/or modify
158 it under the terms of the GNU General Public License as published by
159@@ -47,7 +48,7 @@
160 #define YYBISON 1
161
162 /* Bison version. */
163-#define YYBISON_VERSION "3.2"
164+#define YYBISON_VERSION "3.4.1"
165
166 /* Skeleton name. */
167 #define YYSKELETON_NAME "yacc.c"
168@@ -65,7 +66,11 @@
169
170
171 /* First part of user prologue. */
172-#line 18 "../src/preproc/eqn/eqn.ypp" /* yacc.c:338 */
173+#line 18 "src/preproc/eqn/eqn.ypp"
174+
175+#if HAVE_CONFIG_H
176+# include <config.h>
177+#endif
178
179 #include <stdio.h>
180 #include <string.h>
181@@ -77,7 +82,8 @@ extern int non_empty_flag;
182 int yylex();
183 void yyerror(const char *);
184
185-#line 81 "src/preproc/eqn/eqn.cpp" /* yacc.c:338 */
186+#line 86 "src/preproc/eqn/eqn.cpp"
187+
188 # ifndef YY_NULLPTR
189 # if defined __cplusplus
190 # if 201103L <= __cplusplus
191@@ -98,8 +104,8 @@ void yyerror(const char *);
192 # define YYERROR_VERBOSE 0
193 #endif
194
195-/* In a future release of Bison, this section will be replaced
196- by #include "y.tab.h". */
197+/* Use api.header.include to #include this header
198+ instead of duplicating it here. */
199 #ifndef YY_YY_SRC_PREPROC_EQN_EQN_HPP_INCLUDED
200 # define YY_YY_SRC_PREPROC_EQN_EQN_HPP_INCLUDED
201 /* Debug traces. */
202@@ -237,10 +243,9 @@ extern int yydebug;
203
204 /* Value type. */
205 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
206-
207 union YYSTYPE
208 {
209-#line 30 "../src/preproc/eqn/eqn.ypp" /* yacc.c:353 */
210+#line 34 "src/preproc/eqn/eqn.ypp"
211
212 char *str;
213 box *b;
214@@ -249,9 +254,9 @@ union YYSTYPE
215 int n;
216 column *col;
217
218-#line 253 "src/preproc/eqn/eqn.cpp" /* yacc.c:353 */
219-};
220+#line 258 "src/preproc/eqn/eqn.cpp"
221
222+};
223 typedef union YYSTYPE YYSTYPE;
224 # define YYSTYPE_IS_TRIVIAL 1
225 # define YYSTYPE_IS_DECLARED 1
226@@ -366,6 +371,8 @@ typedef short yytype_int16;
227 #endif
228
229
230+#define YY_ASSERT(E) ((void) (0 && (E)))
231+
232 #if ! defined yyoverflow || YYERROR_VERBOSE
233
234 /* The parser invokes alloca or malloc; define the necessary symbols. */
235@@ -508,16 +515,16 @@ union yyalloc
236 /* YYNSTATES -- Number of states. */
237 #define YYNSTATES 142
238
239-/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
240- by yylex, with out-of-bounds checking. */
241 #define YYUNDEFTOK 2
242 #define YYMAXUTOK 315
243
244+/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
245+ as returned by yylex, with out-of-bounds checking. */
246 #define YYTRANSLATE(YYX) \
247 ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
248
249 /* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
250- as returned by yylex, without out-of-bounds checking. */
251+ as returned by yylex. */
252 static const yytype_uint8 yytranslate[] =
253 {
254 0, 2, 2, 2, 2, 2, 2, 2, 2, 63,
255@@ -558,14 +565,14 @@ static const yytype_uint8 yytranslate[] =
256 /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */
257 static const yytype_uint16 yyrline[] =
258 {
259- 0, 121, 121, 123, 128, 130, 141, 143, 145, 150,
260- 152, 154, 156, 158, 163, 165, 167, 169, 174, 176,
261- 181, 183, 185, 190, 192, 194, 196, 198, 200, 202,
262- 204, 206, 208, 210, 212, 214, 216, 218, 220, 222,
263- 224, 226, 228, 230, 232, 234, 236, 238, 240, 242,
264- 244, 246, 248, 250, 252, 254, 259, 269, 271, 276,
265- 278, 283, 285, 290, 292, 297, 299, 304, 306, 308,
266- 310, 314, 316, 321, 323, 325
267+ 0, 125, 125, 127, 132, 134, 145, 147, 149, 154,
268+ 156, 158, 160, 162, 167, 169, 171, 173, 178, 180,
269+ 185, 187, 189, 194, 196, 198, 200, 202, 204, 206,
270+ 208, 210, 212, 214, 216, 218, 220, 222, 224, 226,
271+ 228, 230, 232, 234, 236, 238, 240, 242, 244, 246,
272+ 248, 250, 252, 254, 256, 258, 263, 273, 275, 280,
273+ 282, 287, 289, 294, 296, 301, 303, 308, 310, 312,
274+ 314, 318, 320, 325, 327, 329
275 };
276 #endif
277
278@@ -818,22 +825,22 @@ static const yytype_uint8 yyr2[] =
279
280 #define YYRECOVERING() (!!yyerrstatus)
281
282-#define YYBACKUP(Token, Value) \
283-do \
284- if (yychar == YYEMPTY) \
285- { \
286- yychar = (Token); \
287- yylval = (Value); \
288- YYPOPSTACK (yylen); \
289- yystate = *yyssp; \
290- goto yybackup; \
291- } \
292- else \
293- { \
294- yyerror (YY_("syntax error: cannot back up")); \
295- YYERROR; \
296- } \
297-while (0)
298+#define YYBACKUP(Token, Value) \
299+ do \
300+ if (yychar == YYEMPTY) \
301+ { \
302+ yychar = (Token); \
303+ yylval = (Value); \
304+ YYPOPSTACK (yylen); \
305+ yystate = *yyssp; \
306+ goto yybackup; \
307+ } \
308+ else \
309+ { \
310+ yyerror (YY_("syntax error: cannot back up")); \
311+ YYERROR; \
312+ } \
313+ while (0)
314
315 /* Error token number */
316 #define YYTERROR 1
317@@ -948,7 +955,7 @@ yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
318 YYFPRINTF (stderr, " $%d = ", yyi + 1);
319 yy_symbol_print (stderr,
320 yystos[yyssp[yyi + 1 - yynrhs]],
321- &(yyvsp[(yyi + 1) - (yynrhs)])
322+ &yyvsp[(yyi + 1) - (yynrhs)]
323 );
324 YYFPRINTF (stderr, "\n");
325 }
326@@ -1052,7 +1059,10 @@ yytnamerr (char *yyres, const char *yystr)
327 case '\\':
328 if (*++yyp != '\\')
329 goto do_not_strip_quotes;
330- /* Fall through. */
331+ else
332+ goto append;
333+
334+ append:
335 default:
336 if (yyres)
337 yyres[yyn] = *yyp;
338@@ -1148,10 +1158,10 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
339 yyarg[yycount++] = yytname[yyx];
340 {
341 YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
342- if (! (yysize <= yysize1
343- && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
344+ if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
345+ yysize = yysize1;
346+ else
347 return 2;
348- yysize = yysize1;
349 }
350 }
351 }
352@@ -1175,9 +1185,10 @@ yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
353
354 {
355 YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
356- if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
357+ if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
358+ yysize = yysize1;
359+ else
360 return 2;
361- yysize = yysize1;
362 }
363
364 if (*yymsg_alloc < yysize)
365@@ -1303,23 +1314,33 @@ yyparse (void)
366 yychar = YYEMPTY; /* Cause a token to be read. */
367 goto yysetstate;
368
369+
370 /*------------------------------------------------------------.
371-| yynewstate -- Push a new state, which is found in yystate. |
372+| yynewstate -- push a new state, which is found in yystate. |
373 `------------------------------------------------------------*/
374- yynewstate:
375+yynewstate:
376 /* In all cases, when you get here, the value and location stacks
377 have just been pushed. So pushing a state here evens the stacks. */
378 yyssp++;
379
380- yysetstate:
381+
382+/*--------------------------------------------------------------------.
383+| yynewstate -- set current state (the top of the stack) to yystate. |
384+`--------------------------------------------------------------------*/
385+yysetstate:
386+ YYDPRINTF ((stderr, "Entering state %d\n", yystate));
387+ YY_ASSERT (0 <= yystate && yystate < YYNSTATES);
388 *yyssp = (yytype_int16) yystate;
389
390 if (yyss + yystacksize - 1 <= yyssp)
391+#if !defined yyoverflow && !defined YYSTACK_RELOCATE
392+ goto yyexhaustedlab;
393+#else
394 {
395 /* Get the current used size of the three stacks, in elements. */
396 YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1);
397
398-#ifdef yyoverflow
399+# if defined yyoverflow
400 {
401 /* Give user a chance to reallocate the stack. Use copies of
402 these so that the &'s don't force the real ones into
403@@ -1338,10 +1359,7 @@ yyparse (void)
404 yyss = yyss1;
405 yyvs = yyvs1;
406 }
407-#else /* no yyoverflow */
408-# ifndef YYSTACK_RELOCATE
409- goto yyexhaustedlab;
410-# else
411+# else /* defined YYSTACK_RELOCATE */
412 /* Extend the stack our own way. */
413 if (YYMAXDEPTH <= yystacksize)
414 goto yyexhaustedlab;
415@@ -1357,12 +1375,11 @@ yyparse (void)
416 goto yyexhaustedlab;
417 YYSTACK_RELOCATE (yyss_alloc, yyss);
418 YYSTACK_RELOCATE (yyvs_alloc, yyvs);
419-# undef YYSTACK_RELOCATE
420+# undef YYSTACK_RELOCATE
421 if (yyss1 != yyssa)
422 YYSTACK_FREE (yyss1);
423 }
424 # endif
425-#endif /* no yyoverflow */
426
427 yyssp = yyss + yysize - 1;
428 yyvsp = yyvs + yysize - 1;
429@@ -1373,19 +1390,18 @@ yyparse (void)
430 if (yyss + yystacksize - 1 <= yyssp)
431 YYABORT;
432 }
433-
434- YYDPRINTF ((stderr, "Entering state %d\n", yystate));
435+#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
436
437 if (yystate == YYFINAL)
438 YYACCEPT;
439
440 goto yybackup;
441
442+
443 /*-----------.
444 | yybackup. |
445 `-----------*/
446 yybackup:
447-
448 /* Do appropriate processing given the current state. Read a
449 lookahead token if we need one and don't already have one. */
450
451@@ -1443,7 +1459,6 @@ yybackup:
452 YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
453 *++yyvsp = yylval;
454 YY_IGNORE_MAYBE_UNINITIALIZED_END
455-
456 goto yynewstate;
457
458
459@@ -1458,7 +1473,7 @@ yydefault:
460
461
462 /*-----------------------------.
463-| yyreduce -- Do a reduction. |
464+| yyreduce -- do a reduction. |
465 `-----------------------------*/
466 yyreduce:
467 /* yyn is the number of a rule to reduce with. */
468@@ -1478,20 +1493,20 @@ yyreduce:
469 YY_REDUCE_PRINT (yyn);
470 switch (yyn)
471 {
472- case 3:
473-#line 124 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
474+ case 3:
475+#line 128 "src/preproc/eqn/eqn.ypp"
476 { (yyvsp[0].b)->top_level(); non_empty_flag = 1; }
477-#line 1485 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
478+#line 1500 "src/preproc/eqn/eqn.cpp"
479 break;
480
481 case 4:
482-#line 129 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
483+#line 133 "src/preproc/eqn/eqn.ypp"
484 { (yyval.b) = (yyvsp[0].b); }
485-#line 1491 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
486+#line 1506 "src/preproc/eqn/eqn.cpp"
487 break;
488
489 case 5:
490-#line 131 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
491+#line 135 "src/preproc/eqn/eqn.ypp"
492 {
493 list_box *lb = (yyvsp[-1].b)->to_list_box();
494 if (!lb)
495@@ -1499,436 +1514,437 @@ yyreduce:
496 lb->append((yyvsp[0].b));
497 (yyval.b) = lb;
498 }
499-#line 1503 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
500+#line 1518 "src/preproc/eqn/eqn.cpp"
501 break;
502
503 case 6:
504-#line 142 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
505+#line 146 "src/preproc/eqn/eqn.ypp"
506 { (yyval.b) = (yyvsp[0].b); }
507-#line 1509 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
508+#line 1524 "src/preproc/eqn/eqn.cpp"
509 break;
510
511 case 7:
512-#line 144 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
513+#line 148 "src/preproc/eqn/eqn.ypp"
514 { (yyval.b) = make_mark_box((yyvsp[0].b)); }
515-#line 1515 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
516+#line 1530 "src/preproc/eqn/eqn.cpp"
517 break;
518
519 case 8:
520-#line 146 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
521+#line 150 "src/preproc/eqn/eqn.ypp"
522 { (yyval.b) = make_lineup_box((yyvsp[0].b)); }
523-#line 1521 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
524+#line 1536 "src/preproc/eqn/eqn.cpp"
525 break;
526
527 case 9:
528-#line 151 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
529+#line 155 "src/preproc/eqn/eqn.ypp"
530 { (yyval.b) = (yyvsp[0].b); }
531-#line 1527 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
532+#line 1542 "src/preproc/eqn/eqn.cpp"
533 break;
534
535 case 10:
536-#line 153 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
537+#line 157 "src/preproc/eqn/eqn.ypp"
538 { (yyval.b) = make_limit_box((yyvsp[-2].b), 0, (yyvsp[0].b)); }
539-#line 1533 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
540+#line 1548 "src/preproc/eqn/eqn.cpp"
541 break;
542
543 case 11:
544-#line 155 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
545+#line 159 "src/preproc/eqn/eqn.ypp"
546 { (yyval.b) = make_limit_box((yyvsp[-2].b), (yyvsp[0].b), 0); }
547-#line 1539 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
548+#line 1554 "src/preproc/eqn/eqn.cpp"
549 break;
550
551 case 12:
552-#line 157 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
553+#line 161 "src/preproc/eqn/eqn.ypp"
554 { (yyval.b) = make_limit_box((yyvsp[-4].b), (yyvsp[-2].b), (yyvsp[0].b)); }
555-#line 1545 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
556+#line 1560 "src/preproc/eqn/eqn.cpp"
557 break;
558
559 case 13:
560-#line 159 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
561+#line 163 "src/preproc/eqn/eqn.ypp"
562 { (yyval.b) = make_limit_box((yyvsp[-4].b), make_limit_box((yyvsp[-2].b), (yyvsp[0].b), 0), 0); }
563-#line 1551 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
564+#line 1566 "src/preproc/eqn/eqn.cpp"
565 break;
566
567 case 14:
568-#line 164 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
569+#line 168 "src/preproc/eqn/eqn.ypp"
570 { (yyval.b) = (yyvsp[0].b); }
571-#line 1557 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
572+#line 1572 "src/preproc/eqn/eqn.cpp"
573 break;
574
575 case 15:
576-#line 166 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
577+#line 170 "src/preproc/eqn/eqn.ypp"
578 { (yyval.b) = make_sqrt_box((yyvsp[0].b)); }
579-#line 1563 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
580+#line 1578 "src/preproc/eqn/eqn.cpp"
581 break;
582
583 case 16:
584-#line 168 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
585+#line 172 "src/preproc/eqn/eqn.ypp"
586 { (yyval.b) = make_over_box((yyvsp[-2].b), (yyvsp[0].b)); }
587-#line 1569 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
588+#line 1584 "src/preproc/eqn/eqn.cpp"
589 break;
590
591 case 17:
592-#line 170 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
593+#line 174 "src/preproc/eqn/eqn.ypp"
594 { (yyval.b) = make_small_over_box((yyvsp[-2].b), (yyvsp[0].b)); }
595-#line 1575 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
596+#line 1590 "src/preproc/eqn/eqn.cpp"
597 break;
598
599 case 18:
600-#line 175 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
601+#line 179 "src/preproc/eqn/eqn.ypp"
602 { (yyval.b) = (yyvsp[0].b); }
603-#line 1581 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
604+#line 1596 "src/preproc/eqn/eqn.cpp"
605 break;
606
607 case 19:
608-#line 177 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
609+#line 181 "src/preproc/eqn/eqn.ypp"
610 { (yyval.b) = make_script_box((yyvsp[-2].b), 0, (yyvsp[0].b)); }
611-#line 1587 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
612+#line 1602 "src/preproc/eqn/eqn.cpp"
613 break;
614
615 case 20:
616-#line 182 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
617+#line 186 "src/preproc/eqn/eqn.ypp"
618 { (yyval.b) = (yyvsp[0].b); }
619-#line 1593 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
620+#line 1608 "src/preproc/eqn/eqn.cpp"
621 break;
622
623 case 21:
624-#line 184 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
625+#line 188 "src/preproc/eqn/eqn.ypp"
626 { (yyval.b) = make_script_box((yyvsp[-2].b), (yyvsp[0].b), 0); }
627-#line 1599 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
628+#line 1614 "src/preproc/eqn/eqn.cpp"
629 break;
630
631 case 22:
632-#line 186 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
633+#line 190 "src/preproc/eqn/eqn.ypp"
634 { (yyval.b) = make_script_box((yyvsp[-4].b), (yyvsp[-2].b), (yyvsp[0].b)); }
635-#line 1605 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
636+#line 1620 "src/preproc/eqn/eqn.cpp"
637 break;
638
639 case 23:
640-#line 191 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
641+#line 195 "src/preproc/eqn/eqn.ypp"
642 { (yyval.b) = split_text((yyvsp[0].str)); }
643-#line 1611 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
644+#line 1626 "src/preproc/eqn/eqn.cpp"
645 break;
646
647 case 24:
648-#line 193 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
649+#line 197 "src/preproc/eqn/eqn.ypp"
650 { (yyval.b) = new quoted_text_box((yyvsp[0].str)); }
651-#line 1617 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
652+#line 1632 "src/preproc/eqn/eqn.cpp"
653 break;
654
655 case 25:
656-#line 195 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
657+#line 199 "src/preproc/eqn/eqn.ypp"
658 { (yyval.b) = split_text((yyvsp[0].str)); }
659-#line 1623 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
660+#line 1638 "src/preproc/eqn/eqn.cpp"
661 break;
662
663 case 26:
664-#line 197 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
665+#line 201 "src/preproc/eqn/eqn.ypp"
666 { (yyval.b) = new quoted_text_box((yyvsp[0].str)); }
667-#line 1629 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
668+#line 1644 "src/preproc/eqn/eqn.cpp"
669 break;
670
671 case 27:
672-#line 199 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
673+#line 203 "src/preproc/eqn/eqn.ypp"
674 { (yyval.b) = new half_space_box; }
675-#line 1635 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
676+#line 1650 "src/preproc/eqn/eqn.cpp"
677 break;
678
679 case 28:
680-#line 201 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
681+#line 205 "src/preproc/eqn/eqn.ypp"
682 { (yyval.b) = new space_box; }
683-#line 1641 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
684+#line 1656 "src/preproc/eqn/eqn.cpp"
685 break;
686
687 case 29:
688-#line 203 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
689+#line 207 "src/preproc/eqn/eqn.ypp"
690 { (yyval.b) = new tab_box; }
691-#line 1647 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
692+#line 1662 "src/preproc/eqn/eqn.cpp"
693 break;
694
695 case 30:
696-#line 205 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
697+#line 209 "src/preproc/eqn/eqn.ypp"
698 { (yyval.b) = (yyvsp[-1].b); }
699-#line 1653 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
700+#line 1668 "src/preproc/eqn/eqn.cpp"
701 break;
702
703 case 31:
704-#line 207 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
705+#line 211 "src/preproc/eqn/eqn.ypp"
706 { (yyvsp[0].pb)->set_alignment(CENTER_ALIGN); (yyval.b) = (yyvsp[0].pb); }
707-#line 1659 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
708+#line 1674 "src/preproc/eqn/eqn.cpp"
709 break;
710
711 case 32:
712-#line 209 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
713+#line 213 "src/preproc/eqn/eqn.ypp"
714 { (yyvsp[0].pb)->set_alignment(LEFT_ALIGN); (yyval.b) = (yyvsp[0].pb); }
715-#line 1665 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
716+#line 1680 "src/preproc/eqn/eqn.cpp"
717 break;
718
719 case 33:
720-#line 211 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
721+#line 215 "src/preproc/eqn/eqn.ypp"
722 { (yyvsp[0].pb)->set_alignment(RIGHT_ALIGN); (yyval.b) = (yyvsp[0].pb); }
723-#line 1671 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
724+#line 1686 "src/preproc/eqn/eqn.cpp"
725 break;
726
727 case 34:
728-#line 213 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
729+#line 217 "src/preproc/eqn/eqn.ypp"
730 { (yyvsp[0].pb)->set_alignment(CENTER_ALIGN); (yyval.b) = (yyvsp[0].pb); }
731-#line 1677 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
732+#line 1692 "src/preproc/eqn/eqn.cpp"
733 break;
734
735 case 35:
736-#line 215 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
737+#line 219 "src/preproc/eqn/eqn.ypp"
738 { (yyval.b) = (yyvsp[-1].mb); }
739-#line 1683 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
740+#line 1698 "src/preproc/eqn/eqn.cpp"
741 break;
742
743 case 36:
744-#line 217 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
745+#line 221 "src/preproc/eqn/eqn.ypp"
746 { (yyval.b) = make_delim_box((yyvsp[-3].str), (yyvsp[-2].b), (yyvsp[0].str)); }
747-#line 1689 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
748+#line 1704 "src/preproc/eqn/eqn.cpp"
749 break;
750
751 case 37:
752-#line 219 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
753+#line 223 "src/preproc/eqn/eqn.ypp"
754 { (yyval.b) = make_delim_box((yyvsp[-1].str), (yyvsp[0].b), 0); }
755-#line 1695 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
756+#line 1710 "src/preproc/eqn/eqn.cpp"
757 break;
758
759 case 38:
760-#line 221 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
761+#line 225 "src/preproc/eqn/eqn.ypp"
762 { (yyval.b) = make_overline_box((yyvsp[-1].b)); }
763-#line 1701 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
764+#line 1716 "src/preproc/eqn/eqn.cpp"
765 break;
766
767 case 39:
768-#line 223 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
769+#line 227 "src/preproc/eqn/eqn.ypp"
770 { (yyval.b) = make_underline_box((yyvsp[-1].b)); }
771-#line 1707 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
772+#line 1722 "src/preproc/eqn/eqn.cpp"
773 break;
774
775 case 40:
776-#line 225 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
777+#line 229 "src/preproc/eqn/eqn.ypp"
778 { (yyval.b) = make_prime_box((yyvsp[-1].b)); }
779-#line 1713 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
780+#line 1728 "src/preproc/eqn/eqn.cpp"
781 break;
782
783 case 41:
784-#line 227 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
785+#line 231 "src/preproc/eqn/eqn.ypp"
786 { (yyval.b) = make_accent_box((yyvsp[-2].b), (yyvsp[0].b)); }
787-#line 1719 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
788+#line 1734 "src/preproc/eqn/eqn.cpp"
789 break;
790
791 case 42:
792-#line 229 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
793+#line 233 "src/preproc/eqn/eqn.ypp"
794 { (yyval.b) = make_uaccent_box((yyvsp[-2].b), (yyvsp[0].b)); }
795-#line 1725 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
796+#line 1740 "src/preproc/eqn/eqn.cpp"
797 break;
798
799 case 43:
800-#line 231 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
801+#line 235 "src/preproc/eqn/eqn.ypp"
802 { (yyval.b) = new font_box(strsave(get_grfont()), (yyvsp[0].b)); }
803-#line 1731 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
804+#line 1746 "src/preproc/eqn/eqn.cpp"
805 break;
806
807 case 44:
808-#line 233 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
809+#line 237 "src/preproc/eqn/eqn.ypp"
810 { (yyval.b) = new font_box(strsave(get_gbfont()), (yyvsp[0].b)); }
811-#line 1737 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
812+#line 1752 "src/preproc/eqn/eqn.cpp"
813 break;
814
815 case 45:
816-#line 235 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
817+#line 239 "src/preproc/eqn/eqn.ypp"
818 { (yyval.b) = new font_box(strsave(get_gfont()), (yyvsp[0].b)); }
819-#line 1743 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
820+#line 1758 "src/preproc/eqn/eqn.cpp"
821 break;
822
823 case 46:
824-#line 237 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
825+#line 241 "src/preproc/eqn/eqn.ypp"
826 { (yyval.b) = new fat_box((yyvsp[0].b)); }
827-#line 1749 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
828+#line 1764 "src/preproc/eqn/eqn.cpp"
829 break;
830
831 case 47:
832-#line 239 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
833+#line 243 "src/preproc/eqn/eqn.ypp"
834 { (yyval.b) = new font_box((yyvsp[-1].str), (yyvsp[0].b)); }
835-#line 1755 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
836+#line 1770 "src/preproc/eqn/eqn.cpp"
837 break;
838
839 case 48:
840-#line 241 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
841+#line 245 "src/preproc/eqn/eqn.ypp"
842 { (yyval.b) = new size_box((yyvsp[-1].str), (yyvsp[0].b)); }
843-#line 1761 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
844+#line 1776 "src/preproc/eqn/eqn.cpp"
845 break;
846
847 case 49:
848-#line 243 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
849+#line 247 "src/preproc/eqn/eqn.ypp"
850 { (yyval.b) = new hmotion_box((yyvsp[-1].n), (yyvsp[0].b)); }
851-#line 1767 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
852+#line 1782 "src/preproc/eqn/eqn.cpp"
853 break;
854
855 case 50:
856-#line 245 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
857+#line 249 "src/preproc/eqn/eqn.ypp"
858 { (yyval.b) = new hmotion_box(-(yyvsp[-1].n), (yyvsp[0].b)); }
859-#line 1773 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
860+#line 1788 "src/preproc/eqn/eqn.cpp"
861 break;
862
863 case 51:
864-#line 247 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
865+#line 251 "src/preproc/eqn/eqn.ypp"
866 { (yyval.b) = new vmotion_box((yyvsp[-1].n), (yyvsp[0].b)); }
867-#line 1779 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
868+#line 1794 "src/preproc/eqn/eqn.cpp"
869 break;
870
871 case 52:
872-#line 249 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
873+#line 253 "src/preproc/eqn/eqn.ypp"
874 { (yyval.b) = new vmotion_box(-(yyvsp[-1].n), (yyvsp[0].b)); }
875-#line 1785 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
876+#line 1800 "src/preproc/eqn/eqn.cpp"
877 break;
878
879 case 53:
880-#line 251 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
881+#line 255 "src/preproc/eqn/eqn.ypp"
882 { (yyvsp[0].b)->set_spacing_type((yyvsp[-1].str)); (yyval.b) = (yyvsp[0].b); }
883-#line 1791 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
884+#line 1806 "src/preproc/eqn/eqn.cpp"
885 break;
886
887 case 54:
888-#line 253 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
889+#line 257 "src/preproc/eqn/eqn.ypp"
890 { (yyval.b) = new vcenter_box((yyvsp[0].b)); }
891-#line 1797 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
892+#line 1812 "src/preproc/eqn/eqn.cpp"
893 break;
894
895 case 55:
896-#line 255 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
897+#line 259 "src/preproc/eqn/eqn.ypp"
898 { (yyval.b) = make_special_box((yyvsp[-1].str), (yyvsp[0].b)); }
899-#line 1803 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
900+#line 1818 "src/preproc/eqn/eqn.cpp"
901 break;
902
903 case 56:
904-#line 260 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
905+#line 264 "src/preproc/eqn/eqn.ypp"
906 {
907 int n;
908 if (sscanf((yyvsp[0].str), "%d", &n) == 1)
909 (yyval.n) = n;
910 a_delete (yyvsp[0].str);
911 }
912-#line 1814 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
913+#line 1829 "src/preproc/eqn/eqn.cpp"
914 break;
915
916 case 57:
917-#line 270 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
918+#line 274 "src/preproc/eqn/eqn.ypp"
919 { (yyval.pb) = new pile_box((yyvsp[0].b)); }
920-#line 1820 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
921+#line 1835 "src/preproc/eqn/eqn.cpp"
922 break;
923
924 case 58:
925-#line 272 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
926+#line 276 "src/preproc/eqn/eqn.ypp"
927 { (yyvsp[-2].pb)->append((yyvsp[0].b)); (yyval.pb) = (yyvsp[-2].pb); }
928-#line 1826 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
929+#line 1841 "src/preproc/eqn/eqn.cpp"
930 break;
931
932 case 59:
933-#line 277 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
934+#line 281 "src/preproc/eqn/eqn.ypp"
935 { (yyval.pb) = (yyvsp[-1].pb); }
936-#line 1832 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
937+#line 1847 "src/preproc/eqn/eqn.cpp"
938 break;
939
940 case 60:
941-#line 279 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
942+#line 283 "src/preproc/eqn/eqn.ypp"
943 { (yyvsp[-1].pb)->set_space((yyvsp[-3].n)); (yyval.pb) = (yyvsp[-1].pb); }
944-#line 1838 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
945+#line 1853 "src/preproc/eqn/eqn.cpp"
946 break;
947
948 case 61:
949-#line 284 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
950+#line 288 "src/preproc/eqn/eqn.ypp"
951 { (yyval.mb) = new matrix_box((yyvsp[0].col)); }
952-#line 1844 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
953+#line 1859 "src/preproc/eqn/eqn.cpp"
954 break;
955
956 case 62:
957-#line 286 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
958+#line 290 "src/preproc/eqn/eqn.ypp"
959 { (yyvsp[-1].mb)->append((yyvsp[0].col)); (yyval.mb) = (yyvsp[-1].mb); }
960-#line 1850 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
961+#line 1865 "src/preproc/eqn/eqn.cpp"
962 break;
963
964 case 63:
965-#line 291 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
966+#line 295 "src/preproc/eqn/eqn.ypp"
967 { (yyval.col) = new column((yyvsp[0].b)); }
968-#line 1856 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
969+#line 1871 "src/preproc/eqn/eqn.cpp"
970 break;
971
972 case 64:
973-#line 293 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
974+#line 297 "src/preproc/eqn/eqn.ypp"
975 { (yyvsp[-2].col)->append((yyvsp[0].b)); (yyval.col) = (yyvsp[-2].col); }
976-#line 1862 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
977+#line 1877 "src/preproc/eqn/eqn.cpp"
978 break;
979
980 case 65:
981-#line 298 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
982+#line 302 "src/preproc/eqn/eqn.ypp"
983 { (yyval.col) = (yyvsp[-1].col); }
984-#line 1868 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
985+#line 1883 "src/preproc/eqn/eqn.cpp"
986 break;
987
988 case 66:
989-#line 300 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
990+#line 304 "src/preproc/eqn/eqn.ypp"
991 { (yyvsp[-1].col)->set_space((yyvsp[-3].n)); (yyval.col) = (yyvsp[-1].col); }
992-#line 1874 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
993+#line 1889 "src/preproc/eqn/eqn.cpp"
994 break;
995
996 case 67:
997-#line 305 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
998+#line 309 "src/preproc/eqn/eqn.ypp"
999 { (yyvsp[0].col)->set_alignment(CENTER_ALIGN); (yyval.col) = (yyvsp[0].col); }
1000-#line 1880 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
1001+#line 1895 "src/preproc/eqn/eqn.cpp"
1002 break;
1003
1004 case 68:
1005-#line 307 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
1006+#line 311 "src/preproc/eqn/eqn.ypp"
1007 { (yyvsp[0].col)->set_alignment(LEFT_ALIGN); (yyval.col) = (yyvsp[0].col); }
1008-#line 1886 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
1009+#line 1901 "src/preproc/eqn/eqn.cpp"
1010 break;
1011
1012 case 69:
1013-#line 309 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
1014+#line 313 "src/preproc/eqn/eqn.ypp"
1015 { (yyvsp[0].col)->set_alignment(RIGHT_ALIGN); (yyval.col) = (yyvsp[0].col); }
1016-#line 1892 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
1017+#line 1907 "src/preproc/eqn/eqn.cpp"
1018 break;
1019
1020 case 70:
1021-#line 311 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
1022+#line 315 "src/preproc/eqn/eqn.ypp"
1023 { (yyvsp[0].col)->set_alignment(CENTER_ALIGN); (yyval.col) = (yyvsp[0].col); }
1024-#line 1898 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
1025+#line 1913 "src/preproc/eqn/eqn.cpp"
1026 break;
1027
1028 case 71:
1029-#line 315 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
1030+#line 319 "src/preproc/eqn/eqn.ypp"
1031 { (yyval.str) = (yyvsp[0].str); }
1032-#line 1904 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
1033+#line 1919 "src/preproc/eqn/eqn.cpp"
1034 break;
1035
1036 case 72:
1037-#line 317 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
1038+#line 321 "src/preproc/eqn/eqn.ypp"
1039 { (yyval.str) = (yyvsp[0].str); }
1040-#line 1910 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
1041+#line 1925 "src/preproc/eqn/eqn.cpp"
1042 break;
1043
1044 case 73:
1045-#line 322 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
1046+#line 326 "src/preproc/eqn/eqn.ypp"
1047 { (yyval.str) = (yyvsp[0].str); }
1048-#line 1916 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
1049+#line 1931 "src/preproc/eqn/eqn.cpp"
1050 break;
1051
1052 case 74:
1053-#line 324 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
1054+#line 328 "src/preproc/eqn/eqn.ypp"
1055 { (yyval.str) = strsave("{"); }
1056-#line 1922 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
1057+#line 1937 "src/preproc/eqn/eqn.cpp"
1058 break;
1059
1060 case 75:
1061-#line 326 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1645 */
1062+#line 330 "src/preproc/eqn/eqn.ypp"
1063 { (yyval.str) = strsave("}"); }
1064-#line 1928 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
1065+#line 1943 "src/preproc/eqn/eqn.cpp"
1066 break;
1067
1068
1069-#line 1932 "src/preproc/eqn/eqn.cpp" /* yacc.c:1645 */
1070+#line 1947 "src/preproc/eqn/eqn.cpp"
1071+
1072 default: break;
1073 }
1074 /* User semantic actions sometimes alter yychar, and that requires
1075@@ -2042,12 +2058,10 @@ yyerrlab:
1076 | yyerrorlab -- error raised explicitly by YYERROR. |
1077 `---------------------------------------------------*/
1078 yyerrorlab:
1079-
1080- /* Pacify compilers like GCC when the user code never invokes
1081- YYERROR and the label yyerrorlab therefore never appears in user
1082- code. */
1083- if (/*CONSTCOND*/ 0)
1084- goto yyerrorlab;
1085+ /* Pacify compilers when the user code never invokes YYERROR and the
1086+ label yyerrorlab therefore never appears in user code. */
1087+ if (0)
1088+ YYERROR;
1089
1090 /* Do not reclaim the symbols of the rule whose action triggered
1091 this YYERROR. */
1092@@ -2109,6 +2123,7 @@ yyacceptlab:
1093 yyresult = 0;
1094 goto yyreturn;
1095
1096+
1097 /*-----------------------------------.
1098 | yyabortlab -- YYABORT comes here. |
1099 `-----------------------------------*/
1100@@ -2116,6 +2131,7 @@ yyabortlab:
1101 yyresult = 1;
1102 goto yyreturn;
1103
1104+
1105 #if !defined yyoverflow || YYERROR_VERBOSE
1106 /*-------------------------------------------------.
1107 | yyexhaustedlab -- memory exhaustion comes here. |
1108@@ -2126,6 +2142,10 @@ yyexhaustedlab:
1109 /* Fall through. */
1110 #endif
1111
1112+
1113+/*-----------------------------------------------------.
1114+| yyreturn -- parsing is finished, return the result. |
1115+`-----------------------------------------------------*/
1116 yyreturn:
1117 if (yychar != YYEMPTY)
1118 {
1119@@ -2155,5 +2175,5 @@ yyreturn:
1120 #endif
1121 return yyresult;
1122 }
1123-#line 329 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1903 */
1124+#line 333 "src/preproc/eqn/eqn.ypp"
1125
1126diff --git a/src/preproc/eqn/eqn.hpp b/src/preproc/eqn/eqn.hpp
1127index 32a32a5..9a092c1 100644
1128--- a/src/preproc/eqn/eqn.hpp
1129+++ b/src/preproc/eqn/eqn.hpp
1130@@ -1,8 +1,9 @@
1131-/* A Bison parser, made by GNU Bison 3.2. */
1132+/* A Bison parser, made by GNU Bison 3.4.1. */
1133
1134 /* Bison interface for Yacc-like parsers in C
1135
1136- Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc.
1137+ Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
1138+ Inc.
1139
1140 This program is free software: you can redistribute it and/or modify
1141 it under the terms of the GNU General Public License as published by
1142@@ -170,10 +171,9 @@ extern int yydebug;
1143
1144 /* Value type. */
1145 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
1146-
1147 union YYSTYPE
1148 {
1149-#line 30 "../src/preproc/eqn/eqn.ypp" /* yacc.c:1906 */
1150+#line 34 "src/preproc/eqn/eqn.ypp"
1151
1152 char *str;
1153 box *b;
1154@@ -182,9 +182,9 @@ union YYSTYPE
1155 int n;
1156 column *col;
1157
1158-#line 186 "src/preproc/eqn/eqn.hpp" /* yacc.c:1906 */
1159-};
1160+#line 186 "src/preproc/eqn/eqn.hpp"
1161
1162+};
1163 typedef union YYSTYPE YYSTYPE;
1164 # define YYSTYPE_IS_TRIVIAL 1
1165 # define YYSTYPE_IS_DECLARED 1
1166diff --git a/src/preproc/eqn/eqn.ypp b/src/preproc/eqn/eqn.ypp
1167index fb318c3..b7b647e 100644
1168--- a/src/preproc/eqn/eqn.ypp
1169+++ b/src/preproc/eqn/eqn.ypp
1170@@ -16,6 +16,10 @@ for more details.
1171 You should have received a copy of the GNU General Public License
1172 along with this program. If not, see <http://www.gnu.org/licenses/>. */
1173 %{
1174+#if HAVE_CONFIG_H
1175+# include <config.h>
1176+#endif
1177+
1178 #include <stdio.h>
1179 #include <string.h>
1180 #include <stdlib.h>
1181diff --git a/src/preproc/eqn/other.cpp b/src/preproc/eqn/other.cpp
1182index 8db993f..38db396 100644
1183--- a/src/preproc/eqn/other.cpp
1184+++ b/src/preproc/eqn/other.cpp
1185@@ -17,6 +17,10 @@ for more details.
1186 You should have received a copy of the GNU General Public License
1187 along with this program. If not, see <http://www.gnu.org/licenses/>. */
1188
1189+#if HAVE_CONFIG_H
1190+# include <config.h>
1191+#endif
1192+
1193 #include <stdlib.h>
1194
1195 #include "eqn.h"
1196diff --git a/src/preproc/eqn/text.cpp b/src/preproc/eqn/text.cpp
1197index f3d06f9..3b244d5 100644
1198--- a/src/preproc/eqn/text.cpp
1199+++ b/src/preproc/eqn/text.cpp
1200@@ -17,6 +17,10 @@ for more details.
1201 You should have received a copy of the GNU General Public License
1202 along with this program. If not, see <http://www.gnu.org/licenses/>. */
1203
1204+#if HAVE_CONFIG_H
1205+# include <config.h>
1206+#endif
1207+
1208 #include <ctype.h>
1209 #include <stdlib.h>
1210 #include "eqn.h"
1211diff --git a/src/preproc/pic/object.cpp b/src/preproc/pic/object.cpp
1212index d8ba610..f26a831 100644
1213--- a/src/preproc/pic/object.cpp
1214+++ b/src/preproc/pic/object.cpp
1215@@ -17,6 +17,10 @@ for more details.
1216 You should have received a copy of the GNU General Public License
1217 along with this program. If not, see <http://www.gnu.org/licenses/>. */
1218
1219+#if HAVE_CONFIG_H
1220+# include <config.h>
1221+#endif
1222+
1223 #include <stdlib.h>
1224
1225 #include "pic.h"
1226--
12272.22.0
1228
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-12 00:36:53 +0000