Changes in src/Parser/parser.yy [0da3e2c:e82aa9df]

File:

• src/Parser/parser.yy (modified) (8 diffs)

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Aug 16 17:10:35 2016
-// Update Count     : 1898
+// Last Modified On : Mon Aug 15 15:18:19 2016
+// Update Count     : 1891
 //
 
@@ -43 +43 @@
 #define YYDEBUG_LEXER_TEXT (yylval)                                             // lexer loads this up each time
 #define YYDEBUG 1                                                                               // get the pretty debugging code to compile
+extern char *yytext;
 
 #undef __GNUC_MINOR__
@@ -55 +56 @@
 #include "LinkageSpec.h"
 
-extern DeclarationNode *parseTree;
-extern LinkageSpec::Type linkage;
-extern TypedefTable typedefTable;
-
+DeclarationNode *theTree = 0;                                                   // the resulting parse tree
+LinkageSpec::Type linkage = LinkageSpec::Cforall;
 std::stack< LinkageSpec::Type > linkageStack;
+TypedefTable typedefTable;
 
 void appendStr( std::string &to, std::string *from ) {
@@ -223 +223 @@
 %type<decl> paren_identifier paren_type
 
-%type<decl> storage_class storage_class_list
+%type<decl> storage_class storage_class_name storage_class_list
 
 %type<decl> sue_declaration_specifier sue_type_specifier
@@ -1324 +1324 @@
 
 storage_class:
+        storage_class_name
+        ;
+
+storage_class_name:
         EXTERN
                 { $$ = DeclarationNode::newStorageClass( DeclarationNode::Extern ); }
@@ -1971 +1975 @@
         | external_definition_list
                 {
-                        if ( parseTree ) {
-                                parseTree->appendList( $1 );
+                        if ( theTree ) {
+                                theTree->appendList( $1 );
                         } else {
-                                parseTree = $1;
+                                theTree = $1;
                         }
                 }
@@ -2144 +2148 @@
 any_word:                                                                                               // GCC
         identifier_or_type_name {}
-        | storage_class {}
+        | storage_class_name {}
         | basic_type_name {}
         | type_qualifier {}
@@ -2844 +2848 @@
 // ----end of grammar----
 
-extern char *yytext;
-
 void yyerror( const char * ) {
         std::cout << "Error ";