Changeset d60ccbf for src/SynTree/Constant.cc

Timestamp:

Aug 12, 2015, 2:27:31 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

f32c7f4

Parents:

e45215c (diff), e869d663 (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' into designate

Conflicts:

src/CodeGen/CodeGenerator.h

File:

• src/SynTree/Constant.cc (modified) (2 diffs)

src/SynTree/Constant.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jun 10 14:41:03 2015
-// Update Count     : 8
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jul 30 15:18:38 2015
+// Update Count     : 12
 //
 
@@ -22 +22 @@
 Constant::Constant( Type *type_, std::string value_ ) : type( type_ ), value( value_ ) {}
 
-Constant::~Constant() {}
+Constant::Constant( const Constant &other ) {
+        type = other.type->clone();
+        value = other.value;
+}
 
-Constant *Constant::clone() const { return 0; }
+Constant::~Constant() { delete type; }
+
+Constant *Constant::clone() const { assert( false ); return 0; }
 
 void Constant::print( std::ostream &os ) const {