Changeset c36298d for src/AST/Expr.cpp

Timestamp:

Jun 17, 2019, 11:01:04 AM (6 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/AST/Expr.cpp (modified) (3 diffs)

src/AST/Expr.cpp

@@ -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 };
 }