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

File:

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

src/Parser/ExpressionNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 13:17:07 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Aug 21 09:43:31 2016
-// Update Count     : 501
+// Last Modified On : Tue Aug 16 00:09:20 2016
+// Update Count     : 495
 //
 
@@ -120 +120 @@
         } // if
 
-        Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[Unsigned][size] ), str ) );
-        delete &str;                                                                            // created by lex
-        return ret;
+        return new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[Unsigned][size] ), str ) );
 } // build_constantInteger
 
@@ -152 +150 @@
         } // if
 
-        Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[complx][size] ), str ) );
-        delete &str;                                                                            // created by lex
-        return ret;
+        return new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[complx][size] ), str ) );
 } // build_constantFloat
 
 Expression *build_constantChar( const std::string & str ) {
-        Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::Char ), str ) );
-        delete &str;                                                                            // created by lex
-        return ret;
+        return new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::Char ), str ) );
 } // build_constantChar
 
@@ -169 +163 @@
                                                                                         toString( str.size()+1-2 ) ) ),  // +1 for '\0' and -2 for '"'
                                                                    false, false );
-        ConstantExpr * ret = new ConstantExpr( Constant( at, str ) );
-        delete &str;                                                                            // created by lex
-        return ret;
+        return new ConstantExpr( Constant( at, str ) );
 } // build_constantStr
 
@@ -191 +183 @@
 
 Expression *build_cast( DeclarationNode *decl_node, ExpressionNode *expr_node ) {
-        Type *targetType = decl_node->buildType();
+        Type *targetType = maybeMoveBuildType( decl_node );
         if ( dynamic_cast< VoidType * >( targetType ) ) {
                 delete targetType;
@@ -221 +213 @@
 }
 Expression *build_sizeOftype( DeclarationNode *decl_node ) {
-        Expression* ret = new SizeofExpr( decl_node->buildType() );
-        delete decl_node;
-        return ret;
+        return new SizeofExpr( maybeMoveBuildType( decl_node ) );
 }
 Expression *build_alignOfexpr( ExpressionNode *expr_node ) {
@@ -229 +219 @@
 }
 Expression *build_alignOftype( DeclarationNode *decl_node ) {
-        return new AlignofExpr( decl_node->buildType() );
+        return new AlignofExpr( maybeMoveBuildType( decl_node) );
 }
 Expression *build_offsetOf( DeclarationNode *decl_node, NameExpr *member ) {
-        Expression* ret = new UntypedOffsetofExpr( decl_node->buildType(), member->get_name() );
-        delete decl_node;
+        Expression* ret = new UntypedOffsetofExpr( maybeMoveBuildType( decl_node ), member->get_name() );
         delete member;
         return ret;
@@ -277 +266 @@
 }
 Expression *build_attrtype( NameExpr *var, DeclarationNode * decl_node ) {
-        return new AttrExpr( var, decl_node->buildType() );
+        return new AttrExpr( var, maybeMoveBuildType( decl_node ) );
 }
 
@@ -304 +293 @@
 }
 Expression *build_typevalue( DeclarationNode *decl ) {
-        return new TypeExpr( decl->buildType() );
+        return new TypeExpr( maybeMoveBuildType( decl ) );
 }