Changes in src/AST/Expr.cpp [60aaa51d:c36298d]

File:

• src/AST/Expr.cpp (modified) (5 diffs)

src/AST/Expr.cpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Wed May 15 17:00:00 2019
-// Last Modified By : Aaron B. Moss
-// Created On       : Wed May 15 17:00:00 2019
-// Update Count     : 1
+// Last Modified By : Andrew Beach
+// Created On       : Thr Jun 13 13:38:00 2019
+// Update Count     : 2
 //
 
@@ -194 +194 @@
         if ( const BasicType * bty = result.as< BasicType >() ) {
                 if ( bty->isInteger() ) {
-                        return val.ival;
+                        assert(ival);
+                        return ival.value();
                 }
         } else if ( result.as< ZeroType >() ) {
@@ -204 +205 @@
 }
 
-double ConstantExpr::floatValue() const {
-        if ( const BasicType * bty = result.as< BasicType >() ) {
-                if ( ! bty->isInteger() ) {
-                        return val.dval;
-                }
-        }
-        SemanticError( this, "Constant expression of non-floating-point type " );
-}
-
 ConstantExpr * ConstantExpr::from_bool( const CodeLocation & loc, bool b ) {
         return new ConstantExpr{
                 loc, new BasicType{ BasicType::Bool }, b ? "1" : "0", (unsigned long long)b };
-}
-
-ConstantExpr * ConstantExpr::from_char( const CodeLocation & loc, char c ) {
-        return new ConstantExpr{
-                loc, new BasicType{ BasicType::Char }, std::to_string( c ), (unsigned long long)c };
 }
 
@@ -232 +219 @@
                 loc, new BasicType{ BasicType::LongUnsignedInt }, std::to_string( i ),
                 (unsigned long long)i };
-}
-
-ConstantExpr * ConstantExpr::from_double( const CodeLocation & loc, double d ) {
-        return new ConstantExpr{ loc, new BasicType{ BasicType::Double }, std::to_string( d ), d };
-}
-
-ConstantExpr * ConstantExpr::from_string( const CodeLocation & loc, const std::string & s ) {
-        return new ConstantExpr{
-                loc,
-                new ArrayType{
-                        new BasicType{ BasicType::Char, CV::Const },
-                        ConstantExpr::from_int( loc, s.size() + 1 /* null terminator */ ),
-                        FixedLen, DynamicDim },
-                std::string{"\""} + s + "\"",
-                (unsigned long long)0,
-                ConstantExpr::String };
 }
 
@@ -382 +353 @@
 
 UniqueExpr::UniqueExpr( const CodeLocation & loc, const Expr * e, unsigned long long i )
-: Expr( loc, e->result ), id( i ) {
+: Expr( loc, e->result ), expr( e ), id( i ) {
         assert( expr );
         if ( id == -1ull ) {