Changeset 80722d0 for src/Parser/parser.yy

Timestamp:

Aug 20, 2016, 7:06:26 PM (9 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:

ab57786, d30790f

Parents:

e6955b1 (diff), 4a7d895 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg2:software/cfa/cfa-cc

File:

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

src/Parser/parser.yy

@@ -311 +311 @@
 constant:
                 // ENUMERATIONconstant is not included here; it is treated as a variable with type "enumeration constant".
-INTEGERconstant                                                                 { $$ = new ExpressionNode( build_constantInteger( *$1 ) ); }
-        | FLOATINGconstant                                                      { $$ = new ExpressionNode( build_constantFloat( *$1 ) ); }
-        | CHARACTERconstant                                                     { $$ = new ExpressionNode( build_constantChar( *$1 ) ); }
+        INTEGERconstant                                                                 { $$ = new ExpressionNode( build_constantInteger( assign_strptr($1) ) ); }
+        | FLOATINGconstant                                                      { $$ = new ExpressionNode( build_constantFloat( assign_strptr($1) ) ); }
+        | CHARACTERconstant                                                     { $$ = new ExpressionNode( build_constantChar( assign_strptr($1) ) ); }
         ;
 
@@ -338 +338 @@
 
 string_literal_list:                                                                    // juxtaposed strings are concatenated
-        STRINGliteral                                                           { $$ = build_constantStr( *$1 ); }
+        STRINGliteral                                                           { $$ = build_constantStr( assign_strptr($1) ); }
         | string_literal_list STRINGliteral
                 {
@@ -838 +838 @@
 jump_statement:
         GOTO IDENTIFIER ';'
-                { $$ = new StatementNode( build_branch( *$2, BranchStmt::Goto ) ); }
+                { $$ = new StatementNode( build_branch( assign_strptr($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( *$2, BranchStmt::Continue ) ); delete $2; }
+                { $$ = new StatementNode( build_branch( assign_strptr($2), BranchStmt::Continue ) ); }
         | 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( *$2, BranchStmt::Break ) ); delete $2; }
+                { $$ = new StatementNode( build_branch( assign_strptr($2), BranchStmt::Break ) ); }
         | RETURN comma_expression_opt ';'
                 { $$ = new StatementNode( build_return( $2 ) ); }
@@ -979 +979 @@
 label_list:
         no_attr_identifier
-                { $$ = new LabelNode(); $$->labels.push_back( *$1 ); }
+                { $$ = new LabelNode(); $$->labels.push_back( assign_strptr($1) ); }
         | label_list ',' no_attr_identifier
-                { $$ = $1; $1->labels.push_back( *$3 ); }
+                { $$ = $1; $1->labels.push_back( assign_strptr($3) ); }
         ;
 
@@ -1993 +1993 @@
                 {
                         linkageStack.push( linkage );                           // handle nested extern "C"/"Cforall"
-                        linkage = LinkageSpec::fromString( *$2 );
+                        linkage = LinkageSpec::fromString( assign_strptr($2) );
                 }
           '{' external_definition_list_opt '}'                          // C++-style linkage specifier
@@ -2137 +2137 @@
 
 any_word:                                                                                               // GCC
-        identifier_or_type_name {}
-        | storage_class {}
-        | basic_type_name {}
-        | type_qualifier {}
+        identifier_or_type_name { delete $1; }
+        | storage_class { delete $1; }
+        | basic_type_name { delete $1; }
+        | type_qualifier { delete $1; }
         ;