Changeset bd9f8be for src/Parser/ExpressionNode.cc

Timestamp:

Aug 22, 2016, 3:31:54 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

dadc1b5, f87408e

Parents:

03b812d2 (diff), 2acf5fc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:/u/cforall/software/cfa/cfa-cc

File:

• src/Parser/ExpressionNode.cc (modified) (4 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 : Tue Aug 16 00:09:20 2016
-// Update Count     : 495
+// Last Modified On : Sun Aug 21 09:43:31 2016
+// Update Count     : 501
 //
 
@@ -120 +120 @@
         } // if
 
-        return new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[Unsigned][size] ), str ) );
+        Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[Unsigned][size] ), str ) );
+        delete &str;                                                                            // created by lex
+        return ret;
 } // build_constantInteger
 
@@ -150 +152 @@
         } // if
 
-        return new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[complx][size] ), str ) );
+        Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, kind[complx][size] ), str ) );
+        delete &str;                                                                            // created by lex
+        return ret;
 } // build_constantFloat
 
 Expression *build_constantChar( const std::string & str ) {
-        return new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::Char ), str ) );
+        Expression * ret = new ConstantExpr( Constant( new BasicType( emptyQualifiers, BasicType::Char ), str ) );
+        delete &str;                                                                            // created by lex
+        return ret;
 } // build_constantChar
 
@@ -163 +169 @@
                                                                                         toString( str.size()+1-2 ) ) ),  // +1 for '\0' and -2 for '"'
                                                                    false, false );
-        return new ConstantExpr( Constant( at, str ) );
+        ConstantExpr * ret = new ConstantExpr( Constant( at, str ) );
+        delete &str;                                                                            // created by lex
+        return ret;
 } // build_constantStr