FCL/sf/mw/gstreamer: comparison gstreamer_core/gst/parse/lex._gst_parse

equal deleted inserted replaced

-:567bb019e3e3
+:7e817e7e631c
 #ifdef HAVE_CONFIG_H
 #ifdef __SYMBIAN32__
-#include <config.h>
+#include "config.h"
 #else
 #include <config.h>
 #endif
 #endif
 /* A lexical scanner generated by flex */
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
+#define YY_FLEX_SUBMINOR_VERSION 33
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
 /* First, we deal with  platform-specific or compiler-specific issues. */
 #ifndef FLEXINT_H
 #define FLEXINT_H
 /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
-#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#if __STDC_VERSION__ >= 199901L
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
 * if you want the limit (max/min) macros for int types.
 */
 #ifndef __STDC_LIMIT_MACROS
 typedef short int flex_int16_t;
 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
 #define INT8_MIN               (-128)
 #endif
 #endif
 #ifndef UINT32_MAX
 #define UINT32_MAX             (4294967295U)
 #endif
-#endif /* ! C99 */
 #endif /* ! FLEXINT_H */
 #ifdef __cplusplus
 /* The "const" storage-class-modifier is valid. */
 #define YY_USE_CONST
 #else	/* ! __cplusplus */
-/* C99 requires __STDC__ to be defined as 1. */
+#if __STDC__
-#if defined (__STDC__)
 #define YY_USE_CONST
-#endif	/* defined (__STDC__) */
+#endif	/* __STDC__ */
 #endif	/* ! __cplusplus */
 #ifdef YY_USE_CONST
 #define yyconst const
 #else
 #define yytext yyg->yytext_r
 #define yylineno (YY_CURRENT_BUFFER_LVALUE->yy_bs_lineno)
 #define yycolumn (YY_CURRENT_BUFFER_LVALUE->yy_bs_column)
 #define yy_flex_debug yyg->yy_flex_debug_r
+int _gst_parse_yylex_init (yyscan_t* scanner);
 /* Enter a start condition.  This macro really ought to take a parameter,
 * but we do it the disgusting crufty way forced on us by the ()-less
 * definition of BEGIN.
 */
 #define BEGIN yyg->yy_start = 1 + 2 *
 #define YY_END_OF_BUFFER_CHAR 0
 /* 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.
 */
 #define YY_STATE_BUF_SIZE   ((YY_BUF_SIZE + 2) * sizeof(yy_state_type))
 		} \
 	while ( 0 )
 #define unput(c) yyunput( c, yyg->yytext_ptr , yyscanner )
+/* The following is because we cannot portably get our hands on size_t
+* (without autoconf's help, which isn't available because we want
+* flex-generated scanners to compile on their own).
+*/
 #ifndef YY_TYPEDEF_YY_SIZE_T
 #define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
+typedef unsigned int yy_size_t;
 #endif
 #ifndef YY_STRUCT_YY_BUFFER_STATE
 #define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
 /* we must do this here, because nearly everything matches a {_string} */
 /* get pad/element references and stuff with dots right */
 /* links */
 #define YY_NO_INPUT 1
-#line 841 "lex._gst_parse_yy.c"
+#line 838 "lex._gst_parse_yy.c"
 #define INITIAL 0
 #define value 1
 #ifndef YY_NO_UNISTD_H
 /* This must go here because YYSTYPE and YYLTYPE are included
 * from bison output in section 1.*/
 #    define yylval yyg->yylval_r
-int _gst_parse_yylex_init (yyscan_t* scanner);
-int _gst_parse_yylex_init_extra (YY_EXTRA_TYPE user_defined,yyscan_t* scanner);
 /* Accessor methods to globals.
 These are made visible to non-reentrant scanners for convenience. */
 int _gst_parse_yylex_destroy (yyscan_t yyscanner );
 #endif
 /* 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. */
 #ifndef ECHO
 /* This used to be an fputs(), but since the string might contain NUL's,
 * we now use fwrite().
 */
-#define ECHO do { if (fwrite( yytext, yyleng, 1, yyout )) {} } while (0)
+#define ECHO (void) fwrite( yytext, yyleng, 1, yyout )
 #endif
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
 * is returned in "result".
 */
 * easily add parameters.
 */
 #ifndef YY_DECL
 #define YY_DECL_IS_OURS 1
-extern int _gst_parse_yylex \
+extern int _gst_parse_yylex (YYSTYPE * yylval_param ,yyscan_t yyscanner);
-(YYSTYPE * yylval_param ,yyscan_t yyscanner);
+#define YY_DECL int _gst_parse_yylex (YYSTYPE * yylval_param , yyscan_t yyscanner)
-#define YY_DECL int _gst_parse_yylex \
-(YYSTYPE * yylval_param , yyscan_t yyscanner)
 #endif /* !YY_DECL */
 /* Code executed at the beginning of each rule, after yytext and yyleng
 * have been set up.
 */
 struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 #line 71 "parse.l"
