Rebuild parsers.

This is needed to include the last fix to main/ast_expr2.y. The changes look much bigger as this regeneration of the code was done with newer versions of flex and bison. git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.8@360357 65c4cc65-6c06-0410-ace0-fbb531ad65f3
13 years ago · 2b2c5f27fc
parent 17cd5abb22
commit 2b2c5f27fc
6 changed files with 1094 additions and 999 deletions
--- a/main/ast_expr2.c
+++ b/main/ast_expr2.c
--- a/main/ast_expr2.h
+++ b/main/ast_expr2.h
@ -1,10 +1,8 @@
+/* A Bison parser, made by GNU Bison 2.5.  */

-/* A Bison parser, made by GNU Bison 2.4.1.  */
-
-/* Skeleton interface for Bison's Yacc-like parsers in C
+/* Bison interface for Yacc-like parsers in C
   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989-1990, 2000-2011 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
@ -71,7 +69,7 @@
 typedef union YYSTYPE
 {

-/* Line 1676 of yacc.c  */
+/* Line 2068 of yacc.c  */
 #line 345 "ast_expr2.y"

 	struct val *val;
@ -79,8 +77,8 @@ typedef union YYSTYPE



-/* Line 1676 of yacc.c  */
-#line 84 "ast_expr2.h"
+/* Line 2068 of yacc.c  */
+#line 82 "ast_expr2.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
--- a/main/ast_expr2f.c
+++ b/main/ast_expr2f.c
@ -56,6 +56,7 @@ typedef int flex_int32_t;
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */

 /* Limits of integral types. */
 #ifndef INT8_MIN
@ -86,8 +87,6 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif

-#endif /* ! C99 */
-
 #endif /* ! FLEXINT_H */

 #ifdef __cplusplus
@ -161,15 +160,7 @@ typedef void* yyscan_t;

 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
 #define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
 #endif

 /* The state buf must be large enough to hold one state per character in the main buffer.
@ -609,7 +600,7 @@ int ast_yyget_column(yyscan_t yyscanner);
 static int curlycount = 0;
 static char *expr2_token_subst(const char *mess);

-#line 611 "ast_expr2f.c"
+#line 602 "ast_expr2f.c"

 #define INITIAL 0
 #define var 1
@ -706,6 +697,10 @@ int ast_yyget_lineno (yyscan_t yyscanner );

 void ast_yyset_lineno (int line_number ,yyscan_t yyscanner );

+int ast_yyget_column  (yyscan_t yyscanner );
+
+void ast_yyset_column (int column_no ,yyscan_t yyscanner );
+
 YYSTYPE * ast_yyget_lval (yyscan_t yyscanner );

 void ast_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
@ -748,12 +743,7 @@ static int input (yyscan_t yyscanner );

 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
 #define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
 #endif

 /* Copy whatever the last rule matched to the standard output. */
@ -772,7 +762,7 @@ static int input (yyscan_t yyscanner );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		unsigned n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@ -860,7 +850,7 @@ YY_DECL
 #line 130 "ast_expr2.fl"


-#line 862 "ast_expr2f.c"
+#line 852 "ast_expr2f.c"

    yylval = yylval_param;

@ -1206,7 +1196,7 @@ YY_RULE_SETUP
 #line 238 "ast_expr2.fl"
 ECHO;
 	YY_BREAK
-#line 1208 "ast_expr2f.c"
+#line 1198 "ast_expr2f.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(var):
 	yyterminate();
@ -1980,8 +1970,8 @@ YY_BUFFER_STATE ast_yy_scan_string (yyconst char * yystr , yyscan_t yyscanner)

 /** Setup the input buffer state to scan the given bytes. The next call to ast_yylex() will
 * scan from a @e copy of @a bytes.
- * @param yybytes the byte buffer to scan
- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
 * @param yyscanner The scanner object.
 * @return the newly allocated buffer state object.
 */
--- a/res/ael/ael.tab.c
+++ b/res/ael/ael.tab.c
--- a/res/ael/ael.tab.h
+++ b/res/ael/ael.tab.h
@ -1,10 +1,8 @@
+/* A Bison parser, made by GNU Bison 2.5.  */

