Changes in src/Parser/ExpressionNode.cc [7ecbb7e:7880579]

File:

• src/Parser/ExpressionNode.cc (modified) (9 diffs)

src/Parser/ExpressionNode.cc

@@ -167 +167 @@
 
 NameExpr * build_varref( const string *name, bool labelp ) {
-        NameExpr *expr = new NameExpr( *name, nullptr );
-        delete name;
-        return expr;
+        return new NameExpr( *name, nullptr );
 }
 
@@ -186 +184 @@
         if ( dynamic_cast< VoidType * >( targetType ) ) {
                 delete targetType;
-                return new CastExpr( maybeMoveBuild< Expression >(expr_node) );
+                return new CastExpr( maybeBuild< Expression >(expr_node) );
         } else {
-                return new CastExpr( maybeMoveBuild< Expression >(expr_node), targetType );
+                return new CastExpr( maybeBuild< Expression >(expr_node), targetType );
         } // if
 }
 
 Expression *build_fieldSel( ExpressionNode *expr_node, NameExpr *member ) {
-        UntypedMemberExpr *ret = new UntypedMemberExpr( member->get_name(), maybeMoveBuild< Expression >(expr_node) );
+        UntypedMemberExpr *ret = new UntypedMemberExpr( member->get_name(), maybeBuild< Expression >(expr_node) );
         delete member;
         return ret;
@@ -200 +198 @@
 Expression *build_pfieldSel( ExpressionNode *expr_node, NameExpr *member ) {
         UntypedExpr *deref = new UntypedExpr( new NameExpr( "*?" ) );
-        deref->get_args().push_back( maybeMoveBuild< Expression >(expr_node) );
+        deref->get_args().push_back( maybeBuild< Expression >(expr_node) );
         UntypedMemberExpr *ret = new UntypedMemberExpr( member->get_name(), deref );
         delete member;
@@ -207 +205 @@
 
 Expression *build_addressOf( ExpressionNode *expr_node ) {
-                return new AddressExpr( maybeMoveBuild< Expression >(expr_node) );
+                return new AddressExpr( maybeBuild< Expression >(expr_node) );
 }
 Expression *build_sizeOfexpr( ExpressionNode *expr_node ) {
-        return new SizeofExpr( maybeMoveBuild< Expression >(expr_node) );
+        return new SizeofExpr( maybeBuild< Expression >(expr_node) );
 }
 Expression *build_sizeOftype( DeclarationNode *decl_node ) {
@@ -216 +214 @@
 }
 Expression *build_alignOfexpr( ExpressionNode *expr_node ) {
-        return new AlignofExpr( maybeMoveBuild< Expression >(expr_node) );
+        return new AlignofExpr( maybeBuild< Expression >(expr_node) );
 }
 Expression *build_alignOftype( DeclarationNode *decl_node ) {
@@ -226 +224 @@
 
 Expression *build_and_or( ExpressionNode *expr_node1, ExpressionNode *expr_node2, bool kind ) {
-        return new LogicalExpr( notZeroExpr( maybeMoveBuild< Expression >(expr_node1) ), notZeroExpr( maybeMoveBuild< Expression >(expr_node2) ), kind );
+        return new LogicalExpr( notZeroExpr( maybeBuild< Expression >(expr_node1) ), notZeroExpr( maybeBuild< Expression >(expr_node2) ), kind );
 }
 
 Expression *build_unary_val( OperKinds op, ExpressionNode *expr_node ) {
         std::list< Expression * > args;
-        args.push_back( maybeMoveBuild< Expression >(expr_node) );
+        args.push_back( maybeBuild< Expression >(expr_node) );
         return new UntypedExpr( new NameExpr( OperName[ (int)op ] ), args );
 }
 Expression *build_unary_ptr( OperKinds op, ExpressionNode *expr_node ) {
         std::list< Expression * > args;
-        args.push_back( new AddressExpr( maybeMoveBuild< Expression >(expr_node) ) );
+        args.push_back( new AddressExpr( maybeBuild< Expression >(expr_node) ) );
         return new UntypedExpr( new NameExpr( OperName[ (int)op ] ), args );
 }
 Expression *build_binary_val( OperKinds op, ExpressionNode *expr_node1, ExpressionNode *expr_node2 ) {
         std::list< Expression * > args;
-        args.push_back( maybeMoveBuild< Expression >(expr_node1) );
-        args.push_back( maybeMoveBuild< Expression >(expr_node2) );
+        args.push_back( maybeBuild< Expression >(expr_node1) );
+        args.push_back( maybeBuild< Expression >(expr_node2) );
         return new UntypedExpr( new NameExpr( OperName[ (int)op ] ), args );
 }
 Expression *build_binary_ptr( OperKinds op, ExpressionNode *expr_node1, ExpressionNode *expr_node2 ) {
         std::list< Expression * > args;
-        args.push_back( new AddressExpr( maybeMoveBuild< Expression >(expr_node1) ) );
-        args.push_back( maybeMoveBuild< Expression >(expr_node2) );
+        args.push_back( new AddressExpr( maybeBuild< Expression >(expr_node1) ) );
+        args.push_back( maybeBuild< Expression >(expr_node2) );
         return new UntypedExpr( new NameExpr( OperName[ (int)op ] ), args );
 }
 
 Expression *build_cond( ExpressionNode *expr_node1, ExpressionNode *expr_node2, ExpressionNode *expr_node3 ) {
-        return new ConditionalExpr( notZeroExpr( maybeMoveBuild< Expression >(expr_node1) ), maybeMoveBuild< Expression >(expr_node2), maybeMoveBuild< Expression >(expr_node3) );
+        return new ConditionalExpr( notZeroExpr( maybeBuild< Expression >(expr_node1) ), maybeBuild< Expression >(expr_node2), maybeBuild< Expression >(expr_node3) );
 }
 
 Expression *build_comma( ExpressionNode *expr_node1, ExpressionNode *expr_node2 ) {
-        return new CommaExpr( maybeMoveBuild< Expression >(expr_node1), maybeMoveBuild< Expression >(expr_node2) );
+        return new CommaExpr( maybeBuild< Expression >(expr_node1), maybeBuild< Expression >(expr_node2) );
 }
 
 Expression *build_attrexpr( NameExpr *var, ExpressionNode * expr_node ) {
-        return new AttrExpr( var, maybeMoveBuild< Expression >(expr_node) );
+        return new AttrExpr( var, maybeBuild< Expression >(expr_node) );
 }
 Expression *build_attrtype( NameExpr *var, DeclarationNode * decl_node ) {
@@ -269 +267 @@
 Expression *build_tuple( ExpressionNode * expr_node ) {
         TupleExpr *ret = new TupleExpr();
-        buildMoveList( expr_node, ret->get_exprs() );
+        buildList( expr_node, ret->get_exprs() );
         return ret;
 }
@@ -275 +273 @@
 Expression *build_func( ExpressionNode * function, ExpressionNode * expr_node ) {
         std::list< Expression * > args;
-        buildMoveList( expr_node, args );
-        return new UntypedExpr( maybeMoveBuild< Expression >(function), args, nullptr );
+
+        buildList( expr_node, args );
+        return new UntypedExpr( maybeBuild< Expression >(function), args, nullptr );
 }
 
 Expression *build_range( ExpressionNode * low, ExpressionNode *high ) {
-        return new RangeExpr( maybeMoveBuild< Expression >( low ), maybeMoveBuild< Expression >( high ) );
+        Expression *low_cexpr = maybeBuild< Expression >( low );
+        Expression *high_cexpr = maybeBuild< Expression >( high );
+        return new RangeExpr( low_cexpr, high_cexpr );
 }
 
 Expression *build_asmexpr( ExpressionNode *inout, ConstantExpr *constraint, ExpressionNode *operand ) {
-        return new AsmExpr( maybeMoveBuild< Expression >( inout ), constraint, maybeMoveBuild< Expression >(operand) );
+        return new AsmExpr( maybeBuild< Expression >( inout ), constraint, maybeBuild< Expression >(operand) );
 }
 
 Expression *build_valexpr( StatementNode *s ) {
-        return new UntypedValofExpr( maybeMoveBuild< Statement >(s), nullptr );
+        return new UntypedValofExpr( maybeBuild< Statement >(s), nullptr );
 }
 Expression *build_typevalue( DeclarationNode *decl ) {
@@ -297 +298 @@
         Declaration * newDecl = maybeBuild< Declaration >(decl_node); // compound literal type
         if ( DeclarationWithType * newDeclWithType = dynamic_cast< DeclarationWithType * >( newDecl ) ) { // non-sue compound-literal type
-                return new CompoundLiteralExpr( newDeclWithType->get_type(), maybeMoveBuild< Initializer >(kids) );
+                return new CompoundLiteralExpr( newDeclWithType->get_type(), maybeBuild< Initializer >(kids) );
         // these types do not have associated type information
         } else if ( StructDecl * newDeclStructDecl = dynamic_cast< StructDecl * >( newDecl )  ) {
-                return new CompoundLiteralExpr( new StructInstType( Type::Qualifiers(), newDeclStructDecl->get_name() ), maybeMoveBuild< Initializer >(kids) );
+                return new CompoundLiteralExpr( new StructInstType( Type::Qualifiers(), newDeclStructDecl->get_name() ), maybeBuild< Initializer >(kids) );
         } else if ( UnionDecl * newDeclUnionDecl = dynamic_cast< UnionDecl * >( newDecl )  ) {
-                return new CompoundLiteralExpr( new UnionInstType( Type::Qualifiers(), newDeclUnionDecl->get_name() ), maybeMoveBuild< Initializer >(kids) );
+                return new CompoundLiteralExpr( new UnionInstType( Type::Qualifiers(), newDeclUnionDecl->get_name() ), maybeBuild< Initializer >(kids) );
         } else if ( EnumDecl * newDeclEnumDecl = dynamic_cast< EnumDecl * >( newDecl )  ) {
-                return new CompoundLiteralExpr( new EnumInstType( Type::Qualifiers(), newDeclEnumDecl->get_name() ), maybeMoveBuild< Initializer >(kids) );
+                return new CompoundLiteralExpr( new EnumInstType( Type::Qualifiers(), newDeclEnumDecl->get_name() ), maybeBuild< Initializer >(kids) );
         } else {
                 assert( false );