You are viewing a plain text version of this content. The canonical link for it is here.
Posted to win32-msi-cvs@httpd.apache.org by wr...@apache.org on 2005/02/10 16:53:38 UTC
svn commit: r153271 - httpd/httpd/win32-msi/trunk/awk/ytab.c
httpd/httpd/win32-msi/trunk/awk/ytab.h
Author: wrowe
Date: Thu Feb 10 07:53:34 2005
New Revision: 153271
URL: http://svn.apache.org/viewcvs?view=rev&rev=153271
Log:
AARGH!!!! Tired of endless mismatches, commit the bison -y output
instead of classic yacc results.
Modified:
httpd/httpd/win32-msi/trunk/awk/ytab.c
httpd/httpd/win32-msi/trunk/awk/ytab.h
Modified: httpd/httpd/win32-msi/trunk/awk/ytab.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/win32-msi/trunk/awk/ytab.c?view=diff&r1=153270&r2=153271
==============================================================================
--- httpd/httpd/win32-msi/trunk/awk/ytab.c (original)
+++ httpd/httpd/win32-msi/trunk/awk/ytab.c Thu Feb 10 07:53:34 2005
@@ -1,102 +1,101 @@
/* A Bison parser, made from awkgram.y
- by GNU Bison version 1.25
- */
+ by GNU Bison version 1.28 */
#define YYBISON 1 /* Identify Bison output. */
-#define FIRSTTOKEN 258
-#define PROGRAM 259
-#define PASTAT 260
-#define PASTAT2 261
-#define XBEGIN 262
-#define XEND 263
-#define NL 264
-#define ARRAY 265
-#define MATCH 266
-#define NOTMATCH 267
-#define MATCHOP 268
-#define FINAL 269
-#define DOT 270
-#define ALL 271
-#define CCL 272
-#define NCCL 273
-#define CHAR 274
-#define OR 275
-#define STAR 276
-#define QUEST 277
-#define PLUS 278
-#define AND 279
-#define BOR 280
-#define APPEND 281
-#define EQ 282
-#define GE 283
-#define GT 284
-#define LE 285
-#define LT 286
-#define NE 287
-#define IN 288
-#define ARG 289
-#define BLTIN 290
-#define BREAK 291
-#define CLOSE 292
-#define CONTINUE 293
-#define DELETE 294
-#define DO 295
-#define EXIT 296
-#define FOR 297
-#define FUNC 298
-#define SUB 299
-#define GSUB 300
-#define IF 301
-#define INDEX 302
-#define LSUBSTR 303
-#define MATCHFCN 304
-#define NEXT 305
-#define NEXTFILE 306
-#define ADD 307
-#define MINUS 308
-#define MULT 309
-#define DIVIDE 310
-#define MOD 311
-#define ASSIGN 312
-#define ASGNOP 313
-#define ADDEQ 314
-#define SUBEQ 315
-#define MULTEQ 316
-#define DIVEQ 317
-#define MODEQ 318
-#define POWEQ 319
-#define PRINT 320
-#define PRINTF 321
-#define SPRINTF 322
-#define ELSE 323
-#define INTEST 324
-#define CONDEXPR 325
-#define POSTINCR 326
-#define PREINCR 327
-#define POSTDECR 328
-#define PREDECR 329
-#define VAR 330
-#define IVAR 331
-#define VARNF 332
-#define CALL 333
-#define NUMBER 334
-#define STRING 335
-#define REGEXPR 336
-#define GETLINE 337
-#define RETURN 338
-#define SPLIT 339
-#define SUBSTR 340
-#define WHILE 341
-#define CAT 342
-#define NOT 343
-#define UMINUS 344
-#define POWER 345
-#define DECR 346
-#define INCR 347
-#define INDIRECT 348
-#define LASTTOKEN 349
+#define FIRSTTOKEN 257
+#define PROGRAM 258
+#define PASTAT 259
+#define PASTAT2 260
+#define XBEGIN 261
+#define XEND 262
+#define NL 263
+#define ARRAY 264
+#define MATCH 265
+#define NOTMATCH 266
+#define MATCHOP 267
+#define FINAL 268
+#define DOT 269
+#define ALL 270
+#define CCL 271
+#define NCCL 272
+#define CHAR 273
+#define OR 274
+#define STAR 275
+#define QUEST 276
+#define PLUS 277
+#define AND 278
+#define BOR 279
+#define APPEND 280
+#define EQ 281
+#define GE 282
+#define GT 283
+#define LE 284
+#define LT 285
+#define NE 286
+#define IN 287
+#define ARG 288
+#define BLTIN 289
+#define BREAK 290
+#define CLOSE 291
+#define CONTINUE 292
+#define DELETE 293
+#define DO 294
+#define EXIT 295
+#define FOR 296
+#define FUNC 297
+#define SUB 298
+#define GSUB 299
+#define IF 300
+#define INDEX 301
+#define LSUBSTR 302
+#define MATCHFCN 303
+#define NEXT 304
+#define NEXTFILE 305
+#define ADD 306
+#define MINUS 307
+#define MULT 308
+#define DIVIDE 309
+#define MOD 310
+#define ASSIGN 311
+#define ASGNOP 312
+#define ADDEQ 313
+#define SUBEQ 314
+#define MULTEQ 315
+#define DIVEQ 316
+#define MODEQ 317
+#define POWEQ 318
+#define PRINT 319
+#define PRINTF 320
+#define SPRINTF 321
+#define ELSE 322
+#define INTEST 323
+#define CONDEXPR 324
+#define POSTINCR 325
+#define PREINCR 326
+#define POSTDECR 327
+#define PREDECR 328
+#define VAR 329
+#define IVAR 330
+#define VARNF 331
+#define CALL 332
+#define NUMBER 333
+#define STRING 334
+#define REGEXPR 335
+#define GETLINE 336
+#define RETURN 337
+#define SPLIT 338
+#define SUBSTR 339
+#define WHILE 340
+#define CAT 341
+#define NOT 342
+#define UMINUS 343
+#define POWER 344
+#define DECR 345
+#define INCR 346
+#define INDIRECT 347
+#define LASTTOKEN 348
#line 25 "awkgram.y"
@@ -135,7 +134,7 @@
#define YYFLAG -32768
#define YYNTBASE 111
-#define YYTRANSLATE(x) ((unsigned)(x) <= 349 ? yytranslate[x] : 159)
+#define YYTRANSLATE(x) ((unsigned)(x) <= 348 ? yytranslate[x] : 159)
static const char yytranslate[] = { 0,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -163,16 +162,16 @@
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
- 2, 2, 2, 2, 2, 1, 2, 3, 4, 5,
- 6, 7, 8, 9, 20, 21, 22, 23, 24, 25,
- 26, 27, 28, 29, 30, 31, 32, 33, 34, 35,
- 36, 37, 38, 39, 40, 41, 42, 43, 44, 45,
- 46, 47, 48, 49, 50, 51, 52, 53, 54, 55,
- 56, 57, 58, 59, 60, 61, 62, 63, 64, 65,
- 66, 67, 68, 69, 70, 71, 72, 73, 74, 75,
- 76, 77, 78, 79, 80, 81, 82, 83, 84, 85,
- 86, 87, 88, 89, 90, 91, 94, 95, 96, 97,
- 98, 99, 104, 105, 106, 107, 108, 109, 110
+ 2, 2, 2, 2, 2, 1, 3, 4, 5, 6,
+ 7, 8, 9, 20, 21, 22, 23, 24, 25, 26,
+ 27, 28, 29, 30, 31, 32, 33, 34, 35, 36,
+ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46,
+ 47, 48, 49, 50, 51, 52, 53, 54, 55, 56,
+ 57, 58, 59, 60, 61, 62, 63, 64, 65, 66,
+ 67, 68, 69, 70, 71, 72, 73, 74, 75, 76,
+ 77, 78, 79, 80, 81, 82, 83, 84, 85, 86,
+ 87, 88, 89, 90, 91, 94, 95, 96, 97, 98,
+ 99, 104, 105, 106, 107, 108, 109, 110
};
#if YYDEBUG != 0
@@ -1349,7 +1348,8 @@
108, 109
};
/* -*-C-*- Note some compilers choke on comments on `#line' lines. */
-#line 3 "/usr/share/bison.simple"
+#line 3 "/usr/local/share/bison.simple"
+/* This file comes from bison-1.28. */
/* Skeleton output parser for bison,
Copyright (C) 1984, 1989, 1990 Free Software Foundation, Inc.
@@ -1366,46 +1366,66 @@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+ Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA. */
/* As a special exception, when this file is copied by Bison into a
Bison output file, you may use that output file without restriction.
This special exception was added by the Free Software Foundation
in version 1.24 of Bison. */
-#ifndef alloca
+/* This is the parser code that is written into each bison parser
+ when the %semantic_parser declaration is not specified in the grammar.
+ It was written by Richard Stallman by simplifying the hairy parser
+ used when %semantic_parser is specified. */
+
+#ifndef YYSTACK_USE_ALLOCA
+#ifdef alloca
+#define YYSTACK_USE_ALLOCA
+#else /* alloca not defined */
#ifdef __GNUC__
+#define YYSTACK_USE_ALLOCA
#define alloca __builtin_alloca
#else /* not GNU C. */
-#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi)
+#if (!defined (__STDC__) && defined (sparc)) || defined (__sparc__) || defined (__sparc) || defined (__sgi) || (defined (__sun) && defined (__i386))
+#define YYSTACK_USE_ALLOCA
#include <alloca.h>
#else /* not sparc */
-#if defined (MSDOS) && !defined (__TURBOC__)
+/* We think this test detects Watcom and Microsoft C. */
+/* This used to test MSDOS, but that is a bad idea
+ since that symbol is in the user namespace. */
+#if (defined (_MSDOS) || defined (_MSDOS_)) && !defined (__TURBOC__)
+#if 0 /* No need for malloc.h, which pollutes the namespace;
+ instead, just don't use alloca. */
#include <malloc.h>
+#endif
#else /* not MSDOS, or __TURBOC__ */
#if defined(_AIX)
-#include <malloc.h>
+/* I don't know what this was needed for, but it pollutes the namespace.
+ So I turned it off. rms, 2 May 1997. */
+/* #include <malloc.h> */
#pragma alloca
-#else /* not MSDOS, __TURBOC__, or _AIX */
-#ifdef __hpux
-#ifdef __cplusplus
-extern "C" {
-void *alloca (unsigned int);
-};
-#else /* not __cplusplus */
-void *alloca ();
-#endif /* not __cplusplus */
+#define YYSTACK_USE_ALLOCA
+#else /* not MSDOS, or __TURBOC__, or _AIX */
+#if 0
+#ifdef __hpux /* haible@ilog.fr says this works for HPUX 9.05 and up,
+ and on HPUX 10. Eventually we can turn this on. */
+#define YYSTACK_USE_ALLOCA
+#define alloca __builtin_alloca
#endif /* __hpux */
+#endif
#endif /* not _AIX */
#endif /* not MSDOS, or __TURBOC__ */
-#endif /* not sparc. */
-#endif /* not GNU C. */
-#endif /* alloca not defined. */
+#endif /* not sparc */
+#endif /* not GNU C */
+#endif /* alloca not defined */
+#endif /* YYSTACK_USE_ALLOCA not defined */
-/* This is the parser code that is written into each bison parser
- when the %semantic_parser declaration is not specified in the grammar.
- It was written by Richard Stallman by simplifying the hairy parser
- used when %semantic_parser is specified. */
+#ifdef YYSTACK_USE_ALLOCA
+#define YYSTACK_ALLOC alloca
+#else
+#define YYSTACK_ALLOC malloc
+#endif
/* Note: there must be only one dollar sign in this file.
It is replaced by the list of actions, each action
@@ -1415,8 +1435,8 @@
#define yyclearin (yychar = YYEMPTY)
#define YYEMPTY -2
#define YYEOF 0
-#define YYACCEPT return(0)
-#define YYABORT return(1)
+#define YYACCEPT goto yyacceptlab
+#define YYABORT goto yyabortlab
#define YYERROR goto yyerrlab1
/* Like YYERROR except do call yyerror.
This remains here temporarily to ease the
@@ -1497,12 +1517,12 @@
#ifndef YYMAXDEPTH
#define YYMAXDEPTH 10000
#endif
-
-/* Prevent warning if -Wstrict-prototypes. */
-#ifdef __GNUC__
-int yyparse (void);
-#endif
+/* Define __yy_memcpy. Note that the size argument
+ should be passed with type unsigned int, because that is what the non-GCC
+ definitions require. With GCC, __builtin_memcpy takes an arg
+ of type size_t, but it can handle unsigned int. */
+
#if __GNUC__ > 1 /* GNU C and GNU C++ define this. */
#define __yy_memcpy(TO,FROM,COUNT) __builtin_memcpy(TO,FROM,COUNT)
#else /* not GNU C or C++ */
@@ -1514,7 +1534,7 @@
__yy_memcpy (to, from, count)
char *to;
char *from;
- int count;
+ unsigned int count;
{
register char *f = from;
register char *t = to;
@@ -1529,10 +1549,10 @@
/* This is the most reliable way to avoid incompatibilities
in available built-in functions on various systems. */
static void
-__yy_memcpy (char *to, char *from, int count)
+__yy_memcpy (char *to, char *from, unsigned int count)
{
- register char *f = from;
register char *t = to;
+ register char *f = from;
register int i = count;
while (i-- > 0)
@@ -1542,7 +1562,7 @@
#endif
#endif
-#line 196 "/usr/share/bison.simple"
+#line 217 "/usr/local/share/bison.simple"
/* The user can define YYPARSE_PARAM as the name of an argument to be passed
into yyparse. The argument should have type void *.
@@ -1563,6 +1583,15 @@
#define YYPARSE_PARAM_DECL
#endif /* not YYPARSE_PARAM */
+/* Prevent warning if -Wstrict-prototypes. */
+#ifdef __GNUC__
+#ifdef YYPARSE_PARAM
+int yyparse (void *);
+#else
+int yyparse (void);
+#endif
+#endif
+
int
yyparse(YYPARSE_PARAM_ARG)
YYPARSE_PARAM_DECL
@@ -1591,6 +1620,7 @@
#endif
int yystacksize = YYINITDEPTH;
+ int yyfree_stacks = 0;
#ifdef YYPURE
int yychar;
@@ -1675,18 +1705,32 @@
if (yystacksize >= YYMAXDEPTH)
{
yyerror("parser stack overflow");
+ if (yyfree_stacks)
+ {
+ free (yyss);
+ free (yyvs);
+#ifdef YYLSP_NEEDED
+ free (yyls);
+#endif
+ }
return 2;
}
yystacksize *= 2;
if (yystacksize > YYMAXDEPTH)
yystacksize = YYMAXDEPTH;
- yyss = (short *) alloca (yystacksize * sizeof (*yyssp));
- __yy_memcpy ((char *)yyss, (char *)yyss1, size * sizeof (*yyssp));
- yyvs = (YYSTYPE *) alloca (yystacksize * sizeof (*yyvsp));
- __yy_memcpy ((char *)yyvs, (char *)yyvs1, size * sizeof (*yyvsp));
+#ifndef YYSTACK_USE_ALLOCA
+ yyfree_stacks = 1;
+#endif
+ yyss = (short *) YYSTACK_ALLOC (yystacksize * sizeof (*yyssp));
+ __yy_memcpy ((char *)yyss, (char *)yyss1,
+ size * (unsigned int) sizeof (*yyssp));
+ yyvs = (YYSTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yyvsp));
+ __yy_memcpy ((char *)yyvs, (char *)yyvs1,
+ size * (unsigned int) sizeof (*yyvsp));
#ifdef YYLSP_NEEDED
- yyls = (YYLTYPE *) alloca (yystacksize * sizeof (*yylsp));
- __yy_memcpy ((char *)yyls, (char *)yyls1, size * sizeof (*yylsp));
+ yyls = (YYLTYPE *) YYSTACK_ALLOC (yystacksize * sizeof (*yylsp));
+ __yy_memcpy ((char *)yyls, (char *)yyls1,
+ size * (unsigned int) sizeof (*yylsp));
#endif
#endif /* no yyoverflow */
@@ -2443,7 +2487,7 @@
break;}
}
/* the action file gets copied in in place of this dollarsign */
-#line 498 "/usr/share/bison.simple"
+#line 543 "/usr/local/share/bison.simple"
yyvsp -= yylen;
yyssp -= yylen;
@@ -2638,6 +2682,30 @@
yystate = yyn;
goto yynewstate;
+
+ yyacceptlab:
+ /* YYACCEPT comes here. */
+ if (yyfree_stacks)
+ {
+ free (yyss);
+ free (yyvs);
+#ifdef YYLSP_NEEDED
+ free (yyls);
+#endif
+ }
+ return 0;
+
+ yyabortlab:
+ /* YYABORT comes here. */
+ if (yyfree_stacks)
+ {
+ free (yyss);
+ free (yyvs);
+#ifdef YYLSP_NEEDED
+ free (yyls);
+#endif
+ }
+ return 1;
}
#line 445 "awkgram.y"
Modified: httpd/httpd/win32-msi/trunk/awk/ytab.h
URL: http://svn.apache.org/viewcvs/httpd/httpd/win32-msi/trunk/awk/ytab.h?view=diff&r1=153270&r2=153271
==============================================================================
--- httpd/httpd/win32-msi/trunk/awk/ytab.h (original)
+++ httpd/httpd/win32-msi/trunk/awk/ytab.h Thu Feb 10 07:53:34 2005
@@ -4,98 +4,98 @@
int i;
char *s;
} YYSTYPE;
-#define FIRSTTOKEN 258
-#define PROGRAM 259
-#define PASTAT 260
-#define PASTAT2 261
-#define XBEGIN 262
-#define XEND 263
-#define NL 264
-#define ARRAY 265
-#define MATCH 266
-#define NOTMATCH 267
-#define MATCHOP 268
-#define FINAL 269
-#define DOT 270
-#define ALL 271
-#define CCL 272
-#define NCCL 273
-#define CHAR 274
-#define OR 275
-#define STAR 276
-#define QUEST 277
-#define PLUS 278
-#define AND 279
-#define BOR 280
-#define APPEND 281
-#define EQ 282
-#define GE 283
-#define GT 284
-#define LE 285
-#define LT 286
-#define NE 287
-#define IN 288
-#define ARG 289
-#define BLTIN 290
-#define BREAK 291
-#define CLOSE 292
-#define CONTINUE 293
-#define DELETE 294
-#define DO 295
-#define EXIT 296
-#define FOR 297
-#define FUNC 298
-#define SUB 299
-#define GSUB 300
-#define IF 301
-#define INDEX 302
-#define LSUBSTR 303
-#define MATCHFCN 304
-#define NEXT 305
-#define NEXTFILE 306
-#define ADD 307
-#define MINUS 308
-#define MULT 309
-#define DIVIDE 310
-#define MOD 311
-#define ASSIGN 312
-#define ASGNOP 313
-#define ADDEQ 314
-#define SUBEQ 315
-#define MULTEQ 316
-#define DIVEQ 317
-#define MODEQ 318
-#define POWEQ 319
-#define PRINT 320
-#define PRINTF 321
-#define SPRINTF 322
-#define ELSE 323
-#define INTEST 324
-#define CONDEXPR 325
-#define POSTINCR 326
-#define PREINCR 327
-#define POSTDECR 328
-#define PREDECR 329
-#define VAR 330
-#define IVAR 331
-#define VARNF 332
-#define CALL 333
-#define NUMBER 334
-#define STRING 335
-#define REGEXPR 336
-#define GETLINE 337
-#define RETURN 338
-#define SPLIT 339
-#define SUBSTR 340
-#define WHILE 341
-#define CAT 342
-#define NOT 343
-#define UMINUS 344
-#define POWER 345
-#define DECR 346
-#define INCR 347
-#define INDIRECT 348
-#define LASTTOKEN 349
+#define FIRSTTOKEN 257
+#define PROGRAM 258
+#define PASTAT 259
+#define PASTAT2 260
+#define XBEGIN 261
+#define XEND 262
+#define NL 263
+#define ARRAY 264
+#define MATCH 265
+#define NOTMATCH 266
+#define MATCHOP 267
+#define FINAL 268
+#define DOT 269
+#define ALL 270
+#define CCL 271
+#define NCCL 272
+#define CHAR 273
+#define OR 274
+#define STAR 275
+#define QUEST 276
+#define PLUS 277
+#define AND 278
+#define BOR 279
+#define APPEND 280
+#define EQ 281
+#define GE 282
+#define GT 283
+#define LE 284
+#define LT 285
+#define NE 286
+#define IN 287
+#define ARG 288
+#define BLTIN 289
+#define BREAK 290
+#define CLOSE 291
+#define CONTINUE 292
+#define DELETE 293
+#define DO 294
+#define EXIT 295
+#define FOR 296
+#define FUNC 297
+#define SUB 298
+#define GSUB 299
+#define IF 300
+#define INDEX 301
+#define LSUBSTR 302
+#define MATCHFCN 303
+#define NEXT 304
+#define NEXTFILE 305
+#define ADD 306
+#define MINUS 307
+#define MULT 308
+#define DIVIDE 309
+#define MOD 310
+#define ASSIGN 311
+#define ASGNOP 312
+#define ADDEQ 313
+#define SUBEQ 314
+#define MULTEQ 315
+#define DIVEQ 316
+#define MODEQ 317
+#define POWEQ 318
+#define PRINT 319
+#define PRINTF 320
+#define SPRINTF 321
+#define ELSE 322
+#define INTEST 323
+#define CONDEXPR 324
+#define POSTINCR 325
+#define PREINCR 326
+#define POSTDECR 327
+#define PREDECR 328
+#define VAR 329
+#define IVAR 330
+#define VARNF 331
+#define CALL 332
+#define NUMBER 333
+#define STRING 334
+#define REGEXPR 335
+#define GETLINE 336
+#define RETURN 337
+#define SPLIT 338
+#define SUBSTR 339
+#define WHILE 340
+#define CAT 341
+#define NOT 342
+#define UMINUS 343
+#define POWER 344
+#define DECR 345
+#define INCR 346
+#define INDIRECT 347
+#define LASTTOKEN 348
extern YYSTYPE yylval;
---------------------------------------------------------------------
To unsubscribe, e-mail: win32-msi-cvs-unsubscribe@httpd.apache.org
For additional commands, e-mail: win32-msi-cvs-help@httpd.apache.org