Changeset d56e5bc for src/SynTree

Timestamp:

Jun 21, 2017, 5:47:44 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

e9a3b20b

Parents:

da24468

Message:

add constant value into constants

Location:

src/SynTree

Files:

• Constant.cc (modified) (3 diffs)
• Constant.h (modified) (3 diffs)

src/SynTree/Constant.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jul 30 15:18:38 2015
-// Update Count     : 12
+// Last Modified On : Wed Jun 21 16:44:48 2017
+// Update Count     : 27
 //
 
@@ -21 +21 @@
 #include "Type.h"
 
-Constant::Constant( Type *type_, std::string value_ ) : type( type_ ), value( value_ ) {}
+Constant::Constant( Type * type, std::string rep, unsigned long long val ) : type( type ), rep( rep ), val( val ) {}
+Constant::Constant( Type * type, std::string rep, double val ) : type( type ), rep( rep ), val( val ) {}
 
-Constant::Constant( const Constant &other ) {
+Constant::Constant( const Constant &other ) : rep( other.rep ), val( other.val ) {
         type = other.type->clone();
-        value = other.value;
 }
 
@@ -31 +31 @@
 
 Constant Constant::from_int( int i ) {
-        return Constant( new BasicType( Type::Qualifiers(), BasicType::SignedInt ), std::to_string( i ) );
+        return Constant( new BasicType( Type::Qualifiers(), BasicType::SignedInt ), std::to_string( i ), (unsigned long long int)i );
 }
 
 Constant Constant::from_ulong( unsigned long i ) {
-        return Constant( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), std::to_string( i ) );
+        return Constant( new BasicType( Type::Qualifiers(), BasicType::LongUnsignedInt ), std::to_string( i ), (unsigned long long int)i );
 }
 
 Constant Constant::from_double( double d ) {
-        return Constant( new BasicType( Type::Qualifiers(), BasicType::Double ), std::to_string( d ) );
+        return Constant( new BasicType( Type::Qualifiers(), BasicType::Double ), std::to_string( d ), d );
 }
 
-Constant *Constant::clone() const { assert( false ); return 0; }
-
 void Constant::print( std::ostream &os ) const {
-        os << "(" << value;
+        os << "(" << rep << " " << val.ival;
         if ( type ) {
                 os << ": ";

src/SynTree/Constant.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Jun 30 13:33:17 2016
-// Update Count     : 6
+// Last Modified On : Wed Jun 21 16:44:48 2017
+// Update Count     : 14
 //
 
@@ -23 +23 @@
 class Constant {
   public:
-        Constant( Type *type, std::string value );
-        Constant( const Constant &other );
+        Constant( Type * type, std::string rep, unsigned long long val );
+        Constant( Type * type, std::string rep, double val );
+        Constant( const Constant & other );
         virtual ~Constant();
 
-        Type *get_type() { return type; }
-        void set_type( Type *newValue ) { type = newValue; }
-        std::string &get_value() { return value; }
-        void set_value( std::string newValue ) { value = newValue; }
+        Type * get_type() { return type; }
+        void set_type( Type * newValue ) { type = newValue; }
+        std::string & get_value() { return rep; }
+        void set_value( std::string newValue ) { rep = newValue; }
 
         /// generates an integer constant of the given int
@@ -39 +40 @@
         static Constant from_double( double d );
 
-        virtual Constant *clone() const;
-        virtual void accept( Visitor &v ) { v.visit( this ); }
-        virtual Constant *acceptMutator( Mutator &m ) { return m.mutate( this ); }
-        virtual void print( std::ostream &os ) const;
+        virtual void accept( Visitor & v ) { v.visit( this ); }
+        virtual Constant * acceptMutator( Mutator & m ) { return m.mutate( this ); }
+        virtual void print( std::ostream & os ) const;
   private:
-        Type *type;
-        std::string value;
+        Type * type;
+        std::string rep;
+        union Val {
+                unsigned long long ival;
+                double dval;
+                Val( unsigned long long ival ) : ival( ival ) {}
+                Val( double dval ) : dval( dval ) {}
+        } val;
 };