Changeset b1e63ac5 for src/SynTree/Constant.h

Timestamp:

Jul 4, 2017, 9:40:16 AM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

208e5be

Parents:

9c951e3 (diff), f7cb0bc (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 references

File:

• src/SynTree/Constant.h (modified) (3 diffs)

src/SynTree/Constant.h

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// Constant.h -- 
+// Constant.h --
 //
 // Author           : Richard C. Bilson
 // 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 By : Andrew Beach
+// Last Modified On : Thr Jun 22 10:13:00 2017
+// Update Count     : 15
 //
 
@@ -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; }
+        unsigned long long get_ival() const;
+        double get_dval() const;
 
+        /// generates a boolean constant of the given bool
+        static Constant from_bool( bool b );
         /// generates an integer constant of the given int
         static Constant from_int( int i );
@@ -39 +44 @@
         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;
 };