aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2011-01-20 09:23:08 -0500
committerMichal Marek <mmarek@suse.cz>2011-03-17 10:13:55 -0400
commit9c281f13b68da49764cbc8d7d610c2f229a0f9a0 (patch)
tree9e3ae5ace293888dd2fa0331186f1acc3e94e57a
parentc56eb8fb6dccb83d9fe62fd4dc00c834de9bc470 (diff)
genksyms: Do not paste the bison header file to lex.c
The header is already #included, no need to include it a second time. lex.c_shipped was regenerated using flex-2.5.35. Signed-off-by: Michal Marek <mmarek@suse.cz> Acked-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r--scripts/genksyms/Makefile4
-rw-r--r--scripts/genksyms/lex.c_shipped150
2 files changed, 7 insertions, 147 deletions
diff --git a/scripts/genksyms/Makefile b/scripts/genksyms/Makefile
index e420fe440019..13d03cf05d95 100644
--- a/scripts/genksyms/Makefile
+++ b/scripts/genksyms/Makefile
@@ -28,9 +28,9 @@ $(obj)/keywords.c: $(obj)/keywords.gperf FORCE
28# flex 28# flex
29 29
30quiet_cmd_lex.c = FLEX $@ 30quiet_cmd_lex.c = FLEX $@
31 cmd_lex.c = flex -o$@ -d $< $(obj)/parse.h 31 cmd_lex.c = flex -o$@ -d $<
32 32
33$(obj)/lex.c: $(obj)/lex.l $(obj)/parse.h $(obj)/keywords.c FORCE 33$(obj)/lex.c: $(obj)/lex.l $(obj)/keywords.c FORCE
34 $(call if_changed,lex.c) 34 $(call if_changed,lex.c)
35 cp $@ $@_shipped 35 cp $@ $@_shipped
36 36
diff --git a/scripts/genksyms/lex.c_shipped b/scripts/genksyms/lex.c_shipped
index 2ac23bcca5b5..b54044ac1fa7 100644
--- a/scripts/genksyms/lex.c_shipped
+++ b/scripts/genksyms/lex.c_shipped
@@ -79,6 +79,7 @@ typedef int flex_int32_t;
79typedef unsigned char flex_uint8_t; 79typedef unsigned char flex_uint8_t;
80typedef unsigned short int flex_uint16_t; 80typedef unsigned short int flex_uint16_t;
81typedef unsigned int flex_uint32_t; 81typedef unsigned int flex_uint32_t;
82#endif /* ! C99 */
82 83
83/* Limits of integral types. */ 84/* Limits of integral types. */
84#ifndef INT8_MIN 85#ifndef INT8_MIN
@@ -109,8 +110,6 @@ typedef unsigned int flex_uint32_t;
109#define UINT32_MAX (4294967295U) 110#define UINT32_MAX (4294967295U)
110#endif 111#endif
111 112
112#endif /* ! C99 */
113
114#endif /* ! FLEXINT_H */ 113#endif /* ! FLEXINT_H */
115 114
116/* %endif */ 115/* %endif */
@@ -672,7 +671,7 @@ char *yytext;
672 671
673/* We don't do multiple input files. */ 672/* We don't do multiple input files. */
674#define YY_NO_INPUT 1 673#define YY_NO_INPUT 1
675#line 676 "scripts/genksyms/lex.c" 674#line 675 "scripts/genksyms/lex.c"
676 675
677#define INITIAL 0 676#define INITIAL 0
678#define V2_TOKENS 1 677#define V2_TOKENS 1
@@ -808,7 +807,7 @@ static int input (void );
808 if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ 807 if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
809 { \ 808 { \
810 int c = '*'; \ 809 int c = '*'; \
811 size_t n; \ 810 int n; \
812 for ( n = 0; n < max_size && \ 811 for ( n = 0; n < max_size && \
813 (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ 812 (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
814 buf[n] = (char) c; \ 813 buf[n] = (char) c; \
@@ -923,7 +922,7 @@ YY_DECL
923 922
924 923
925 /* Keep track of our location in the original source files. */ 924 /* Keep track of our location in the original source files. */
926#line 927 "scripts/genksyms/lex.c" 925#line 926 "scripts/genksyms/lex.c"
927 926
928 if ( !(yy_init) ) 927 if ( !(yy_init) )
929 { 928 {
@@ -1114,7 +1113,7 @@ YY_RULE_SETUP
1114#line 97 "scripts/genksyms/lex.l" 1113#line 97 "scripts/genksyms/lex.l"
1115ECHO; 1114ECHO;
1116 YY_BREAK 1115 YY_BREAK
1117#line 1118 "scripts/genksyms/lex.c" 1116#line 1117 "scripts/genksyms/lex.c"
1118case YY_STATE_EOF(INITIAL): 1117case YY_STATE_EOF(INITIAL):
1119case YY_STATE_EOF(V2_TOKENS): 1118case YY_STATE_EOF(V2_TOKENS):
1120 yyterminate(); 1119 yyterminate();
@@ -2567,143 +2566,4 @@ fini:
2567 2566
2568 return token; 2567 return token;
2569} 2568}
2570/* A Bison parser, made by GNU Bison 2.3. */
2571
2572/* Skeleton interface for Bison's Yacc-like parsers in C
2573
2574 Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
2575 Free Software Foundation, Inc.
2576
2577 This program is free software; you can redistribute it and/or modify
2578 it under the terms of the GNU General Public License as published by
2579 the Free Software Foundation; either version 2, or (at your option)
2580 any later version.
2581
2582 This program is distributed in the hope that it will be useful,
2583 but WITHOUT ANY WARRANTY; without even the implied warranty of
2584 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
2585 GNU General Public License for more details.
2586
2587 You should have received a copy of the GNU General Public License
2588 along with this program; if not, write to the Free Software
2589 Foundation, Inc., 51 Franklin Street, Fifth Floor,
2590 Boston, MA 02110-1301, USA. */
2591
2592/* As a special exception, you may create a larger work that contains
2593 part or all of the Bison parser skeleton and distribute that work
2594 under terms of your choice, so long as that work isn't itself a
2595 parser generator using the skeleton or a modified version thereof
2596 as a parser skeleton. Alternatively, if you modify or redistribute
2597 the parser skeleton itself, you may (at your option) remove this
2598 special exception, which will cause the skeleton and the resulting
2599 Bison output files to be licensed under the GNU General Public
2600 License without this special exception.
2601
2602 This special exception was added by the Free Software Foundation in
2603 version 2.2 of Bison. */
2604
2605/* Tokens. */
2606#ifndef YYTOKENTYPE
2607# define YYTOKENTYPE
2608 /* Put the tokens into the symbol table, so that GDB and other debuggers
2609 know about them. */
2610 enum yytokentype {
2611 ASM_KEYW = 258,
2612 ATTRIBUTE_KEYW = 259,
2613 AUTO_KEYW = 260,
2614 BOOL_KEYW = 261,
2615 CHAR_KEYW = 262,
2616 CONST_KEYW = 263,
2617 DOUBLE_KEYW = 264,
2618 ENUM_KEYW = 265,
2619 EXTERN_KEYW = 266,
2620 EXTENSION_KEYW = 267,
2621 FLOAT_KEYW = 268,
2622 INLINE_KEYW = 269,
2623 INT_KEYW = 270,
2624 LONG_KEYW = 271,
2625 REGISTER_KEYW = 272,
2626 RESTRICT_KEYW = 273,
2627 SHORT_KEYW = 274,
2628 SIGNED_KEYW = 275,
2629 STATIC_KEYW = 276,
2630 STRUCT_KEYW = 277,
2631 TYPEDEF_KEYW = 278,
2632 UNION_KEYW = 279,
2633 UNSIGNED_KEYW = 280,
2634 VOID_KEYW = 281,
2635 VOLATILE_KEYW = 282,
2636 TYPEOF_KEYW = 283,
2637 EXPORT_SYMBOL_KEYW = 284,
2638 ASM_PHRASE = 285,
2639 ATTRIBUTE_PHRASE = 286,
2640 BRACE_PHRASE = 287,
2641 BRACKET_PHRASE = 288,
2642 EXPRESSION_PHRASE = 289,
2643 CHAR = 290,
2644 DOTS = 291,
2645 IDENT = 292,
2646 INT = 293,
2647 REAL = 294,
2648 STRING = 295,
2649 TYPE = 296,
2650 OTHER = 297,
2651 FILENAME = 298
2652 };
2653#endif
2654/* Tokens. */
2655#define ASM_KEYW 258
2656#define ATTRIBUTE_KEYW 259
2657#define AUTO_KEYW 260
2658#define BOOL_KEYW 261
2659#define CHAR_KEYW 262
2660#define CONST_KEYW 263
2661#define DOUBLE_KEYW 264
2662#define ENUM_KEYW 265
2663#define EXTERN_KEYW 266
2664#define EXTENSION_KEYW 267
2665#define FLOAT_KEYW 268
2666#define INLINE_KEYW 269
2667#define INT_KEYW 270
2668#define LONG_KEYW 271
2669#define REGISTER_KEYW 272
2670#define RESTRICT_KEYW 273
2671#define SHORT_KEYW 274
2672#define SIGNED_KEYW 275
2673#define STATIC_KEYW 276
2674#define STRUCT_KEYW 277
2675#define TYPEDEF_KEYW 278
2676#define UNION_KEYW 279
2677#define UNSIGNED_KEYW 280
2678#define VOID_KEYW 281
2679#define VOLATILE_KEYW 282
2680#define TYPEOF_KEYW 283
2681#define EXPORT_SYMBOL_KEYW 284
2682#define ASM_PHRASE 285
2683#define ATTRIBUTE_PHRASE 286
2684#define BRACE_PHRASE 287
2685#define BRACKET_PHRASE 288
2686#define EXPRESSION_PHRASE 289
2687#define CHAR 290
2688#define DOTS 291
2689#define IDENT 292
2690#define INT 293
2691#define REAL 294
2692#define STRING 295
2693#define TYPE 296
2694#define OTHER 297
2695#define FILENAME 298
2696
2697
2698
2699
2700#if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
2701typedef int YYSTYPE;
2702# define yystype YYSTYPE /* obsolescent; will be withdrawn */
2703# define YYSTYPE_IS_DECLARED 1
2704# define YYSTYPE_IS_TRIVIAL 1
2705#endif
2706
2707extern YYSTYPE yylval;
2708
2709 2569