Changeset 1b77274 for src/Parser/parser.yy

Timestamp:

Sep 16, 2016, 10:48:28 PM (8 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

2298f728

Parents:

ba7aa2d

Message:

more refactoring of parser code

File:

• src/Parser/parser.yy (modified) (10 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 Sep 12 17:29:45 2016
-// Update Count     : 1969
+// Last Modified On : Fri Sep 16 18:12:21 2016
+// Update Count     : 1978
 //
 
@@ -359 +359 @@
                 { $$ = $2; }
         | '(' compound_statement ')'                                            // GCC, lambda expression
-        { $$ = new ExpressionNode( build_valexpr( $2 ) ); }
+                { $$ = new ExpressionNode( build_valexpr( $2 ) ); }
         ;
 
@@ -896 +896 @@
                 { $$ = new StatementNode( build_catch( $5, $8 ) ); }
         | handler_clause CATCH '(' push push exception_declaration pop ')' compound_statement pop
-        { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $6, $9 ) ) ); }
+                { $$ = (StatementNode *)$1->set_last( new StatementNode( build_catch( $6, $9 ) ) ); }
         | CATCHRESUME '(' push push exception_declaration pop ')' compound_statement pop
                 { $$ = new StatementNode( build_catch( $5, $8 ) ); }
@@ -968 +968 @@
                 { $$ = new ExpressionNode( build_asmexpr( 0, $1, $3 ) ); }
         | '[' constant_expression ']' string_literal '(' constant_expression ')'
-        { $$ = new ExpressionNode( build_asmexpr( $2, $4, $6 ) ); }
+                { $$ = new ExpressionNode( build_asmexpr( $2, $4, $6 ) ); }
         ;
 
@@ -1467 +1467 @@
 aggregate_name:
         aggregate_key '{' field_declaration_list '}'
-                { $$ = DeclarationNode::newAggregate( $1, 0, 0, $3, true ); }
+                { $$ = DeclarationNode::newAggregate( $1, new std::string( "" ), nullptr, $3, true ); }
         | aggregate_key no_attr_identifier_or_type_name
                 {
@@ -1476 +1476 @@
                 { typedefTable.makeTypedef( *$2 ); }
                 '{' field_declaration_list '}'
-                { $$ = DeclarationNode::newAggregate( $1, $2, 0, $5, true ); }
+                { $$ = DeclarationNode::newAggregate( $1, $2, nullptr, $5, true ); }
         | aggregate_key '(' type_name_list ')' '{' field_declaration_list '}' // CFA
-                { $$ = DeclarationNode::newAggregate( $1, 0, $3, $6, false ); }
+                { $$ = DeclarationNode::newAggregate( $1, new std::string( "" ), $3, $6, false ); }
         | aggregate_key typegen_name                                            // CFA, S/R conflict
                 { $$ = $2; }
@@ -1559 +1559 @@
 enum_name:
         enum_key '{' enumerator_list comma_opt '}'
-                { $$ = DeclarationNode::newEnum( 0, $3 ); }
+                { $$ = DeclarationNode::newEnum( new std::string( "" ), $3 ); }
         | enum_key no_attr_identifier_or_type_name
                 {
@@ -2520 +2520 @@
 abstract_function:
         '(' push parameter_type_list_opt pop ')'                        // empty parameter list OBSOLESCENT (see 3)
-                { $$ = DeclarationNode::newFunction( 0, 0, $3, 0 ); }
+                { $$ = DeclarationNode::newFunction( new std::string( "" ), nullptr, $3, nullptr ); }
         | '(' abstract_ptr ')' '(' push parameter_type_list_opt pop ')' // empty parameter list OBSOLESCENT (see 3)
                 { $$ = $2->addParamList( $6 ); }
@@ -2589 +2589 @@
 abstract_parameter_function:
         '(' push parameter_type_list_opt pop ')'                        // empty parameter list OBSOLESCENT (see 3)
-                { $$ = DeclarationNode::newFunction( 0, 0, $3, 0 ); }
+                { $$ = DeclarationNode::newFunction( new std::string( "" ), nullptr, $3, nullptr ); }
         | '(' abstract_parameter_ptr ')' '(' push parameter_type_list_opt pop ')' // empty parameter list OBSOLESCENT (see 3)
                 { $$ = $2->addParamList( $6 ); }
@@ -2813 +2813 @@
 new_abstract_function:                                                                  // CFA
         '[' ']' '(' new_parameter_type_list_opt ')'
-                { $$ = DeclarationNode::newFunction( 0, DeclarationNode::newTuple( 0 ), $4, 0 ); }
+        { $$ = DeclarationNode::newFunction( new std::string( "" ), DeclarationNode::newTuple( nullptr ), $4, nullptr ); }
         | new_abstract_tuple '(' push new_parameter_type_list_opt pop ')'
-                { $$ = DeclarationNode::newFunction( 0, $1, $4, 0 ); }
+                { $$ = DeclarationNode::newFunction( new std::string( "" ), $1, $4, nullptr ); }
         | new_function_return '(' push new_parameter_type_list_opt pop ')'
-                { $$ = DeclarationNode::newFunction( 0, $1, $4, 0 ); }
+                { $$ = DeclarationNode::newFunction( new std::string( "" ), $1, $4, nullptr ); }
         ;