Changes in src/SynTree/Constant.h [c36298d:6c89ecc]

File:

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

src/SynTree/Constant.h

@@ -18 +18 @@
 #include <iosfwd>     // for ostream
 #include <string>     // for string
-#include <optional>   // for optional
 
 #include "BaseSyntaxNode.h"
@@ -28 +27 @@
 class Constant : public BaseSyntaxNode {
   public:
-        Constant( Type * type, std::string rep, std::optional<unsigned long long> i );
+        Constant( Type * type, std::string rep, unsigned long long val );
+        Constant( Type * type, std::string rep, double val );
         Constant( const Constant & other );
         virtual ~Constant();
@@ -39 +39 @@
         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 an array of chars constant of the given string
+        static Constant from_string( std::string const & s );
 
         /// generates a null pointer value for the given type. void * if omitted.
@@ -56 +63 @@
         Type * type;
         std::string rep;
-        std::optional<unsigned long long> ival;
-
-        friend class ConverterOldToNew;
+        union Val {
+                unsigned long long ival;
+                double dval;
+                Val( unsigned long long ival ) : ival( ival ) {}
+                Val( double dval ) : dval( dval ) {}
+        } val;
 };