-#line 1081 "lex._gst_parse_yy.c"
+#line 1067 "lex._gst_parse_yy.c"
 yylval = yylval_param;
 	if ( !yyg->yy_init )
 		{
 #line 113 "parse.l"
 {
 gchar *c = yytext;
 PRINT ("LINK: %s", yytext);
 c++;
-if (*c) {
+/*if (*c) {
 while (g_ascii_isspace (*c)) c++;
 c = yylval->s = gst_parse_strdup (c);
 while (*c) c++;
 if (*--c != '!')
 	g_assert_not_reached ();
 while (g_ascii_isspace (*--c));
 *++c = '\0';
 } else {
 yylval->s = NULL;
-}
+}*/
 BEGIN (INITIAL);
 return LINK;
 }
 	YY_BREAK
 case 7:
 case 11:
 YY_RULE_SETUP
 #line 148 "parse.l"
 ECHO;
 	YY_BREAK
-#line 1278 "lex._gst_parse_yy.c"
+#line 1264 "lex._gst_parse_yy.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(value):
 	yyterminate();
 	case YY_END_OF_BUFFER:
 		if ( num_to_read > YY_READ_BUF_SIZE )
 			num_to_read = YY_READ_BUF_SIZE;
 		/* Read in more data. */
 		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			yyg->yy_n_chars, (size_t) num_to_read );
+			yyg->yy_n_chars, num_to_read );
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = yyg->yy_n_chars;
 		}
 	if ( yyg->yy_n_chars == 0 )
 			}
 		}
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
-	if ((yy_size_t) (yyg->yy_n_chars + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
-		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) _gst_parse_yyrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size ,yyscanner );
-		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
-			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
-	}
 	yyg->yy_n_chars += number_to_move;
 	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars] = YY_END_OF_BUFFER_CHAR;
 	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[yyg->yy_n_chars + 1] = YY_END_OF_BUFFER_CHAR;
 */
 		num_to_alloc = 1;
 		yyg->yy_buffer_stack = (struct yy_buffer_state**)_gst_parse_yyalloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								, yyscanner);
-		if ( ! yyg->yy_buffer_stack )
-			YY_FATAL_ERROR( "out of dynamic memory in _gst_parse_yyensure_buffer_stack()" );
 		memset(yyg->yy_buffer_stack, 0, num_to_alloc * sizeof(struct yy_buffer_state*));
 		yyg->yy_buffer_stack_max = num_to_alloc;
 		yyg->yy_buffer_stack_top = 0;
 		return;
 		num_to_alloc = yyg->yy_buffer_stack_max + grow_size;
 		yyg->yy_buffer_stack = (struct yy_buffer_state**)_gst_parse_yyrealloc
 								(yyg->yy_buffer_stack,
 								num_to_alloc * sizeof(struct yy_buffer_state*)
 								, yyscanner);
-		if ( ! yyg->yy_buffer_stack )
-			YY_FATAL_ERROR( "out of dynamic memory in _gst_parse_yyensure_buffer_stack()" );
 		/* zero only the new slots.*/
 		memset(yyg->yy_buffer_stack + yyg->yy_buffer_stack_max, 0, grow_size * sizeof(struct yy_buffer_state*));
 		yyg->yy_buffer_stack_max = num_to_alloc;
 	}
 	return b;
 }
 /** Setup the input buffer state to scan a string. The next call to _gst_parse_yylex() will
 * scan from a @e copy of @a str.
-* @param yystr a NUL-terminated string to scan
+* @param str a NUL-terminated string to scan
 * @param yyscanner The scanner object.
 * @return the newly allocated buffer state object.
 * @note If you want to scan bytes that may contain NUL values, then use
 *       _gst_parse_yy_scan_bytes() instead.
 */
 	return _gst_parse_yy_scan_bytes(yystr,strlen(yystr) ,yyscanner);
 }
 /** Setup the input buffer state to scan the given bytes. The next call to _gst_parse_yylex() will
 * scan from a @e copy of @a bytes.
-* @param yybytes the byte buffer to scan
+* @param bytes the byte buffer to scan
-* @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
+* @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.
 */
 YY_BUFFER_STATE _gst_parse_yy_scan_bytes  (yyconst char * yybytes, int  _yybytes_len , yyscan_t yyscanner)
 {
 memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
 return yy_init_globals ( *ptr_yy_globals );
 }
-/* _gst_parse_yylex_init_extra has the same functionality as _gst_parse_yylex_init, but follows the
-* convention of taking the scanner as the last argument. Note however, that
-* this is a *pointer* to a scanner, as it will be allocated by this call (and
-* is the reason, too, why this function also must handle its own declaration).
-* The user defined value in the first argument will be available to _gst_parse_yyalloc in
-* the yyextra field.
-*/
-int _gst_parse_yylex_init_extra(YY_EXTRA_TYPE yy_user_defined,yyscan_t* ptr_yy_globals )
-{
-struct yyguts_t dummy_yyguts;
-_gst_parse_yyset_extra (yy_user_defined, &dummy_yyguts);
-if (ptr_yy_globals == NULL){
-errno = EINVAL;
-return 1;
-}
-*ptr_yy_globals = (yyscan_t) _gst_parse_yyalloc ( sizeof( struct yyguts_t ), &dummy_yyguts );
-if (*ptr_yy_globals == NULL){
-errno = ENOMEM;
-return 1;
-}
-/* By setting to 0xAA, we expose bugs in
-yy_init_globals. Leave at 0x00 for releases. */
-memset(*ptr_yy_globals,0x00,sizeof(struct yyguts_t));
-_gst_parse_yyset_extra (yy_user_defined, *ptr_yy_globals);
-return yy_init_globals ( *ptr_yy_globals );
-}
 static int yy_init_globals (yyscan_t yyscanner)
 {
 struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
 /* Initialization is the same as for the non-reentrant scanner.
 * This function is called from _gst_parse_yylex_destroy(), so don't allocate here.
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef union YYSTYPE
-#line 566 "./grammar.y"
+#line 521 "./grammar.y"
 {
 gchar *s;
 chain_t *c;
 link_t *l;
 GstElement *e;

branch	RCL_3
changeset 30	7e817e7e631c
parent 29	567bb019e3e3