Changeset c36298d for src/SynTree/Constant.h

Timestamp:

Jun 17, 2019, 11:01:04 AM (7 years ago)

Author:

Michael Brooks <mlbrooks@…>

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:

b4d34fa

Parents:

6a1dfda

Message:

Fixed handling of "literals.cfa" string-detail test cases by simplifying constant analysis. Now a ConstantExpr is a minial passthrough from parser to code generator, with special-case analysis only for integer values. Awareness of how to build a string-constant type is back in ExpressionNode.cc; now, this knowlede is only needed there. AST conversion no longer specializes string-int-float constants; it just converts types and passes values through. Unused constant API features are removed, notably from-to-float and from-string.

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"
@@ -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 & cEscapedVal, Type *charType  );
 
         /// 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;
 };