Changes in src/Parser/parser.yy [2037f82:e82aa9df]

File:

• src/Parser/parser.yy (modified) (19 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 : Thu Aug 18 23:49:10 2016
-// Update Count     : 1909
+// 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::Spec linkage;
-extern TypedefTable typedefTable;
-
-std::stack< LinkageSpec::Spec > linkageStack;
+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
@@ -311 +311 @@
 constant:
                 // ENUMERATIONconstant is not included here; it is treated as a variable with type "enumeration constant".
-        INTEGERconstant                                                                 { $$ = new ExpressionNode( build_constantInteger( assign_strptr($1) ) ); }
-        | FLOATINGconstant                                                      { $$ = new ExpressionNode( build_constantFloat( assign_strptr($1) ) ); }
-        | CHARACTERconstant                                                     { $$ = new ExpressionNode( build_constantChar( assign_strptr($1) ) ); }
+INTEGERconstant                                                                 { $$ = new ExpressionNode( build_constantInteger( *$1 ) ); }
+        | FLOATINGconstant                                                      { $$ = new ExpressionNode( build_constantFloat( *$1 ) ); }
+        | CHARACTERconstant                                                     { $$ = new ExpressionNode( build_constantChar( *$1 ) ); }
         ;
 
@@ -338 +338 @@
 
 string_literal_list:                                                                    // juxtaposed strings are concatenated
-        STRINGliteral                                                           { $$ = build_constantStr( assign_strptr($1) ); }
+        STRINGliteral                                                           { $$ = build_constantStr( *$1 ); }
         | string_literal_list STRINGliteral
                 {
@@ -699 +699 @@
         | EXTENSION declaration                                                         // GCC
                 {       // mark all fields in list
-                        for ( DeclarationNode *iter = $2; iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
+                        for ( DeclarationNode *iter = $2; iter != NULL; iter = (DeclarationNode *)iter->get_next() )
                                 iter->set_extension( true );
                         $$ = new StatementNode( $2 );
@@ -838 +838 @@
 jump_statement:
         GOTO IDENTIFIER ';'
-                { $$ = new StatementNode( build_branch( assign_strptr($2), BranchStmt::Goto ) ); }
+                { $$ = new StatementNode( build_branch( *$2, BranchStmt::Goto ) ); }
         | GOTO '*' comma_expression ';'                                         // GCC, computed goto
                 // The syntax for the GCC computed goto violates normal expression precedence, e.g., goto *i+3; => goto *(i+3);
@@ -849 +849 @@
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement, and
                 // the target of the transfer appears only at the start of an iteration statement.
-                { $$ = new StatementNode( build_branch( assign_strptr($2), BranchStmt::Continue ) ); }
+                { $$ = new StatementNode( build_branch( *$2, BranchStmt::Continue ) ); delete $2; }
         | BREAK ';'
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement.
@@ -856 +856 @@
                 // A semantic check is required to ensure this statement appears only in the body of an iteration statement, and
                 // the target of the transfer appears only at the start of an iteration statement.
-                { $$ = new StatementNode( build_branch( assign_strptr($2), BranchStmt::Break ) ); }
+                { $$ = new StatementNode( build_branch( *$2, BranchStmt::Break ) ); delete $2; }
         | RETURN comma_expression_opt ';'
                 { $$ = new StatementNode( build_return( $2 ) ); }
@@ -979 +979 @@
 label_list:
         no_attr_identifier
-                { $$ = new LabelNode(); $$->labels.push_back( assign_strptr($1) ); }
+                { $$ = new LabelNode(); $$->labels.push_back( *$1 ); }
         | label_list ',' no_attr_identifier
-                { $$ = $1; $1->labels.push_back( assign_strptr($3) ); }
+                { $$ = $1; $1->labels.push_back( *$3 ); }
         ;
 
@@ -1324 +1324 @@
 
 storage_class:
+        storage_class_name
+        ;
+
+storage_class_name:
         EXTERN
                 { $$ = DeclarationNode::newStorageClass( DeclarationNode::Extern ); }
@@ -1493 +1497 @@
         | EXTENSION field_declaring_list ';'                            // GCC
                 {       // mark all fields in list
-                        for ( DeclarationNode *iter = $2; iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
+                        for ( DeclarationNode *iter = $2; iter != NULL; iter = (DeclarationNode *)iter->get_next() )
                                 iter->set_extension( true );
                         $$ = $2;
@@ -1970 +1974 @@
                 {}                                                                                              // empty input file
         | external_definition_list
-                { parseTree = parseTree != nullptr ? parseTree->appendList( $1 ) : $1;  }
+                {
+                        if ( theTree ) {
+                                theTree->appendList( $1 );
+                        } else {
+                                theTree = $1;
+                        }
+                }
         ;
 
@@ -1976 +1986 @@
         external_definition
         | external_definition_list push external_definition
-                { $$ = $1 != nullptr ? $1->appendList( $3 ) : $3; }
+                { $$ = ( $1 != NULL ) ? $1->appendList( $3 ) : $3; }
         ;
 
@@ -1992 +2002 @@
         | EXTERN STRINGliteral
                 {
-                        linkageStack.push( linkage );                           // handle nested extern "C"/"Cforall"
-                        linkage = LinkageSpec::fromString( assign_strptr($2) );
+                        linkageStack.push( linkage );
+                        linkage = LinkageSpec::fromString( *$2 );
                 }
           '{' external_definition_list_opt '}'                          // C++-style linkage specifier
@@ -2003 +2013 @@
         | EXTENSION external_definition
                 {       // mark all fields in list
-                        for ( DeclarationNode *iter = $2; iter != nullptr; iter = (DeclarationNode *)iter->get_next() )
+                        for ( DeclarationNode *iter = $2; iter != NULL; iter = (DeclarationNode *)iter->get_next() )
                                 iter->set_extension( true );
                         $$ = $2;
@@ -2137 +2147 @@
 
 any_word:                                                                                               // GCC
-        identifier_or_type_name { delete $1; }
-        | storage_class { delete $1; }
-        | basic_type_name { delete $1; }
-        | type_qualifier { delete $1; }
+        identifier_or_type_name {}
+        | storage_class_name {}
+        | basic_type_name {}
+        | type_qualifier {}
         ;
 
@@ -2838 +2848 @@
 // ----end of grammar----
 
-extern char *yytext;
-
 void yyerror( const char * ) {
         std::cout << "Error ";