Changes in src/Parser/ExpressionNode.cc [4f147cc:ac71a86]

File:

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

src/Parser/ExpressionNode.cc

@@ -183 +183 @@
 
 Expression *build_cast( DeclarationNode *decl_node, ExpressionNode *expr_node ) {
-        Type *targetType = maybeMoveBuildType( decl_node );
+        Type *targetType = decl_node->buildType();
         if ( dynamic_cast< VoidType * >( targetType ) ) {
                 delete targetType;
@@ -213 +213 @@
 }
 Expression *build_sizeOftype( DeclarationNode *decl_node ) {
-        return new SizeofExpr( maybeMoveBuildType( decl_node ) );
+        Expression* ret = new SizeofExpr( decl_node->buildType() );
+        delete decl_node;
+        return ret;
 }
 Expression *build_alignOfexpr( ExpressionNode *expr_node ) {
@@ -219 +221 @@
 }
 Expression *build_alignOftype( DeclarationNode *decl_node ) {
-        return new AlignofExpr( maybeMoveBuildType( decl_node) );
+        return new AlignofExpr( decl_node->buildType() );
 }
 Expression *build_offsetOf( DeclarationNode *decl_node, NameExpr *member ) {
-        Expression* ret = new UntypedOffsetofExpr( maybeMoveBuildType( decl_node ), member->get_name() );
+        Expression* ret = new UntypedOffsetofExpr( decl_node->buildType(), member->get_name() );
+        delete decl_node;
         delete member;
         return ret;
@@ -266 +269 @@
 }
 Expression *build_attrtype( NameExpr *var, DeclarationNode * decl_node ) {
-        return new AttrExpr( var, maybeMoveBuildType( decl_node ) );
+        return new AttrExpr( var, decl_node->buildType() );
 }
 
@@ -293 +296 @@
 }
 Expression *build_typevalue( DeclarationNode *decl ) {
-        return new TypeExpr( maybeMoveBuildType( decl ) );
+        return new TypeExpr( decl->buildType() );
 }