Changeset aba20d2 for src/SynTree

Timestamp:

Jun 17, 2019, 1:09:41 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

800bae1, 9d5089e

Parents:

8b34df0 (diff), b4d34fa (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/SynTree

Files:

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

src/SynTree/Constant.cc

@@ -22 +22 @@
 #include "Type.h"    // for BasicType, Type, Type::Qualifiers, PointerType
 
-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( Type * type, std::string rep, std::optional<unsigned long long> ival ) : type( type ), rep( rep ), ival( ival ) {}
 
-Constant::Constant( const Constant &other ) : BaseSyntaxNode( other ), rep( other.rep ), val( other.val ) {
+Constant::Constant( const Constant &other ) : BaseSyntaxNode( other ), rep( other.rep ), ival( other.ival ) {
         type = other.type->clone();
 }
@@ -35 +34 @@
 }
 
-Constant Constant::from_char( char c ) {
-        return Constant( new BasicType( Type::Qualifiers(), BasicType::Char ), std::to_string( c ), (unsigned long long int)c );
-}
-
 Constant Constant::from_int( int i ) {
         return Constant( new BasicType( Type::Qualifiers(), BasicType::SignedInt ), std::to_string( i ), (unsigned long long int)i );
@@ -45 +40 @@
 Constant Constant::from_ulong( unsigned long 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 ), d );
-}
-
-Constant Constant::from_string( std::string const & str ) {
-        return Constant(
-                new ArrayType(
-                        noQualifiers,
-                        new BasicType( Type::Qualifiers( Type::Const ), BasicType::Char ),
-                        new ConstantExpr( Constant::from_int( str.size() + 1 /* \0 */ )),
-                        false, false ),
-                std::string("\"") + str + "\"", (unsigned long long int)0 );
 }
 
@@ -74 +55 @@
 unsigned long long Constant::get_ival() const {
         assertf( strict_dynamic_cast<BasicType*>(type)->isInteger(), "Attempt to retrieve ival from non-integer constant." );
-        return val.ival;
-}
-
-double Constant::get_dval() const {
-        assertf( ! strict_dynamic_cast<BasicType*>(type)->isInteger(), "Attempt to retrieve dval from integer constant." );
-        return val.dval;
+        return ival.value();
 }
 
 void Constant::print( std::ostream &os, Indenter ) const {
-        os << "(" << rep << " " << val.ival;
+        os << "(" << rep << " " << (ival ? toString(ival.value()) : "") ;
         if ( type ) {
                 os << ": ";

src/SynTree/Constant.h

@@ -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 );
         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.
@@ -63 +56 @@
         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;
+
+        friend class ConverterOldToNew;
 };