Changeset fb24492 for src/SynTree/Constant.cc

Timestamp:

May 12, 2016, 1:19:59 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, 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, with_gc

Children:

03286aa, 7b3f66b

Parents:

ec79847 (diff), 228851d (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 ctor

Conflicts:

src/SymTab/Validate.cc

File:

• src/SynTree/Constant.cc (modified) (1 diff)

src/SynTree/Constant.cc

@@ -30 +30 @@
 Constant::~Constant() { delete type; }
 
-Constant Constant::from( int i ) {
+Constant Constant::from_int( int i ) {
         return Constant( new BasicType( Type::Qualifiers(), BasicType::SignedInt ), std::to_string( i ) );
 }
 
-Constant Constant::from( unsigned long i ) {
+Constant Constant::from_ulong( unsigned long i ) {
         return Constant( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), std::to_string( i ) );
 }
 
-Constant Constant::from( double d ) {
+Constant Constant::from_double( double d ) {
         return Constant( new BasicType( Type::Qualifiers(), BasicType::Double ), std::to_string( d ) );
 }