diff options
author | Arnaud Lacombe <lacombar@gmail.com> | 2011-05-23 03:01:31 -0400 |
---|---|---|
committer | Arnaud Lacombe <lacombar@gmail.com> | 2011-06-09 14:04:47 -0400 |
commit | edfc86aadad371b76d95b11d0bc8eb36c2376d1e (patch) | |
tree | 1e6c83e796aee31877380afd6cc8bec6df96cee4 /scripts/dtc | |
parent | 95abef888a3173539c0f12d0c1055e6eb6ffbc89 (diff) |
dtc: regen parser
Cc: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Arnaud Lacombe <lacombar@gmail.com>
Diffstat (limited to 'scripts/dtc')
-rw-r--r-- | scripts/dtc/dtc-lexer.lex.c_shipped | 59 | ||||
-rw-r--r-- | scripts/dtc/dtc-parser.tab.c_shipped | 116 | ||||
-rw-r--r-- | scripts/dtc/dtc-parser.tab.h_shipped | 11 |
3 files changed, 25 insertions, 161 deletions
diff --git a/scripts/dtc/dtc-lexer.lex.c_shipped b/scripts/dtc/dtc-lexer.lex.c_shipped index 50c4420b4b2c..8bbe12817050 100644 --- a/scripts/dtc/dtc-lexer.lex.c_shipped +++ b/scripts/dtc/dtc-lexer.lex.c_shipped | |||
@@ -1,6 +1,5 @@ | |||
1 | #line 2 "dtc-lexer.lex.c" | ||
2 | 1 | ||
3 | #line 4 "dtc-lexer.lex.c" | 2 | #line 3 "scripts/dtc/dtc-lexer.lex.c_shipped" |
4 | 3 | ||
5 | #define YY_INT_ALIGNED short int | 4 | #define YY_INT_ALIGNED short int |
6 | 5 | ||
@@ -54,6 +53,7 @@ typedef int flex_int32_t; | |||
54 | typedef unsigned char flex_uint8_t; | 53 | typedef unsigned char flex_uint8_t; |
55 | typedef unsigned short int flex_uint16_t; | 54 | typedef unsigned short int flex_uint16_t; |
56 | typedef unsigned int flex_uint32_t; | 55 | typedef unsigned int flex_uint32_t; |
56 | #endif /* ! C99 */ | ||
57 | 57 | ||
58 | /* Limits of integral types. */ | 58 | /* Limits of integral types. */ |
59 | #ifndef INT8_MIN | 59 | #ifndef INT8_MIN |
@@ -84,8 +84,6 @@ typedef unsigned int flex_uint32_t; | |||
84 | #define UINT32_MAX (4294967295U) | 84 | #define UINT32_MAX (4294967295U) |
85 | #endif | 85 | #endif |
86 | 86 | ||
87 | #endif /* ! C99 */ | ||
88 | |||
89 | #endif /* ! FLEXINT_H */ | 87 | #endif /* ! FLEXINT_H */ |
90 | 88 | ||
91 | #ifdef __cplusplus | 89 | #ifdef __cplusplus |
@@ -142,15 +140,7 @@ typedef unsigned int flex_uint32_t; | |||
142 | 140 | ||
143 | /* Size of default input buffer. */ | 141 | /* Size of default input buffer. */ |
144 | #ifndef YY_BUF_SIZE | 142 | #ifndef YY_BUF_SIZE |
145 | #ifdef __ia64__ | ||
146 | /* On IA-64, the buffer size is 16k, not 8k. | ||
147 | * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case. | ||
148 | * Ditto for the __ia64__ case accordingly. | ||
149 | */ | ||
150 | #define YY_BUF_SIZE 32768 | ||
151 | #else | ||
152 | #define YY_BUF_SIZE 16384 | 143 | #define YY_BUF_SIZE 16384 |
153 | #endif /* __ia64__ */ | ||
154 | #endif | 144 | #endif |
155 | 145 | ||
156 | /* The state buf must be large enough to hold one state per character in the main buffer. | 146 | /* The state buf must be large enough to hold one state per character in the main buffer. |
@@ -550,7 +540,6 @@ int yy_flex_debug = 0; | |||
550 | #define YY_MORE_ADJ 0 | 540 | #define YY_MORE_ADJ 0 |
551 | #define YY_RESTORE_YY_MORE_OFFSET | 541 | #define YY_RESTORE_YY_MORE_OFFSET |
552 | char *yytext; | 542 | char *yytext; |
553 | #line 1 "dtc-lexer.l" | ||
554 | /* | 543 | /* |
555 | * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation. 2005. | 544 | * (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation. 2005. |
556 | * | 545 | * |
@@ -572,10 +561,6 @@ char *yytext; | |||
572 | */ | 561 | */ |
573 | #define YY_NO_INPUT 1 | 562 | #define YY_NO_INPUT 1 |
574 | 563 | ||
575 | |||
576 | |||
577 | |||
578 | #line 37 "dtc-lexer.l" | ||
579 | #include "dtc.h" | 564 | #include "dtc.h" |
580 | #include "srcpos.h" | 565 | #include "srcpos.h" |
581 | #include "dtc-parser.tab.h" | 566 | #include "dtc-parser.tab.h" |
@@ -603,7 +588,6 @@ static int dts_version = 1; | |||
603 | 588 | ||
604 | static void push_input_file(const char *filename); | 589 | static void push_input_file(const char *filename); |
605 | static int pop_input_file(void); | 590 | static int pop_input_file(void); |
606 | #line 607 "dtc-lexer.lex.c" | ||
607 | 591 | ||
608 | #define INITIAL 0 | 592 | #define INITIAL 0 |
609 | #define INCLUDE 1 | 593 | #define INCLUDE 1 |
@@ -686,12 +670,7 @@ static int input (void ); | |||
686 | 670 | ||
687 | /* Amount of stuff to slurp up with each read. */ | 671 | /* Amount of stuff to slurp up with each read. */ |
688 | #ifndef YY_READ_BUF_SIZE | 672 | #ifndef YY_READ_BUF_SIZE |
689 | #ifdef __ia64__ | ||
690 | /* On IA-64, the buffer size is 16k, not 8k */ | ||
691 | #define YY_READ_BUF_SIZE 16384 | ||
692 | #else | ||
693 | #define YY_READ_BUF_SIZE 8192 | 673 | #define YY_READ_BUF_SIZE 8192 |
694 | #endif /* __ia64__ */ | ||
695 | #endif | 674 | #endif |
696 | 675 | ||
697 | /* Copy whatever the last rule matched to the standard output. */ | 676 | /* Copy whatever the last rule matched to the standard output. */ |
@@ -710,7 +689,7 @@ static int input (void ); | |||
710 | if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ | 689 | if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \ |
711 | { \ | 690 | { \ |
712 | int c = '*'; \ | 691 | int c = '*'; \ |
713 | size_t n; \ | 692 | unsigned n; \ |
714 | for ( n = 0; n < max_size && \ | 693 | for ( n = 0; n < max_size && \ |
715 | (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ | 694 | (c = getc( yyin )) != EOF && c != '\n'; ++n ) \ |
716 | buf[n] = (char) c; \ | 695 | buf[n] = (char) c; \ |
@@ -792,10 +771,6 @@ YY_DECL | |||
792 | register char *yy_cp, *yy_bp; | 771 | register char *yy_cp, *yy_bp; |
793 | register int yy_act; | 772 | register int yy_act; |
794 | 773 | ||
795 | #line 66 "dtc-lexer.l" | ||
796 | |||
797 | #line 798 "dtc-lexer.lex.c" | ||
798 | |||
799 | if ( !(yy_init) ) | 774 | if ( !(yy_init) ) |
800 | { | 775 | { |
801 | (yy_init) = 1; | 776 | (yy_init) = 1; |
@@ -876,7 +851,6 @@ do_action: /* This label is used only to access EOF actions. */ | |||
876 | case 1: | 851 | case 1: |
877 | /* rule 1 can match eol */ | 852 | /* rule 1 can match eol */ |
878 | YY_RULE_SETUP | 853 | YY_RULE_SETUP |
879 | #line 67 "dtc-lexer.l" | ||
880 | { | 854 | { |
881 | char *name = strchr(yytext, '\"') + 1; | 855 | char *name = strchr(yytext, '\"') + 1; |
882 | yytext[yyleng-1] = '\0'; | 856 | yytext[yyleng-1] = '\0'; |
@@ -888,7 +862,6 @@ case YY_STATE_EOF(INCLUDE): | |||
888 | case YY_STATE_EOF(BYTESTRING): | 862 | case YY_STATE_EOF(BYTESTRING): |
889 | case YY_STATE_EOF(PROPNODENAME): | 863 | case YY_STATE_EOF(PROPNODENAME): |
890 | case YY_STATE_EOF(V1): | 864 | case YY_STATE_EOF(V1): |
891 | #line 73 "dtc-lexer.l" | ||
892 | { | 865 | { |
893 | if (!pop_input_file()) { | 866 | if (!pop_input_file()) { |
894 | yyterminate(); | 867 | yyterminate(); |
@@ -898,7 +871,6 @@ case YY_STATE_EOF(V1): | |||
898 | case 2: | 871 | case 2: |
899 | /* rule 2 can match eol */ | 872 | /* rule 2 can match eol */ |
900 | YY_RULE_SETUP | 873 | YY_RULE_SETUP |
901 | #line 79 "dtc-lexer.l" | ||
902 | { | 874 | { |
903 | DPRINT("String: %s\n", yytext); | 875 | DPRINT("String: %s\n", yytext); |
904 | yylval.data = data_copy_escape_string(yytext+1, | 876 | yylval.data = data_copy_escape_string(yytext+1, |
@@ -908,7 +880,6 @@ YY_RULE_SETUP | |||
908 | YY_BREAK | 880 | YY_BREAK |
909 | case 3: | 881 | case 3: |
910 | YY_RULE_SETUP | 882 | YY_RULE_SETUP |
911 | #line 86 "dtc-lexer.l" | ||
912 | { | 883 | { |
913 | DPRINT("Keyword: /dts-v1/\n"); | 884 | DPRINT("Keyword: /dts-v1/\n"); |
914 | dts_version = 1; | 885 | dts_version = 1; |
@@ -918,7 +889,6 @@ YY_RULE_SETUP | |||
918 | YY_BREAK | 889 | YY_BREAK |
919 | case 4: | 890 | case 4: |
920 | YY_RULE_SETUP | 891 | YY_RULE_SETUP |
921 | #line 93 "dtc-lexer.l" | ||
922 | { | 892 | { |
923 | DPRINT("Keyword: /memreserve/\n"); | 893 | DPRINT("Keyword: /memreserve/\n"); |
924 | BEGIN_DEFAULT(); | 894 | BEGIN_DEFAULT(); |
@@ -927,7 +897,6 @@ YY_RULE_SETUP | |||
927 | YY_BREAK | 897 | YY_BREAK |
928 | case 5: | 898 | case 5: |
929 | YY_RULE_SETUP | 899 | YY_RULE_SETUP |
930 | #line 99 "dtc-lexer.l" | ||
931 | { | 900 | { |
932 | DPRINT("Label: %s\n", yytext); | 901 | DPRINT("Label: %s\n", yytext); |
933 | yylval.labelref = xstrdup(yytext); | 902 | yylval.labelref = xstrdup(yytext); |
@@ -937,7 +906,6 @@ YY_RULE_SETUP | |||
937 | YY_BREAK | 906 | YY_BREAK |
938 | case 6: | 907 | case 6: |
939 | YY_RULE_SETUP | 908 | YY_RULE_SETUP |
940 | #line 106 "dtc-lexer.l" | ||
941 | { | 909 | { |
942 | yylval.literal = xstrdup(yytext); | 910 | yylval.literal = xstrdup(yytext); |
943 | DPRINT("Literal: '%s'\n", yylval.literal); | 911 | DPRINT("Literal: '%s'\n", yylval.literal); |
@@ -946,7 +914,6 @@ YY_RULE_SETUP | |||
946 | YY_BREAK | 914 | YY_BREAK |
947 | case 7: | 915 | case 7: |
948 | YY_RULE_SETUP | 916 | YY_RULE_SETUP |
949 | #line 112 "dtc-lexer.l" | ||
950 | { /* label reference */ | 917 | { /* label reference */ |
951 | DPRINT("Ref: %s\n", yytext+1); | 918 | DPRINT("Ref: %s\n", yytext+1); |
952 | yylval.labelref = xstrdup(yytext+1); | 919 | yylval.labelref = xstrdup(yytext+1); |
@@ -955,7 +922,6 @@ YY_RULE_SETUP | |||
955 | YY_BREAK | 922 | YY_BREAK |
956 | case 8: | 923 | case 8: |
957 | YY_RULE_SETUP | 924 | YY_RULE_SETUP |
958 | #line 118 "dtc-lexer.l" | ||
959 | { /* new-style path reference */ | 925 | { /* new-style path reference */ |
960 | yytext[yyleng-1] = '\0'; | 926 | yytext[yyleng-1] = '\0'; |
961 | DPRINT("Ref: %s\n", yytext+2); | 927 | DPRINT("Ref: %s\n", yytext+2); |
@@ -965,7 +931,6 @@ YY_RULE_SETUP | |||
965 | YY_BREAK | 931 | YY_BREAK |
966 | case 9: | 932 | case 9: |
967 | YY_RULE_SETUP | 933 | YY_RULE_SETUP |
968 | #line 125 "dtc-lexer.l" | ||
969 | { | 934 | { |
970 | yylval.byte = strtol(yytext, NULL, 16); | 935 | yylval.byte = strtol(yytext, NULL, 16); |
971 | DPRINT("Byte: %02x\n", (int)yylval.byte); | 936 | DPRINT("Byte: %02x\n", (int)yylval.byte); |
@@ -974,7 +939,6 @@ YY_RULE_SETUP | |||
974 | YY_BREAK | 939 | YY_BREAK |
975 | case 10: | 940 | case 10: |
976 | YY_RULE_SETUP | 941 | YY_RULE_SETUP |
977 | #line 131 "dtc-lexer.l" | ||
978 | { | 942 | { |
979 | DPRINT("/BYTESTRING\n"); | 943 | DPRINT("/BYTESTRING\n"); |
980 | BEGIN_DEFAULT(); | 944 | BEGIN_DEFAULT(); |
@@ -983,7 +947,6 @@ YY_RULE_SETUP | |||
983 | YY_BREAK | 947 | YY_BREAK |
984 | case 11: | 948 | case 11: |
985 | YY_RULE_SETUP | 949 | YY_RULE_SETUP |
986 | #line 137 "dtc-lexer.l" | ||
987 | { | 950 | { |
988 | DPRINT("PropNodeName: %s\n", yytext); | 951 | DPRINT("PropNodeName: %s\n", yytext); |
989 | yylval.propnodename = xstrdup(yytext); | 952 | yylval.propnodename = xstrdup(yytext); |
@@ -993,7 +956,6 @@ YY_RULE_SETUP | |||
993 | YY_BREAK | 956 | YY_BREAK |
994 | case 12: | 957 | case 12: |
995 | YY_RULE_SETUP | 958 | YY_RULE_SETUP |
996 | #line 144 "dtc-lexer.l" | ||
997 | { | 959 | { |
998 | DPRINT("Binary Include\n"); | 960 | DPRINT("Binary Include\n"); |
999 | return DT_INCBIN; | 961 | return DT_INCBIN; |
@@ -1002,24 +964,20 @@ YY_RULE_SETUP | |||
1002 | case 13: | 964 | case 13: |
1003 | /* rule 13 can match eol */ | 965 | /* rule 13 can match eol */ |
1004 | YY_RULE_SETUP | 966 | YY_RULE_SETUP |
1005 | #line 149 "dtc-lexer.l" | ||
1006 | /* eat whitespace */ | 967 | /* eat whitespace */ |
1007 | YY_BREAK | 968 | YY_BREAK |
1008 | case 14: | 969 | case 14: |
1009 | /* rule 14 can match eol */ | 970 | /* rule 14 can match eol */ |
1010 | YY_RULE_SETUP | 971 | YY_RULE_SETUP |
1011 | #line 150 "dtc-lexer.l" | ||
1012 | /* eat C-style comments */ | 972 | /* eat C-style comments */ |
1013 | YY_BREAK | 973 | YY_BREAK |
1014 | case 15: | 974 | case 15: |
1015 | /* rule 15 can match eol */ | 975 | /* rule 15 can match eol */ |
1016 | YY_RULE_SETUP | 976 | YY_RULE_SETUP |
1017 | #line 151 "dtc-lexer.l" | ||
1018 | /* eat C++-style comments */ | 977 | /* eat C++-style comments */ |
1019 | YY_BREAK | 978 | YY_BREAK |
1020 | case 16: | 979 | case 16: |
1021 | YY_RULE_SETUP | 980 | YY_RULE_SETUP |
1022 | #line 153 "dtc-lexer.l" | ||
1023 | { | 981 | { |
1024 | DPRINT("Char: %c (\\x%02x)\n", yytext[0], | 982 | DPRINT("Char: %c (\\x%02x)\n", yytext[0], |
1025 | (unsigned)yytext[0]); | 983 | (unsigned)yytext[0]); |
@@ -1037,10 +995,8 @@ YY_RULE_SETUP | |||
1037 | YY_BREAK | 995 | YY_BREAK |
1038 | case 17: | 996 | case 17: |
1039 | YY_RULE_SETUP | 997 | YY_RULE_SETUP |
1040 | #line 168 "dtc-lexer.l" | ||
1041 | ECHO; | 998 | ECHO; |
1042 | YY_BREAK | 999 | YY_BREAK |
1043 | #line 1044 "dtc-lexer.lex.c" | ||
1044 | 1000 | ||
1045 | case YY_END_OF_BUFFER: | 1001 | case YY_END_OF_BUFFER: |
1046 | { | 1002 | { |
@@ -1756,8 +1712,8 @@ YY_BUFFER_STATE yy_scan_string (yyconst char * yystr ) | |||
1756 | 1712 | ||
1757 | /** Setup the input buffer state to scan the given bytes. The next call to yylex() will | 1713 | /** Setup the input buffer state to scan the given bytes. The next call to yylex() will |
1758 | * scan from a @e copy of @a bytes. | 1714 | * scan from a @e copy of @a bytes. |
1759 | * @param yybytes the byte buffer to scan | 1715 | * @param bytes the byte buffer to scan |
1760 | * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes. | 1716 | * @param len the number of bytes in the buffer pointed to by @a bytes. |
1761 | * | 1717 | * |
1762 | * @return the newly allocated buffer state object. | 1718 | * @return the newly allocated buffer state object. |
1763 | */ | 1719 | */ |
@@ -1996,10 +1952,6 @@ void yyfree (void * ptr ) | |||
1996 | 1952 | ||
1997 | #define YYTABLES_NAME "yytables" | 1953 | #define YYTABLES_NAME "yytables" |
1998 | 1954 | ||
1999 | #line 168 "dtc-lexer.l" | ||
2000 | |||
2001 | |||
2002 | |||
2003 | static void push_input_file(const char *filename) | 1955 | static void push_input_file(const char *filename) |
2004 | { | 1956 | { |
2005 | assert(filename); | 1957 | assert(filename); |
@@ -2011,7 +1963,6 @@ static void push_input_file(const char *filename) | |||
2011 | yypush_buffer_state(yy_create_buffer(yyin,YY_BUF_SIZE)); | 1963 | yypush_buffer_state(yy_create_buffer(yyin,YY_BUF_SIZE)); |
2012 | } | 1964 | } |
2013 | 1965 | ||
2014 | |||
2015 | static int pop_input_file(void) | 1966 | static int pop_input_file(void) |
2016 | { | 1967 | { |
2017 | if (srcfile_pop() == 0) | 1968 | if (srcfile_pop() == 0) |
diff --git a/scripts/dtc/dtc-parser.tab.c_shipped b/scripts/dtc/dtc-parser.tab.c_shipped index 9be2eea18a30..b05921e1e848 100644 --- a/scripts/dtc/dtc-parser.tab.c_shipped +++ b/scripts/dtc/dtc-parser.tab.c_shipped | |||
@@ -1,10 +1,9 @@ | |||
1 | 1 | /* A Bison parser, made by GNU Bison 2.4.3. */ | |
2 | /* A Bison parser, made by GNU Bison 2.4.1. */ | ||
3 | 2 | ||
4 | /* Skeleton implementation for Bison's Yacc-like parsers in C | 3 | /* Skeleton implementation for Bison's Yacc-like parsers in C |
5 | 4 | ||
6 | Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 | 5 | Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, |
7 | Free Software Foundation, Inc. | 6 | 2009, 2010 Free Software Foundation, Inc. |
8 | 7 | ||
9 | This program is free software: you can redistribute it and/or modify | 8 | This program is free software: you can redistribute it and/or modify |
10 | it under the terms of the GNU General Public License as published by | 9 | it under the terms of the GNU General Public License as published by |
@@ -46,7 +45,7 @@ | |||
46 | #define YYBISON 1 | 45 | #define YYBISON 1 |
47 | 46 | ||
48 | /* Bison version. */ | 47 | /* Bison version. */ |
49 | #define YYBISON_VERSION "2.4.1" | 48 | #define YYBISON_VERSION "2.4.3" |
50 | 49 | ||
51 | /* Skeleton name. */ | 50 | /* Skeleton name. */ |
52 | #define YYSKELETON_NAME "yacc.c" | 51 | #define YYSKELETON_NAME "yacc.c" |
@@ -67,8 +66,6 @@ | |||
67 | 66 | ||
68 | /* Copy the first part of user declarations. */ | 67 | /* Copy the first part of user declarations. */ |
69 | 68 | ||
70 | /* Line 189 of yacc.c */ | ||
71 | #line 21 "dtc-parser.y" | ||
72 | 69 | ||
73 | #include <stdio.h> | 70 | #include <stdio.h> |
74 | 71 | ||
@@ -87,12 +84,10 @@ extern int treesource_error; | |||
87 | static unsigned long long eval_literal(const char *s, int base, int bits); | 84 | static unsigned long long eval_literal(const char *s, int base, int bits); |
88 | 85 | ||
89 | 86 | ||
90 | /* Line 189 of yacc.c */ | ||
91 | #line 92 "dtc-parser.tab.c" | ||
92 | 87 | ||
93 | /* Enabling traces. */ | 88 | /* Enabling traces. */ |
94 | #ifndef YYDEBUG | 89 | #ifndef YYDEBUG |
95 | # define YYDEBUG 0 | 90 | # define YYDEBUG 1 |
96 | #endif | 91 | #endif |
97 | 92 | ||
98 | /* Enabling verbose error messages. */ | 93 | /* Enabling verbose error messages. */ |
@@ -134,8 +129,6 @@ static unsigned long long eval_literal(const char *s, int base, int bits); | |||
134 | typedef union YYSTYPE | 129 | typedef union YYSTYPE |
135 | { | 130 | { |
136 | 131 | ||
137 | /* Line 214 of yacc.c */ | ||
138 | #line 39 "dtc-parser.y" | ||
139 | 132 | ||
140 | char *propnodename; | 133 | char *propnodename; |
141 | char *literal; | 134 | char *literal; |
@@ -154,8 +147,6 @@ typedef union YYSTYPE | |||
154 | 147 | ||
155 | 148 | ||
156 | 149 | ||
157 | /* Line 214 of yacc.c */ | ||
158 | #line 159 "dtc-parser.tab.c" | ||
159 | } YYSTYPE; | 150 | } YYSTYPE; |
160 | # define YYSTYPE_IS_TRIVIAL 1 | 151 | # define YYSTYPE_IS_TRIVIAL 1 |
161 | # define yystype YYSTYPE /* obsolescent; will be withdrawn */ | 152 | # define yystype YYSTYPE /* obsolescent; will be withdrawn */ |
@@ -166,8 +157,6 @@ typedef union YYSTYPE | |||
166 | /* Copy the second part of user declarations. */ | 157 | /* Copy the second part of user declarations. */ |
167 | 158 | ||
168 | 159 | ||
169 | /* Line 264 of yacc.c */ | ||
170 | #line 171 "dtc-parser.tab.c" | ||
171 | 160 | ||
172 | #ifdef short | 161 | #ifdef short |
173 | # undef short | 162 | # undef short |
@@ -217,7 +206,7 @@ typedef short int yytype_int16; | |||
217 | #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) | 206 | #define YYSIZE_MAXIMUM ((YYSIZE_T) -1) |
218 | 207 | ||
219 | #ifndef YY_ | 208 | #ifndef YY_ |
220 | # if YYENABLE_NLS | 209 | # if defined YYENABLE_NLS && YYENABLE_NLS |
221 | # if ENABLE_NLS | 210 | # if ENABLE_NLS |
222 | # include <libintl.h> /* INFRINGES ON USER NAME SPACE */ | 211 | # include <libintl.h> /* INFRINGES ON USER NAME SPACE */ |
223 | # define YY_(msgid) dgettext ("bison-runtime", msgid) | 212 | # define YY_(msgid) dgettext ("bison-runtime", msgid) |
@@ -607,9 +596,18 @@ static const yytype_uint8 yystos[] = | |||
607 | 596 | ||
608 | /* Like YYERROR except do call yyerror. This remains here temporarily | 597 | /* Like YYERROR except do call yyerror. This remains here temporarily |
609 | to ease the transition to the new meaning of YYERROR, for GCC. | 598 | to ease the transition to the new meaning of YYERROR, for GCC. |
610 | Once GCC version 2 has supplanted version 1, this can go. */ | 599 | Once GCC version 2 has supplanted version 1, this can go. However, |
600 | YYFAIL appears to be in use. Nevertheless, it is formally deprecated | ||
601 | in Bison 2.4.2's NEWS entry, where a plan to phase it out is | ||
602 | discussed. */ | ||
611 | 603 | ||
612 | #define YYFAIL goto yyerrlab | 604 | #define YYFAIL goto yyerrlab |
605 | #if defined YYFAIL | ||
606 | /* This is here to suppress warnings from the GCC cpp's | ||
607 | -Wunused-macros. Normally we don't worry about that warning, but | ||
608 | some users do, and we want to make it easy for users to remove | ||
609 | YYFAIL uses, which will produce warnings from Bison 2.5. */ | ||
610 | #endif | ||
613 | 611 | ||
614 | #define YYRECOVERING() (!!yyerrstatus) | 612 | #define YYRECOVERING() (!!yyerrstatus) |
615 | 613 | ||
@@ -666,7 +664,7 @@ while (YYID (0)) | |||
666 | we won't break user code: when these are the locations we know. */ | 664 | we won't break user code: when these are the locations we know. */ |
667 | 665 | ||
668 | #ifndef YY_LOCATION_PRINT | 666 | #ifndef YY_LOCATION_PRINT |
669 | # if YYLTYPE_IS_TRIVIAL | 667 | # if defined YYLTYPE_IS_TRIVIAL && YYLTYPE_IS_TRIVIAL |
670 | # define YY_LOCATION_PRINT(File, Loc) \ | 668 | # define YY_LOCATION_PRINT(File, Loc) \ |
671 | fprintf (File, "%d.%d-%d.%d", \ | 669 | fprintf (File, "%d.%d-%d.%d", \ |
672 | (Loc).first_line, (Loc).first_column, \ | 670 | (Loc).first_line, (Loc).first_column, \ |
@@ -1405,8 +1403,6 @@ yyreduce: | |||
1405 | { | 1403 | { |
1406 | case 2: | 1404 | case 2: |
1407 | 1405 | ||
1408 | /* Line 1455 of yacc.c */ | ||
1409 | #line 87 "dtc-parser.y" | ||
1410 | { | 1406 | { |
1411 | the_boot_info = build_boot_info((yyvsp[(3) - (4)].re), (yyvsp[(4) - (4)].node), | 1407 | the_boot_info = build_boot_info((yyvsp[(3) - (4)].re), (yyvsp[(4) - (4)].node), |
1412 | guess_boot_cpuid((yyvsp[(4) - (4)].node))); | 1408 | guess_boot_cpuid((yyvsp[(4) - (4)].node))); |
@@ -1415,8 +1411,6 @@ yyreduce: | |||
1415 | 1411 | ||
1416 | case 3: | 1412 | case 3: |
1417 | 1413 | ||
1418 | /* Line 1455 of yacc.c */ | ||
1419 | #line 95 "dtc-parser.y" | ||
1420 | { | 1414 | { |
1421 | (yyval.re) = NULL; | 1415 | (yyval.re) = NULL; |
1422 | ;} | 1416 | ;} |
@@ -1424,8 +1418,6 @@ yyreduce: | |||
1424 | 1418 | ||
1425 | case 4: | 1419 | case 4: |
1426 | 1420 | ||
1427 | /* Line 1455 of yacc.c */ | ||
1428 | #line 99 "dtc-parser.y" | ||
1429 | { | 1421 | { |
1430 | (yyval.re) = chain_reserve_entry((yyvsp[(1) - (2)].re), (yyvsp[(2) - (2)].re)); | 1422 | (yyval.re) = chain_reserve_entry((yyvsp[(1) - (2)].re), (yyvsp[(2) - (2)].re)); |
1431 | ;} | 1423 | ;} |
@@ -1433,8 +1425,6 @@ yyreduce: | |||
1433 | 1425 | ||
1434 | case 5: | 1426 | case 5: |
1435 | 1427 | ||
1436 | /* Line 1455 of yacc.c */ | ||
1437 | #line 106 "dtc-parser.y" | ||
1438 | { | 1428 | { |
1439 | (yyval.re) = build_reserve_entry((yyvsp[(2) - (4)].addr), (yyvsp[(3) - (4)].addr)); | 1429 | (yyval.re) = build_reserve_entry((yyvsp[(2) - (4)].addr), (yyvsp[(3) - (4)].addr)); |
1440 | ;} | 1430 | ;} |
@@ -1442,8 +1432,6 @@ yyreduce: | |||
1442 | 1432 | ||
1443 | case 6: | 1433 | case 6: |
1444 | 1434 | ||
1445 | /* Line 1455 of yacc.c */ | ||
1446 | #line 110 "dtc-parser.y" | ||
1447 | { | 1435 | { |
1448 | add_label(&(yyvsp[(2) - (2)].re)->labels, (yyvsp[(1) - (2)].labelref)); | 1436 | add_label(&(yyvsp[(2) - (2)].re)->labels, (yyvsp[(1) - (2)].labelref)); |
1449 | (yyval.re) = (yyvsp[(2) - (2)].re); | 1437 | (yyval.re) = (yyvsp[(2) - (2)].re); |
@@ -1452,8 +1440,6 @@ yyreduce: | |||
1452 | 1440 | ||
1453 | case 7: | 1441 | case 7: |
1454 | 1442 | ||
1455 | /* Line 1455 of yacc.c */ | ||
1456 | #line 118 "dtc-parser.y" | ||
1457 | { | 1443 | { |
1458 | (yyval.addr) = eval_literal((yyvsp[(1) - (1)].literal), 0, 64); | 1444 | (yyval.addr) = eval_literal((yyvsp[(1) - (1)].literal), 0, 64); |
1459 | ;} | 1445 | ;} |
@@ -1461,8 +1447,6 @@ yyreduce: | |||
1461 | 1447 | ||
1462 | case 8: | 1448 | case 8: |
1463 | 1449 | ||
1464 | /* Line 1455 of yacc.c */ | ||
1465 | #line 125 "dtc-parser.y" | ||
1466 | { | 1450 | { |
1467 | (yyval.node) = name_node((yyvsp[(2) - (2)].node), ""); | 1451 | (yyval.node) = name_node((yyvsp[(2) - (2)].node), ""); |
1468 | ;} | 1452 | ;} |
@@ -1470,8 +1454,6 @@ yyreduce: | |||
1470 | 1454 | ||
1471 | case 9: | 1455 | case 9: |
1472 | 1456 | ||
1473 | /* Line 1455 of yacc.c */ | ||
1474 | #line 129 "dtc-parser.y" | ||
1475 | { | 1457 | { |
1476 | (yyval.node) = merge_nodes((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); | 1458 | (yyval.node) = merge_nodes((yyvsp[(1) - (3)].node), (yyvsp[(3) - (3)].node)); |
1477 | ;} | 1459 | ;} |
@@ -1479,8 +1461,6 @@ yyreduce: | |||
1479 | 1461 | ||
1480 | case 10: | 1462 | case 10: |
1481 | 1463 | ||
1482 | /* Line 1455 of yacc.c */ | ||
1483 | #line 133 "dtc-parser.y" | ||
1484 | { | 1464 | { |
1485 | struct node *target = get_node_by_ref((yyvsp[(1) - (3)].node), (yyvsp[(2) - (3)].labelref)); | 1465 | struct node *target = get_node_by_ref((yyvsp[(1) - (3)].node), (yyvsp[(2) - (3)].labelref)); |
1486 | 1466 | ||
@@ -1494,8 +1474,6 @@ yyreduce: | |||
1494 | 1474 | ||
1495 | case 11: | 1475 | case 11: |
1496 | 1476 | ||
1497 | /* Line 1455 of yacc.c */ | ||
1498 | #line 146 "dtc-parser.y" | ||
1499 | { | 1477 | { |
1500 | (yyval.node) = build_node((yyvsp[(2) - (5)].proplist), (yyvsp[(3) - (5)].nodelist)); | 1478 | (yyval.node) = build_node((yyvsp[(2) - (5)].proplist), (yyvsp[(3) - (5)].nodelist)); |
1501 | ;} | 1479 | ;} |
@@ -1503,8 +1481,6 @@ yyreduce: | |||
1503 | 1481 | ||
1504 | case 12: | 1482 | case 12: |
1505 | 1483 | ||
1506 | /* Line 1455 of yacc.c */ | ||
1507 | #line 153 "dtc-parser.y" | ||
1508 | { | 1484 | { |
1509 | (yyval.proplist) = NULL; | 1485 | (yyval.proplist) = NULL; |
1510 | ;} | 1486 | ;} |
@@ -1512,8 +1488,6 @@ yyreduce: | |||
1512 | 1488 | ||
1513 | case 13: | 1489 | case 13: |
1514 | 1490 | ||
1515 | /* Line 1455 of yacc.c */ | ||
1516 | #line 157 "dtc-parser.y" | ||
1517 | { | 1491 | { |
1518 | (yyval.proplist) = chain_property((yyvsp[(2) - (2)].prop), (yyvsp[(1) - (2)].proplist)); | 1492 | (yyval.proplist) = chain_property((yyvsp[(2) - (2)].prop), (yyvsp[(1) - (2)].proplist)); |
1519 | ;} | 1493 | ;} |
@@ -1521,8 +1495,6 @@ yyreduce: | |||
1521 | 1495 | ||
1522 | case 14: | 1496 | case 14: |
1523 | 1497 | ||
1524 | /* Line 1455 of yacc.c */ | ||
1525 | #line 164 "dtc-parser.y" | ||
1526 | { | 1498 | { |
1527 | (yyval.prop) = build_property((yyvsp[(1) - (4)].propnodename), (yyvsp[(3) - (4)].data)); | 1499 | (yyval.prop) = build_property((yyvsp[(1) - (4)].propnodename), (yyvsp[(3) - (4)].data)); |
1528 | ;} | 1500 | ;} |
@@ -1530,8 +1502,6 @@ yyreduce: | |||
1530 | 1502 | ||
1531 | case 15: | 1503 | case 15: |
1532 | 1504 | ||
1533 | /* Line 1455 of yacc.c */ | ||
1534 | #line 168 "dtc-parser.y" | ||
1535 | { | 1505 | { |
1536 | (yyval.prop) = build_property((yyvsp[(1) - (2)].propnodename), empty_data); | 1506 | (yyval.prop) = build_property((yyvsp[(1) - (2)].propnodename), empty_data); |
1537 | ;} | 1507 | ;} |
@@ -1539,8 +1509,6 @@ yyreduce: | |||
1539 | 1509 | ||
1540 | case 16: | 1510 | case 16: |
1541 | 1511 | ||
1542 | /* Line 1455 of yacc.c */ | ||
1543 | #line 172 "dtc-parser.y" | ||
1544 | { | 1512 | { |
1545 | add_label(&(yyvsp[(2) - (2)].prop)->labels, (yyvsp[(1) - (2)].labelref)); | 1513 | add_label(&(yyvsp[(2) - (2)].prop)->labels, (yyvsp[(1) - (2)].labelref)); |
1546 | (yyval.prop) = (yyvsp[(2) - (2)].prop); | 1514 | (yyval.prop) = (yyvsp[(2) - (2)].prop); |
@@ -1549,8 +1517,6 @@ yyreduce: | |||
1549 | 1517 | ||
1550 | case 17: | 1518 | case 17: |
1551 | 1519 | ||
1552 | /* Line 1455 of yacc.c */ | ||
1553 | #line 180 "dtc-parser.y" | ||
1554 | { | 1520 | { |
1555 | (yyval.data) = data_merge((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].data)); | 1521 | (yyval.data) = data_merge((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].data)); |
1556 | ;} | 1522 | ;} |
@@ -1558,8 +1524,6 @@ yyreduce: | |||
1558 | 1524 | ||
1559 | case 18: | 1525 | case 18: |
1560 | 1526 | ||
1561 | /* Line 1455 of yacc.c */ | ||
1562 | #line 184 "dtc-parser.y" | ||
1563 | { | 1527 | { |
1564 | (yyval.data) = data_merge((yyvsp[(1) - (4)].data), (yyvsp[(3) - (4)].data)); | 1528 | (yyval.data) = data_merge((yyvsp[(1) - (4)].data), (yyvsp[(3) - (4)].data)); |
1565 | ;} | 1529 | ;} |
@@ -1567,8 +1531,6 @@ yyreduce: | |||
1567 | 1531 | ||
1568 | case 19: | 1532 | case 19: |
1569 | 1533 | ||
1570 | /* Line 1455 of yacc.c */ | ||
1571 | #line 188 "dtc-parser.y" | ||
1572 | { | 1534 | { |
1573 | (yyval.data) = data_merge((yyvsp[(1) - (4)].data), (yyvsp[(3) - (4)].data)); | 1535 | (yyval.data) = data_merge((yyvsp[(1) - (4)].data), (yyvsp[(3) - (4)].data)); |
1574 | ;} | 1536 | ;} |
@@ -1576,8 +1538,6 @@ yyreduce: | |||
1576 | 1538 | ||
1577 | case 20: | 1539 | case 20: |
1578 | 1540 | ||
1579 | /* Line 1455 of yacc.c */ | ||
1580 | #line 192 "dtc-parser.y" | ||
1581 | { | 1541 | { |
1582 | (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), REF_PATH, (yyvsp[(2) - (2)].labelref)); | 1542 | (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), REF_PATH, (yyvsp[(2) - (2)].labelref)); |
1583 | ;} | 1543 | ;} |
@@ -1585,8 +1545,6 @@ yyreduce: | |||
1585 | 1545 | ||
1586 | case 21: | 1546 | case 21: |
1587 | 1547 | ||
1588 | /* Line 1455 of yacc.c */ | ||
1589 | #line 196 "dtc-parser.y" | ||
1590 | { | 1548 | { |
1591 | FILE *f = srcfile_relative_open((yyvsp[(4) - (9)].data).val, NULL); | 1549 | FILE *f = srcfile_relative_open((yyvsp[(4) - (9)].data).val, NULL); |
1592 | struct data d; | 1550 | struct data d; |
@@ -1607,8 +1565,6 @@ yyreduce: | |||
1607 | 1565 | ||
1608 | case 22: | 1566 | case 22: |
1609 | 1567 | ||
1610 | /* Line 1455 of yacc.c */ | ||
1611 | #line 213 "dtc-parser.y" | ||
1612 | { | 1568 | { |
1613 | FILE *f = srcfile_relative_open((yyvsp[(4) - (5)].data).val, NULL); | 1569 | FILE *f = srcfile_relative_open((yyvsp[(4) - (5)].data).val, NULL); |
1614 | struct data d = empty_data; | 1570 | struct data d = empty_data; |
@@ -1622,8 +1578,6 @@ yyreduce: | |||
1622 | 1578 | ||
1623 | case 23: | 1579 | case 23: |
1624 | 1580 | ||
1625 | /* Line 1455 of yacc.c */ | ||
1626 | #line 223 "dtc-parser.y" | ||
1627 | { | 1581 | { |
1628 | (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref)); | 1582 | (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref)); |
1629 | ;} | 1583 | ;} |
@@ -1631,8 +1585,6 @@ yyreduce: | |||
1631 | 1585 | ||
1632 | case 24: | 1586 | case 24: |
1633 | 1587 | ||
1634 | /* Line 1455 of yacc.c */ | ||
1635 | #line 230 "dtc-parser.y" | ||
1636 | { | 1588 | { |
1637 | (yyval.data) = empty_data; | 1589 | (yyval.data) = empty_data; |
1638 | ;} | 1590 | ;} |
@@ -1640,8 +1592,6 @@ yyreduce: | |||
1640 | 1592 | ||
1641 | case 25: | 1593 | case 25: |
1642 | 1594 | ||
1643 | /* Line 1455 of yacc.c */ | ||
1644 | #line 234 "dtc-parser.y" | ||
1645 | { | 1595 | { |
1646 | (yyval.data) = (yyvsp[(1) - (2)].data); | 1596 | (yyval.data) = (yyvsp[(1) - (2)].data); |
1647 | ;} | 1597 | ;} |
@@ -1649,8 +1599,6 @@ yyreduce: | |||
1649 | 1599 | ||
1650 | case 26: | 1600 | case 26: |
1651 | 1601 | ||
1652 | /* Line 1455 of yacc.c */ | ||
1653 | #line 238 "dtc-parser.y" | ||
1654 | { | 1602 | { |
1655 | (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref)); | 1603 | (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref)); |
1656 | ;} | 1604 | ;} |
@@ -1658,8 +1606,6 @@ yyreduce: | |||
1658 | 1606 | ||
1659 | case 27: | 1607 | case 27: |
1660 | 1608 | ||
1661 | /* Line 1455 of yacc.c */ | ||
1662 | #line 245 "dtc-parser.y" | ||
1663 | { | 1609 | { |
1664 | (yyval.data) = empty_data; | 1610 | (yyval.data) = empty_data; |
1665 | ;} | 1611 | ;} |
@@ -1667,8 +1613,6 @@ yyreduce: | |||
1667 | 1613 | ||
1668 | case 28: | 1614 | case 28: |
1669 | 1615 | ||
1670 | /* Line 1455 of yacc.c */ | ||
1671 | #line 249 "dtc-parser.y" | ||
1672 | { | 1616 | { |
1673 | (yyval.data) = data_append_cell((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].cell)); | 1617 | (yyval.data) = data_append_cell((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].cell)); |
1674 | ;} | 1618 | ;} |
@@ -1676,8 +1620,6 @@ yyreduce: | |||
1676 | 1620 | ||
1677 | case 29: | 1621 | case 29: |
1678 | 1622 | ||
1679 | /* Line 1455 of yacc.c */ | ||
1680 | #line 253 "dtc-parser.y" | ||
1681 | { | 1623 | { |
1682 | (yyval.data) = data_append_cell(data_add_marker((yyvsp[(1) - (2)].data), REF_PHANDLE, | 1624 | (yyval.data) = data_append_cell(data_add_marker((yyvsp[(1) - (2)].data), REF_PHANDLE, |
1683 | (yyvsp[(2) - (2)].labelref)), -1); | 1625 | (yyvsp[(2) - (2)].labelref)), -1); |
@@ -1686,8 +1628,6 @@ yyreduce: | |||
1686 | 1628 | ||
1687 | case 30: | 1629 | case 30: |
1688 | 1630 | ||
1689 | /* Line 1455 of yacc.c */ | ||
1690 | #line 258 "dtc-parser.y" | ||
1691 | { | 1631 | { |
1692 | (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref)); | 1632 | (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref)); |
1693 | ;} | 1633 | ;} |
@@ -1695,8 +1635,6 @@ yyreduce: | |||
1695 | 1635 | ||
1696 | case 31: | 1636 | case 31: |
1697 | 1637 | ||
1698 | /* Line 1455 of yacc.c */ | ||
1699 | #line 265 "dtc-parser.y" | ||
1700 | { | 1638 | { |
1701 | (yyval.cell) = eval_literal((yyvsp[(1) - (1)].literal), 0, 32); | 1639 | (yyval.cell) = eval_literal((yyvsp[(1) - (1)].literal), 0, 32); |
1702 | ;} | 1640 | ;} |
@@ -1704,8 +1642,6 @@ yyreduce: | |||
1704 | 1642 | ||
1705 | case 32: | 1643 | case 32: |
1706 | 1644 | ||
1707 | /* Line 1455 of yacc.c */ | ||
1708 | #line 272 "dtc-parser.y" | ||
1709 | { | 1645 | { |
1710 | (yyval.data) = empty_data; | 1646 | (yyval.data) = empty_data; |
1711 | ;} | 1647 | ;} |
@@ -1713,8 +1649,6 @@ yyreduce: | |||
1713 | 1649 | ||
1714 | case 33: | 1650 | case 33: |
1715 | 1651 | ||
1716 | /* Line 1455 of yacc.c */ | ||
1717 | #line 276 "dtc-parser.y" | ||
1718 | { | 1652 | { |
1719 | (yyval.data) = data_append_byte((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].byte)); | 1653 | (yyval.data) = data_append_byte((yyvsp[(1) - (2)].data), (yyvsp[(2) - (2)].byte)); |
1720 | ;} | 1654 | ;} |
@@ -1722,8 +1656,6 @@ yyreduce: | |||
1722 | 1656 | ||
1723 | case 34: | 1657 | case 34: |
1724 | 1658 | ||
1725 | /* Line 1455 of yacc.c */ | ||
1726 | #line 280 "dtc-parser.y" | ||
1727 | { | 1659 | { |
1728 | (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref)); | 1660 | (yyval.data) = data_add_marker((yyvsp[(1) - (2)].data), LABEL, (yyvsp[(2) - (2)].labelref)); |
1729 | ;} | 1661 | ;} |
@@ -1731,8 +1663,6 @@ yyreduce: | |||
1731 | 1663 | ||
1732 | case 35: | 1664 | case 35: |
1733 | 1665 | ||
1734 | /* Line 1455 of yacc.c */ | ||
1735 | #line 287 "dtc-parser.y" | ||
1736 | { | 1666 | { |
1737 | (yyval.nodelist) = NULL; | 1667 | (yyval.nodelist) = NULL; |
1738 | ;} | 1668 | ;} |
@@ -1740,8 +1670,6 @@ yyreduce: | |||
1740 | 1670 | ||
1741 | case 36: | 1671 | case 36: |
1742 | 1672 | ||
1743 | /* Line 1455 of yacc.c */ | ||
1744 | #line 291 "dtc-parser.y" | ||
1745 | { | 1673 | { |
1746 | (yyval.nodelist) = chain_node((yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].nodelist)); | 1674 | (yyval.nodelist) = chain_node((yyvsp[(1) - (2)].node), (yyvsp[(2) - (2)].nodelist)); |
1747 | ;} | 1675 | ;} |
@@ -1749,8 +1677,6 @@ yyreduce: | |||
1749 | 1677 | ||
1750 | case 37: | 1678 | case 37: |
1751 | 1679 | ||
1752 | /* Line 1455 of yacc.c */ | ||
1753 | #line 295 "dtc-parser.y" | ||
1754 | { | 1680 | { |
1755 | print_error("syntax error: properties must precede subnodes"); | 1681 | print_error("syntax error: properties must precede subnodes"); |
1756 | YYERROR; | 1682 | YYERROR; |
@@ -1759,8 +1685,6 @@ yyreduce: | |||
1759 | 1685 | ||
1760 | case 38: | 1686 | case 38: |
1761 | 1687 | ||
1762 | /* Line 1455 of yacc.c */ | ||
1763 | #line 303 "dtc-parser.y" | ||
1764 | { | 1688 | { |
1765 | (yyval.node) = name_node((yyvsp[(2) - (2)].node), (yyvsp[(1) - (2)].propnodename)); | 1689 | (yyval.node) = name_node((yyvsp[(2) - (2)].node), (yyvsp[(1) - (2)].propnodename)); |
1766 | ;} | 1690 | ;} |
@@ -1768,8 +1692,6 @@ yyreduce: | |||
1768 | 1692 | ||
1769 | case 39: | 1693 | case 39: |
1770 | 1694 | ||
1771 | /* Line 1455 of yacc.c */ | ||
1772 | #line 307 "dtc-parser.y" | ||
1773 | { | 1695 | { |
1774 | add_label(&(yyvsp[(2) - (2)].node)->labels, (yyvsp[(1) - (2)].labelref)); | 1696 | add_label(&(yyvsp[(2) - (2)].node)->labels, (yyvsp[(1) - (2)].labelref)); |
1775 | (yyval.node) = (yyvsp[(2) - (2)].node); | 1697 | (yyval.node) = (yyvsp[(2) - (2)].node); |
@@ -1778,8 +1700,6 @@ yyreduce: | |||
1778 | 1700 | ||
1779 | 1701 | ||
1780 | 1702 | ||
1781 | /* Line 1455 of yacc.c */ | ||
1782 | #line 1783 "dtc-parser.tab.c" | ||
1783 | default: break; | 1703 | default: break; |
1784 | } | 1704 | } |
1785 | YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); | 1705 | YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc); |
@@ -1990,8 +1910,6 @@ yyreturn: | |||
1990 | 1910 | ||
1991 | 1911 | ||
1992 | 1912 | ||
1993 | /* Line 1675 of yacc.c */ | ||
1994 | #line 313 "dtc-parser.y" | ||
1995 | 1913 | ||
1996 | 1914 | ||
1997 | void print_error(char const *fmt, ...) | 1915 | void print_error(char const *fmt, ...) |
diff --git a/scripts/dtc/dtc-parser.tab.h_shipped b/scripts/dtc/dtc-parser.tab.h_shipped index 95c9547adea5..4ee682bb7d33 100644 --- a/scripts/dtc/dtc-parser.tab.h_shipped +++ b/scripts/dtc/dtc-parser.tab.h_shipped | |||
@@ -1,10 +1,9 @@ | |||
1 | 1 | /* A Bison parser, made by GNU Bison 2.4.3. */ | |
2 | /* A Bison parser, made by GNU Bison 2.4.1. */ | ||
3 | 2 | ||
4 | /* Skeleton interface for Bison's Yacc-like parsers in C | 3 | /* Skeleton interface for Bison's Yacc-like parsers in C |
5 | 4 | ||
6 | Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006 | 5 | Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006, |
7 | Free Software Foundation, Inc. | 6 | 2009, 2010 Free Software Foundation, Inc. |
8 | 7 | ||
9 | This program is free software: you can redistribute it and/or modify | 8 | This program is free software: you can redistribute it and/or modify |
10 | it under the terms of the GNU General Public License as published by | 9 | it under the terms of the GNU General Public License as published by |
@@ -58,8 +57,6 @@ | |||
58 | typedef union YYSTYPE | 57 | typedef union YYSTYPE |
59 | { | 58 | { |
60 | 59 | ||
61 | /* Line 1676 of yacc.c */ | ||
62 | #line 39 "dtc-parser.y" | ||
63 | 60 | ||
64 | char *propnodename; | 61 | char *propnodename; |
65 | char *literal; | 62 | char *literal; |
@@ -78,8 +75,6 @@ typedef union YYSTYPE | |||
78 | 75 | ||
79 | 76 | ||
80 | 77 | ||
81 | /* Line 1676 of yacc.c */ | ||
82 | #line 83 "dtc-parser.tab.h" | ||
83 | } YYSTYPE; | 78 | } YYSTYPE; |
84 | # define YYSTYPE_IS_TRIVIAL 1 | 79 | # define YYSTYPE_IS_TRIVIAL 1 |
85 | # define yystype YYSTYPE /* obsolescent; will be withdrawn */ | 80 | # define yystype YYSTYPE /* obsolescent; will be withdrawn */ |