Changeset 0da3e2c for src/Parser/parser.yy

Timestamp:

Aug 16, 2016, 5:56:37 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

29917c6

Parents:

7880579

Message:

more refactoring of parser code

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 : Mon Aug 15 15:18:19 2016
-// Update Count     : 1891
+// Last Modified On : Tue Aug 16 17:10:35 2016
+// Update Count     : 1898
 //
 
@@ -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__
@@ -56 +55 @@
 #include "LinkageSpec.h"
 
-DeclarationNode *theTree = 0;                                                   // the resulting parse tree
-LinkageSpec::Type linkage = LinkageSpec::Cforall;
+extern DeclarationNode *parseTree;
+extern LinkageSpec::Type linkage;
+extern TypedefTable typedefTable;
+
 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_name storage_class_list
+%type<decl> storage_class 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 ); }
@@ -1975 +1971 @@
         | external_definition_list
                 {
-                        if ( theTree ) {
-                                theTree->appendList( $1 );
+                        if ( parseTree ) {
+                                parseTree->appendList( $1 );
                         } else {
-                                theTree = $1;
+                                parseTree = $1;
                         }
                 }
@@ -2148 +2144 @@
 any_word:                                                                                               // GCC
         identifier_or_type_name {}
-        | storage_class_name {}
+        | storage_class {}
         | basic_type_name {}
         | type_qualifier {}
@@ -2848 +2844 @@
 // ----end of grammar----
 
+extern char *yytext;
+
 void yyerror( const char * ) {
         std::cout << "Error ";