aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorPatrick Georgi <patrick.georgi@coresystems.de>2010-04-08 12:59:41 +0000
committerPatrick Georgi <patrick.georgi@coresystems.de>2010-04-08 12:59:41 +0000
commit05245ec05b69d2431b8ed78c05b99b1aac95a44b (patch)
treeb6fcd09c00c1b43f7f56414f1268d4395c5bb47d /util
parent35784b62cde8b126cdb1fbb2a7a6d170760bd28d (diff)
downloadcoreboot-05245ec05b69d2431b8ed78c05b99b1aac95a44b.tar.gz
coreboot-05245ec05b69d2431b8ed78c05b99b1aac95a44b.tar.xz
coreboot-05245ec05b69d2431b8ed78c05b99b1aac95a44b.zip
Remove #line statements in processed parser source,
to avoid clutter in revision history. Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de> Acked-by: Patrick Georgi <patrick.georgi@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5377 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'util')
-rw-r--r--util/sconfig/Makefile.inc4
-rw-r--r--util/sconfig/lex.yy.c_shipped40
-rw-r--r--util/sconfig/sconfig.tab.c_shipped28
-rw-r--r--util/sconfig/sconfig.tab.h_shipped4
4 files changed, 3 insertions, 73 deletions
diff --git a/util/sconfig/Makefile.inc b/util/sconfig/Makefile.inc
index 3d876f8f4..c040d3c34 100644
--- a/util/sconfig/Makefile.inc
+++ b/util/sconfig/Makefile.inc
@@ -11,12 +11,12 @@ $(obj)/util/sconfig/%.o: $(obj)/util/sconfig/%.c
ifdef SCONFIG_GENPARSER
$(top)/util/sconfig/lex.yy.c_shipped: $(top)/util/sconfig/sconfig.l
- flex -o $@ $<
+ flex -L -o $@ $<
# the .c rule also creates .h
$(top)/util/sconfig/sconfig.tab.h_shipped: $(top)/util/sconfig/sconfig.tab.c_shipped
$(top)/util/sconfig/sconfig.tab.c_shipped: $(top)/util/sconfig/sconfig.y
- bison --defines=$(top)/util/sconfig/sconfig.tab.h_shipped -o $@ $<
+ bison -l --defines=$(top)/util/sconfig/sconfig.tab.h_shipped -o $@ $<
endif
diff --git a/util/sconfig/lex.yy.c_shipped b/util/sconfig/lex.yy.c_shipped
index c4b53e748..7239b25df 100644
--- a/util/sconfig/lex.yy.c_shipped
+++ b/util/sconfig/lex.yy.c_shipped
@@ -1,6 +1,5 @@
-#line 2 "/home/Patrick/work/coreboot/util/sconfig/lex.yy.c_shipped"
-#line 4 "/home/Patrick/work/coreboot/util/sconfig/lex.yy.c_shipped"
+#line 3 "/home/Patrick/work/coreboot/util/sconfig/lex.yy.c_shipped"
#define YY_INT_ALIGNED short int
@@ -508,8 +507,6 @@ int yy_flex_debug = 0;
#define YY_MORE_ADJ 0
#define YY_RESTORE_YY_MORE_OFFSET
char *yytext;
-#line 1 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
-#line 2 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
/*
* sconfig, coreboot device tree compiler
*
@@ -533,7 +530,6 @@ char *yytext;
#include "sconfig.tab.h"
int linenum = 0;
-#line 537 "/home/Patrick/work/coreboot/util/sconfig/lex.yy.c_shipped"
#define INITIAL 0
@@ -715,10 +711,6 @@ YY_DECL
register char *yy_cp, *yy_bp;
register int yy_act;
-#line 27 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
-
-#line 721 "/home/Patrick/work/coreboot/util/sconfig/lex.yy.c_shipped"
-
if ( !(yy_init) )
{
(yy_init) = 1;
@@ -802,133 +794,107 @@ do_action: /* This label is used only to access EOF actions. */
case 1:
YY_RULE_SETUP
-#line 28 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{}
YY_BREAK
case 2:
/* rule 2 can match eol */
YY_RULE_SETUP
-#line 29 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{linenum++;}
YY_BREAK
case 3:
/* rule 3 can match eol */
YY_RULE_SETUP
-#line 30 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{linenum++;}
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 31 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{return(CHIP);}
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 32 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{return(DEVICE);}
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 33 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{return(REGISTER);}
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 34 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{yylval.number=1; return(BOOL);}
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 35 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{yylval.number=0; return(BOOL);}
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 36 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{yylval.number=PCI; return(BUS);}
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 37 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{yylval.number=PNP; return(BUS);}
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 38 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{yylval.number=I2C; return(BUS);}
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 39 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{yylval.number=APIC; return(BUS);}
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 40 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{yylval.number=APIC_CLUSTER; return(BUS);}
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 41 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{yylval.number=PCI_DOMAIN; return(BUS);}
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 42 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{yylval.number=IRQ; return(RESOURCE);}
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 43 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{yylval.number=DRQ; return(RESOURCE);}
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 44 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{yylval.number=IO; return(RESOURCE);}
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 45 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{return(END);}
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 46 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{return(EQUALS);}
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 47 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(NUMBER);}
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 48 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(NUMBER);}
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 49 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(NUMBER);}
YY_BREAK
case 23:
/* rule 23 can match eol */
YY_RULE_SETUP
-#line 50 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{yylval.string = malloc(yyleng-1); strncpy(yylval.string, yytext+1, yyleng-2); yylval.string[yyleng-2]='\0'; return(STRING);}
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 51 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
{yylval.string = malloc(yyleng+1); strncpy(yylval.string, yytext, yyleng); yylval.string[yyleng]='\0'; return(STRING);}
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 52 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
ECHO;
YY_BREAK
-#line 932 "/home/Patrick/work/coreboot/util/sconfig/lex.yy.c_shipped"
case YY_STATE_EOF(INITIAL):
yyterminate();
@@ -1926,7 +1892,3 @@ void yyfree (void * ptr )
#define YYTABLES_NAME "yytables"
-#line 52 "/home/Patrick/work/coreboot/util/sconfig/sconfig.l"
-
-
-
diff --git a/util/sconfig/sconfig.tab.c_shipped b/util/sconfig/sconfig.tab.c_shipped
index 341421b1d..1572d9d31 100644
--- a/util/sconfig/sconfig.tab.c_shipped
+++ b/util/sconfig/sconfig.tab.c_shipped
@@ -67,8 +67,6 @@
/* Copy the first part of user declarations. */
-/* Line 189 of yacc.c */
-#line 1 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
/*
* sconfig, coreboot device tree compiler
@@ -194,8 +192,6 @@ void yyerror (char const *str)
}
-/* Line 189 of yacc.c */
-#line 199 "/home/Patrick/work/coreboot/util/sconfig/sconfig.tab.c_shipped"
/* Enabling traces. */
#ifndef YYDEBUG
@@ -251,8 +247,6 @@ void yyerror (char const *str)
typedef union YYSTYPE
{
-/* Line 214 of yacc.c */
-#line 125 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
struct device *device;
char *string;
@@ -260,8 +254,6 @@ typedef union YYSTYPE
-/* Line 214 of yacc.c */
-#line 265 "/home/Patrick/work/coreboot/util/sconfig/sconfig.tab.c_shipped"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -272,8 +264,6 @@ typedef union YYSTYPE
/* Copy the second part of user declarations. */
-/* Line 264 of yacc.c */
-#line 277 "/home/Patrick/work/coreboot/util/sconfig/sconfig.tab.c_shipped"
#ifdef short
# undef short
@@ -1476,8 +1466,6 @@ yyreduce:
{
case 2:
-/* Line 1455 of yacc.c */
-#line 132 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
{
root.next_sibling = root.children;
root.next_sibling->next_sibling = root.next_sibling->children;
@@ -1501,8 +1489,6 @@ yyreduce:
case 11:
-/* Line 1455 of yacc.c */
-#line 158 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
{
(yyval.device) = new_dev();
(yyval.device)->chiph_exists = 1;
@@ -1536,8 +1522,6 @@ yyreduce:
case 12:
-/* Line 1455 of yacc.c */
-#line 187 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
{
cur_parent = (yyvsp[(3) - (5)].device)->parent;
@@ -1569,8 +1553,6 @@ yyreduce:
case 13:
-/* Line 1455 of yacc.c */
-#line 215 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
{
(yyval.device) = new_dev();
(yyval.device)->bustype = (yyvsp[(2) - (4)].number);
@@ -1625,8 +1607,6 @@ yyreduce:
case 14:
-/* Line 1455 of yacc.c */
-#line 265 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
{
cur_parent = (yyvsp[(5) - (7)].device)->parent;
cur_bus = (yyvsp[(5) - (7)].device)->bus;
@@ -1659,8 +1639,6 @@ yyreduce:
case 15:
-/* Line 1455 of yacc.c */
-#line 295 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
{
struct resource *r = malloc(sizeof(struct resource));
memset (r, 0, sizeof(struct resource));
@@ -1680,8 +1658,6 @@ yyreduce:
case 16:
-/* Line 1455 of yacc.c */
-#line 313 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
{
struct reg *r = malloc(sizeof(struct reg));
memset (r, 0, sizeof(struct reg));
@@ -1711,8 +1687,6 @@ yyreduce:
-/* Line 1455 of yacc.c */
-#line 1716 "/home/Patrick/work/coreboot/util/sconfig/sconfig.tab.c_shipped"
default: break;
}
YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -1923,8 +1897,6 @@ yyreturn:
-/* Line 1675 of yacc.c */
-#line 340 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
void pass0(FILE *fil, struct device *ptr) {
if ((ptr->type == device) && (ptr->id != 0) && (!ptr->used))
diff --git a/util/sconfig/sconfig.tab.h_shipped b/util/sconfig/sconfig.tab.h_shipped
index 906d1200c..8c6b5f614 100644
--- a/util/sconfig/sconfig.tab.h_shipped
+++ b/util/sconfig/sconfig.tab.h_shipped
@@ -68,8 +68,6 @@
typedef union YYSTYPE
{
-/* Line 1676 of yacc.c */
-#line 125 "/home/Patrick/work/coreboot/util/sconfig/sconfig.y"
struct device *device;
char *string;
@@ -77,8 +75,6 @@ typedef union YYSTYPE
-/* Line 1676 of yacc.c */
-#line 82 "/home/Patrick/work/coreboot/util/sconfig/sconfig.tab.h_shipped"
} YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */