Imported Upstream version 20110908upstream/20110908

11 files changed, 107 insertions, 94 deletions

diff --git a/test/calc.tab.c b/test/calc.tab.c
index 9554d8f..d13ebb9 100644
--- a/test/calc.tab.c
+++ b/test/calc.tab.c
@@ -260,6 +260,15 @@ static const char *yyrule[] = {
 
 };
 #endif
+
+int      yydebug;
+int      yynerrs;
+
+int      yyerrflag;
+int      yychar;
+YYSTYPE  yyval;
+YYSTYPE  yylval;
+
 /* define the initial stack-sizes */
 #ifdef YYSTACKSIZE
 #undef YYMAXDEPTH
@@ -275,9 +284,6 @@ static const char *yyrule[] = {
 
 #define YYINITSTACKSIZE 500
 
-int      yydebug;
-int      yynerrs;
-
 typedef struct {
     unsigned stacksize;
     short    *s_base;
@@ -286,11 +292,6 @@ typedef struct {
     YYSTYPE  *l_base;
     YYSTYPE  *l_mark;
 } YYSTACKDATA;
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
 /* variables for the parser stack */
 static YYSTACKDATA yystack;
 #line 63 "calc.y"
@@ -340,7 +341,7 @@ yylex(void)
     }
     return( c );
 }
-#line 344 "calc.tab.c"
+#line 345 "calc.tab.c"
 
 #if YYDEBUG
 #include <stdio.h>		/* needed for printf */
@@ -606,7 +607,7 @@ case 18:
 #line 60 "calc.y"
 	{  yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
 break;
-#line 610 "calc.tab.c"
+#line 611 "calc.tab.c"
     }
     yystack.s_mark -= yym;
     yystate = *yystack.s_mark;
diff --git a/test/calc1.tab.c b/test/calc1.tab.c
index e55e64a..415b7f6 100644
--- a/test/calc1.tab.c
+++ b/test/calc1.tab.c
@@ -133,6 +133,7 @@ typedef union
 } YYSTYPE;
 #endif /* !YYSTYPE_IS_DECLARED */
 #line 136 "calc1.tab.c"
+
 /* compatibility with bison */
 #ifdef YYPARSE_PARAM
 /* compatibility with FreeBSD */
@@ -309,6 +310,15 @@ static const char *yyrule[] = {
 
 };
 #endif
+
+int      yydebug;
+int      yynerrs;
+
+int      yyerrflag;
+int      yychar;
+YYSTYPE  yyval;
+YYSTYPE  yylval;
+
 /* define the initial stack-sizes */
 #ifdef YYSTACKSIZE
 #undef YYMAXDEPTH
@@ -324,9 +334,6 @@ static const char *yyrule[] = {
 
 #define YYINITSTACKSIZE 500
 
-int      yydebug;
-int      yynerrs;
-
 typedef struct {
     unsigned stacksize;
     short    *s_base;
@@ -335,11 +342,6 @@ typedef struct {
     YYSTYPE  *l_base;
     YYSTYPE  *l_mark;
 } YYSTACKDATA;
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
 /* variables for the parser stack */
 static YYSTACKDATA yystack;
 #line 173 "calc1.y"
@@ -478,7 +480,7 @@ vdiv(double a, double b, INTERVAL v)
 {
     return (hilo(a / v.hi, a / v.lo, b / v.hi, b / v.lo));
 }
-#line 482 "calc1.tab.c"
+#line 484 "calc1.tab.c"
 
 #if YYDEBUG
 #include <stdio.h>		/* needed for printf */
@@ -847,7 +849,7 @@ case 28:
 		yyval.vval = yystack.l_mark[-1].vval;
 	}
 break;
-#line 851 "calc1.tab.c"
+#line 853 "calc1.tab.c"
     }
     yystack.s_mark -= yym;
     yystate = *yystack.s_mark;
diff --git a/test/calc2.tab.c b/test/calc2.tab.c
index 15d51e8..69ec2ba 100644
--- a/test/calc2.tab.c
+++ b/test/calc2.tab.c
@@ -257,6 +257,15 @@ static const char *yyrule[] = {
 
 };
 #endif
+
+int      yydebug;
+int      yynerrs;
+
+int      yyerrflag;
+int      yychar;
+YYSTYPE  yyval;
+YYSTYPE  yylval;
+
 /* define the initial stack-sizes */
 #ifdef YYSTACKSIZE
 #undef YYMAXDEPTH
