Changes in src/SynTree/Constant.h [bb9d8e8:7870799]

File:

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

src/SynTree/Constant.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:54:46 2017
-// Update Count     : 17
+// Last Modified On : Wed Jul 10 15:57:38 2019
+// Update Count     : 19
 //
 
@@ -18 +18 @@
 #include <iosfwd>     // for ostream
 #include <string>     // for string
+#include <optional>   // for optional
 
 #include "BaseSyntaxNode.h"
@@ -27 +28 @@
 class Constant : public BaseSyntaxNode {
   public:
-        Constant( Type * type, std::string rep, unsigned long long val );
-        Constant( Type * type, std::string rep, double val );
+        Constant( Type * type, std::string rep, std::optional<unsigned long long> i );
         Constant( const Constant & other );
+        Constant & operator=( const Constant & ) = default;
         virtual ~Constant();
 
-        virtual Constant * clone() const { return new Constant( *this ); }
+        virtual Constant * clone() const override { return new Constant( *this ); }
 
         Type * get_type() { return type; }
@@ -39 +40 @@
         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 a char constant of the given char
-        static Constant from_char( char c );
         /// generates an integer constant of the given int
         static Constant from_int( int i );
         /// generates an integer constant of the given unsigned long int
         static Constant from_ulong( unsigned long i );
-        /// generates a floating point constant of the given double
-        static Constant from_double( double d );
 
         /// generates a null pointer value for the given type. void * if omitted.
         static Constant null( Type * ptrtype = nullptr );
 
-        virtual void accept( Visitor & v ) { v.visit( this ); }
-        virtual Constant * acceptMutator( Mutator & m ) { return m.mutate( this ); }
-        virtual void print( std::ostream & os, Indenter indent = 0 ) const;
-  private:
+        virtual void accept( Visitor & v ) override { v.visit( this ); }
+        virtual void accept( Visitor & v ) const override { v.visit( this ); }
+        virtual Constant * acceptMutator( Mutator & m ) override { return m.mutate( this ); }
+        virtual void print( std::ostream & os, Indenter indent = 0 ) const override;
+
         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;
+        std::optional<unsigned long long> ival;
 };