-/* A Bison parser, made by GNU Bison 2.4.1.  */
-
-/* Skeleton interface for Bison's Yacc-like parsers in C
+/* Bison interface for Yacc-like parsers in C
   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+      Copyright (C) 1984, 1989-1990, 2000-2011 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
@ -89,7 +87,7 @@
 typedef union YYSTYPE
 {

-/* Line 1676 of yacc.c  */
+/* Line 2068 of yacc.c  */
 #line 59 "ael.y"

 	int	intval;		/* integer value, typically flags */
@ -98,8 +96,8 @@ typedef union YYSTYPE



-/* Line 1676 of yacc.c  */
-#line 103 "ael.tab.h"
+/* Line 2068 of yacc.c  */
+#line 101 "ael.tab.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
--- a/res/ael/ael_lex.c
+++ b/res/ael/ael_lex.c
@ -56,6 +56,7 @@ typedef int flex_int32_t;
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
+#endif /* ! C99 */

 /* Limits of integral types. */
 #ifndef INT8_MIN
@ -86,8 +87,6 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif

-#endif /* ! C99 */
-
 #endif /* ! FLEXINT_H */

 #ifdef __cplusplus
@ -161,15 +160,7 @@ typedef void* yyscan_t;

 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k.
- * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
- * Ditto for the __ia64__ case accordingly.
- */
-#define YY_BUF_SIZE 32768
-#else
 #define YY_BUF_SIZE 16384
-#endif /* __ia64__ */
 #endif

 /* The state buf must be large enough to hold one state per character in the main buffer.
@ -961,7 +952,7 @@ static void pbcwhere(const char *text, int *line, int *col )
 #define	STORE_POS
 #define	STORE_LOC
 #endif
-#line 963 "ael_lex.c"
+#line 954 "ael_lex.c"

 #define INITIAL 0
 #define paren 1
@ -1063,6 +1054,10 @@ int ael_yyget_lineno (yyscan_t yyscanner );

 void ael_yyset_lineno (int line_number ,yyscan_t yyscanner );

+int ael_yyget_column  (yyscan_t yyscanner );
+
+void ael_yyset_column (int column_no ,yyscan_t yyscanner );
+
 YYSTYPE * ael_yyget_lval (yyscan_t yyscanner );

 void ael_yyset_lval (YYSTYPE * yylval_param ,yyscan_t yyscanner );
@ -1105,12 +1100,7 @@ static int input (yyscan_t yyscanner );

 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
-#ifdef __ia64__
-/* On IA-64, the buffer size is 16k, not 8k */
-#define YY_READ_BUF_SIZE 16384
-#else
 #define YY_READ_BUF_SIZE 8192
-#endif /* __ia64__ */
 #endif

 /* Copy whatever the last rule matched to the standard output. */
@ -1129,7 +1119,7 @@ static int input (yyscan_t yyscanner );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		unsigned n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@ -1217,7 +1207,7 @@ YY_DECL
 #line 217 "ael.flex"


-#line 1219 "ael_lex.c"
+#line 1209 "ael_lex.c"

    yylval = yylval_param;

@ -2051,7 +2041,7 @@ YY_RULE_SETUP
 #line 656 "ael.flex"
 YY_FATAL_ERROR( "flex scanner jammed" );
 	YY_BREAK
-#line 2053 "ael_lex.c"
+#line 2043 "ael_lex.c"

 	case YY_END_OF_BUFFER:
 		{
@ -2822,8 +2812,8 @@ YY_BUFFER_STATE ael_yy_scan_string (yyconst char * yystr , yyscan_t yyscanner)

 /** Setup the input buffer state to scan the given bytes. The next call to ael_yylex() will
 * scan from a @e copy of @a bytes.
- * @param yybytes the byte buffer to scan
- * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+ * @param bytes the byte buffer to scan
+ * @param len the number of bytes in the buffer pointed to by @a bytes.
 * @param yyscanner The scanner object.
 * @return the newly allocated buffer state object.
 */