@@ -272,9 +281,6 @@ static const char *yyrule[] = {
 
 #define YYINITSTACKSIZE 500
 
-int      yydebug;
-int      yynerrs;
-
 typedef struct {
     unsigned stacksize;
     short    *s_base;
@@ -283,11 +289,6 @@ typedef struct {
     YYSTYPE  *l_base;
     YYSTYPE  *l_mark;
 } YYSTACKDATA;
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
 /* variables for the parser stack */
 static YYSTACKDATA yystack;
 #line 65 "calc2.y"
@@ -340,7 +341,7 @@ yylex(int *base)
     }
     return( c );
 }
-#line 344 "calc2.tab.c"
+#line 345 "calc2.tab.c"
 
 #if YYDEBUG
 #include <stdio.h>		/* needed for printf */
@@ -606,7 +607,7 @@ case 18:
 #line 62 "calc2.y"
 	{  yyval = (*base) * yystack.l_mark[-1] + yystack.l_mark[0]; }
 break;
-#line 610 "calc2.tab.c"
+#line 611 "calc2.tab.c"
     }
     yystack.s_mark -= yym;
     yystate = *yystack.s_mark;
diff --git a/test/calc3.tab.c b/test/calc3.tab.c
index c37df50..7d69117 100644
--- a/test/calc3.tab.c
+++ b/test/calc3.tab.c
@@ -257,6 +257,10 @@ static const char *yyrule[] = {
 
 };
 #endif
+
+int      yydebug;
+int      yynerrs;
+
 /* define the initial stack-sizes */
 #ifdef YYSTACKSIZE
 #undef YYMAXDEPTH
@@ -272,9 +276,6 @@ static const char *yyrule[] = {
 
 #define YYINITSTACKSIZE 500
 
-int      yydebug;
-int      yynerrs;
-
 typedef struct {
     unsigned stacksize;
     short    *s_base;
@@ -333,7 +334,7 @@ YYLEX_DECL()
     }
     return( c );
 }
-#line 337 "calc3.tab.c"
+#line 338 "calc3.tab.c"
 
 #if YYDEBUG
 #include <stdio.h>		/* needed for printf */
@@ -606,7 +607,7 @@ case 18:
 #line 64 "calc3.y"
 	{  yyval = (*base) * yystack.l_mark[-1] + yystack.l_mark[0]; }
 break;
-#line 610 "calc3.tab.c"
+#line 611 "calc3.tab.c"
     }
     yystack.s_mark -= yym;
     yystate = *yystack.s_mark;
diff --git a/test/code_calc.code.c b/test/code_calc.code.c
index 9a663ef..7521939 100644
--- a/test/code_calc.code.c
+++ b/test/code_calc.code.c
@@ -145,8 +145,8 @@ extern int YYPARSE_DECL();
 #define yyrule     calc_rule
 #endif /* yyrule */
 #define YYPREFIX "calc_"
-extern int YYPARSE_DECL();
 
+extern int YYPARSE_DECL();
 extern short yylhs[];
 extern short yylen[];
 extern short yydefred[];
@@ -161,6 +161,15 @@ extern short yycheck[];
 extern char *yyname[];
 extern char *yyrule[];
 #endif
+
+int      yydebug;
+int      yynerrs;
+
+int      yyerrflag;
+int      yychar;
+YYSTYPE  yyval;
+YYSTYPE  yylval;
+
 /* define the initial stack-sizes */
 #ifdef YYSTACKSIZE
 #undef YYMAXDEPTH
@@ -176,9 +185,6 @@ extern char *yyrule[];
 
 #define YYINITSTACKSIZE 500
 
-int      yydebug;
-int      yynerrs;
-
 typedef struct {
     unsigned stacksize;
     short    *s_base;
@@ -187,11 +193,6 @@ typedef struct {
     YYSTYPE  *l_base;
     YYSTYPE  *l_mark;
 } YYSTACKDATA;
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
 /* variables for the parser stack */
 static YYSTACKDATA yystack;
 #line 63 "code_calc.y"
@@ -240,7 +241,7 @@ yylex(void) {
     }
     return( c );
 }
-#line 244 "code_calc.code.c"
+#line 245 "code_calc.code.c"
 
 #if YYDEBUG
 #include <stdio.h>		/* needed for printf */
@@ -506,7 +507,7 @@ case 18:
 #line 60 "code_calc.y"
 	{  yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
 break;
-#line 510 "code_calc.code.c"
+#line 511 "code_calc.code.c"
     }
     yystack.s_mark -= yym;
     yystate = *yystack.s_mark;
diff --git a/test/code_error.code.c b/test/code_error.code.c
index dd3d96b..f845db3 100644
--- a/test/code_error.code.c
+++ b/test/code_error.code.c
@@ -134,8 +134,8 @@ extern int YYPARSE_DECL();
 #define yyrule     error_rule
 #endif /* yyrule */
 #define YYPREFIX "error_"
