Changeset 513e165 for src/Parser/parser.yy

Timestamp:

Sep 13, 2017, 3:09:12 PM (7 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:

121c3c0

Parents:

7aa257ae

Message:

generalize types for encoded strings, and fold simple ExpressionNode? build routines into parser

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 Sep 11 18:12:00 2017
-// Update Count     : 2787
+// Last Modified On : Wed Sep 13 11:01:20 2017
+// Update Count     : 2803
 //
 
@@ -56 +56 @@
 #include "LinkageSpec.h"
 #include "Common/SemanticError.h"                                               // error_str
+#include "Common/utility.h"                                                             // for maybeMoveBuild, maybeBuild, CodeLo...
 
 extern DeclarationNode * parseTree;
@@ -438 +439 @@
                 { $$ = $2; }
         | '(' compound_statement ')'                                            // GCC, lambda expression
-                { $$ = new ExpressionNode( build_valexpr( $2 ) ); }
+                { $$ = new ExpressionNode( new StmtExpr( dynamic_cast< CompoundStmt * >(maybeMoveBuild< Statement >($2) ) ) ); }
         | primary_expression '{' argument_expression_list '}' // CFA, constructor call
                 {
@@ -618 +619 @@
                 // VIRTUAL cannot be opt because of look ahead issues
         | '(' VIRTUAL ')' cast_expression
-                { $$ = new ExpressionNode( build_virtual_cast( nullptr, $4 ) ); }
+                { $$ = new ExpressionNode( new VirtualCastExpr( maybeMoveBuild< Expression >( $4 ), maybeMoveBuildType( nullptr ) ) ); }
         | '(' VIRTUAL type_no_function ')' cast_expression
-                { $$ = new ExpressionNode( build_virtual_cast( $3, $5 ) ); }
+                { $$ = new ExpressionNode( new VirtualCastExpr( maybeMoveBuild< Expression >( $5 ), maybeMoveBuildType( $3 ) ) ); }
 //      | '(' type_no_function ')' tuple
 //              { $$ = new ExpressionNode( build_cast( $2, $4 ) ); }
@@ -771 +772 @@
         assignment_expression
         | comma_expression ',' assignment_expression
-                { $$ = new ExpressionNode( build_comma( $1, $3 ) ); }
+                { $$ = new ExpressionNode( new CommaExpr( maybeMoveBuild< Expression >( $1 ), maybeMoveBuild< Expression >( $3 ) ) ); }
         ;
 
@@ -1154 +1155 @@
 asm_operand:                                                                                    // GCC
         string_literal '(' constant_expression ')'
-                { $$ = new ExpressionNode( build_asmexpr( 0, $1, $3 ) ); }
+                { $$ = new ExpressionNode( new AsmExpr( maybeMoveBuild< Expression >( (ExpressionNode *)nullptr ), $1, maybeMoveBuild< Expression >( $3 ) ) ); }
         | '[' constant_expression ']' string_literal '(' constant_expression ')'
-                { $$ = new ExpressionNode( build_asmexpr( $2, $4, $6 ) ); }
+                { $$ = new ExpressionNode( new AsmExpr( maybeMoveBuild< Expression >( $2 ), $4, maybeMoveBuild< Expression >( $6 ) ) ); }
         ;
 
@@ -1165 +1166 @@
                 { $$ = new ExpressionNode( $1 ); }
         | asm_clobbers_list_opt ',' string_literal
-                // set_last return ParseNode *
+                // set_last returns ParseNode *
                 { $$ = (ExpressionNode *)$1->set_last( new ExpressionNode( $3 ) ); }
         ;
@@ -2165 +2166 @@
 type_list:                                                                                              // CFA
         type
-                { $$ = new ExpressionNode( build_typevalue( $1 ) ); }
+                { $$ = new ExpressionNode( new TypeExpr( maybeMoveBuildType( $1 ) ) ); }
         | assignment_expression
         | type_list ',' type
-                { $$ = (ExpressionNode *)( $1->set_last( new ExpressionNode( build_typevalue( $3 ) ) ) ); }
+                { $$ = (ExpressionNode *)( $1->set_last( new ExpressionNode( new TypeExpr( maybeMoveBuildType( $3 ) ) ) ) ); }
         | type_list ',' assignment_expression
                 { $$ = (ExpressionNode *)( $1->set_last( $3 )); }