-extern int YYPARSE_DECL();
 
+extern int YYPARSE_DECL();
 extern short yylhs[];
 extern short yylen[];
 extern short yydefred[];
@@ -150,6 +150,15 @@ extern short yycheck[];
 extern char *yyname[];
 extern char *yyrule[];
 #endif
+
+int      yydebug;
+int      yynerrs;
+
+int      yyerrflag;
+int      yychar;
+YYSTYPE  yyval;
+YYSTYPE  yylval;
+
 /* define the initial stack-sizes */
 #ifdef YYSTACKSIZE
 #undef YYMAXDEPTH
@@ -165,9 +174,6 @@ extern char *yyrule[];
 
 #define YYINITSTACKSIZE 500
 
-int      yydebug;
-int      yynerrs;
-
 typedef struct {
     unsigned stacksize;
     short    *s_base;
@@ -176,11 +182,6 @@ typedef struct {
     YYSTYPE  *l_base;
     YYSTYPE  *l_mark;
 } YYSTACKDATA;
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
 /* variables for the parser stack */
 static YYSTACKDATA yystack;
 #line 4 "code_error.y"
@@ -210,7 +211,7 @@ yyerror(const char* s)
 {
     printf("%s\n", s);
 }
-#line 214 "code_error.code.c"
+#line 215 "code_error.code.c"
 
 #if YYDEBUG
 #include <stdio.h>		/* needed for printf */
diff --git a/test/error.tab.c b/test/error.tab.c
index bcf64dc..088f9d5 100644
--- a/test/error.tab.c
+++ b/test/error.tab.c
@@ -168,6 +168,15 @@ static const char *yyrule[] = {
 
 };
 #endif
+
+int      yydebug;
+int      yynerrs;
+
+int      yyerrflag;
+int      yychar;
+YYSTYPE  yyval;
+YYSTYPE  yylval;
+
 /* define the initial stack-sizes */
 #ifdef YYSTACKSIZE
 #undef YYMAXDEPTH
@@ -183,9 +192,6 @@ static const char *yyrule[] = {
 
 #define YYINITSTACKSIZE 500
 
-int      yydebug;
-int      yynerrs;
-
 typedef struct {
     unsigned stacksize;
     short    *s_base;
@@ -194,11 +200,6 @@ typedef struct {
     YYSTYPE  *l_base;
     YYSTYPE  *l_mark;
 } YYSTACKDATA;
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
 /* variables for the parser stack */
 static YYSTACKDATA yystack;
 #line 4 "error.y"
@@ -228,7 +229,7 @@ yyerror(const char* s)
 {
     printf("%s\n", s);
 }
-#line 232 "error.tab.c"
+#line 233 "error.tab.c"
 
 #if YYDEBUG
 #include <stdio.h>		/* needed for printf */
diff --git a/test/ftp.tab.c b/test/ftp.tab.c
index 23b15d9..2df84f7 100644
--- a/test/ftp.tab.c
+++ b/test/ftp.tab.c
@@ -509,6 +509,15 @@ static const char *yyrule[] = {
 
 };
 #endif
+
+int      yydebug;
+int      yynerrs;
+
+int      yyerrflag;
+int      yychar;
+YYSTYPE  yyval;
+YYSTYPE  yylval;
+
 /* define the initial stack-sizes */
 #ifdef YYSTACKSIZE
 #undef YYMAXDEPTH
@@ -524,9 +533,6 @@ static const char *yyrule[] = {
 
 #define YYINITSTACKSIZE 500
 
-int      yydebug;
-int      yynerrs;
-
 typedef struct {
     unsigned stacksize;
     short    *s_base;
@@ -535,11 +541,6 @@ typedef struct {
     YYSTYPE  *l_base;
     YYSTYPE  *l_mark;
 } YYSTACKDATA;
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
 /* variables for the parser stack */
 static YYSTACKDATA yystack;
 #line 689 "ftp.y"
@@ -1074,7 +1075,7 @@ sizecmd(char *filename)
 		reply(504, "SIZE not implemented for Type %c.", "?AEIL"[type]);
 	}
 }
-#line 1078 "ftp.tab.c"
+#line 1079 "ftp.tab.c"
 
 #if YYDEBUG
 #include <stdio.h>		/* needed for printf */
@@ -1917,7 +1918,7 @@ case 73:
 		}
 	}
 break;
-#line 1921 "ftp.tab.c"
+#line 1922 "ftp.tab.c"
     }
     yystack.s_mark -= yym;
     yystate = *yystack.s_mark;
diff --git a/test/grammar.tab.c b/test/grammar.tab.c
index 5231895..f2ff21f 100644
--- a/test/grammar.tab.c
+++ b/test/grammar.tab.c
@@ -375,6 +375,7 @@ haveAnsiParam (void)
     return FALSE;
 }
 #line 378 "grammar.tab.c"
+
 /* compatibility with bison */
 #ifdef YYPARSE_PARAM
 /* compatibility with FreeBSD */
@@ -863,6 +864,15 @@ static const char *yyrule[] = {
 
 };
 #endif
+
+int      yydebug;
+int      yynerrs;
+
+int      yyerrflag;
+int      yychar;
+YYSTYPE  yyval;
+YYSTYPE  yylval;
+
 /* define the initial stack-sizes */
 #ifdef YYSTACKSIZE
 #undef YYMAXDEPTH
@@ -878,9 +888,6 @@ static const char *yyrule[] = {
 
 #define YYINITSTACKSIZE 500
 
-int      yydebug;
-int      yynerrs;
-
 typedef struct {
     unsigned stacksize;
     short    *s_base;
@@ -889,11 +896,6 @@ typedef struct {
     YYSTYPE  *l_base;
     YYSTYPE  *l_mark;
 } YYSTACKDATA;
-int      yyerrflag;
-int      yychar;
-YYSTYPE  yyval;
-YYSTYPE  yylval;
-
 /* variables for the parser stack */
 static YYSTACKDATA yystack;
 #line 1004 "grammar.y"
@@ -1067,7 +1069,7 @@ free_parser(void)
 #endif
 }
 #endif
-#line 1071 "grammar.tab.c"
+#line 1073 "grammar.tab.c"
 
 #if YYDEBUG
 #include <stdio.h>		/* needed for printf */
@@ -1947,7 +1949,7 @@ case 114:
 	    yyval.declarator->func_def = FUNC_ANSI;
 	}
 break;
-#line 1951 "grammar.tab.c"
+#line 1953 "grammar.tab.c"
     }
     yystack.s_mark -= yym;
     yystate = *yystack.s_mark;
diff --git a/test/pure_calc.tab.c b/test/pure_calc.tab.c
index 4608901..db353b5 100644
--- a/test/pure_calc.tab.c
+++ b/test/pure_calc.tab.c
@@ -260,6 +260,10 @@ static const char *yyrule[] = {
 
 };
 #endif
+
+int      yydebug;
+int      yynerrs;
+
 /* define the initial stack-sizes */
 #ifdef YYSTACKSIZE
 #undef YYMAXDEPTH
@@ -275,9 +279,6 @@ static const char *yyrule[] = {
 
 #define YYINITSTACKSIZE 500
 
-int      yydebug;
-int      yynerrs;
-
 typedef struct {
     unsigned stacksize;
     short    *s_base;
@@ -333,7 +334,7 @@ yylex(YYSTYPE *value)
     }
     return( c );
 }
-#line 337 "pure_calc.tab.c"
+#line 338 "pure_calc.tab.c"
 
 #if YYDEBUG
 #include <stdio.h>		/* needed for printf */
@@ -606,7 +607,7 @@ case 18:
 #line 60 "pure_calc.y"
 	{  yyval = base * yystack.l_mark[-1] + yystack.l_mark[0]; }
 break;
-#line 610 "pure_calc.tab.c"
+#line 611 "pure_calc.tab.c"
     }
     yystack.s_mark -= yym;
     yystate = *yystack.s_mark;
diff --git a/test/pure_error.tab.c b/test/pure_error.tab.c
index 4c252bc..1ba1dc4 100644
--- a/test/pure_error.tab.c
+++ b/test/pure_error.tab.c
@@ -168,6 +168,10 @@ static const char *yyrule[] = {
 
 };
 #endif
+
+int      yydebug;
+int      yynerrs;
+
 /* define the initial stack-sizes */
 #ifdef YYSTACKSIZE
 #undef YYMAXDEPTH
@@ -183,9 +187,6 @@ static const char *yyrule[] = {
 
 #define YYINITSTACKSIZE 500
 
-int      yydebug;
-int      yynerrs;
-
 typedef struct {
     unsigned stacksize;
     short    *s_base;
@@ -221,7 +222,7 @@ yyerror(const char* s)
 {
     printf("%s\n", s);
 }
-#line 225 "pure_error.tab.c"
+#line 226 "pure_error.tab.c"
 
 #if YYDEBUG
 #include <stdio.h>		/* needed for printf */