Changes in src/SynTree/Expression.cc [ddb80bd:487845d7]

File:

• src/SynTree/Expression.cc (modified) (2 diffs)

src/SynTree/Expression.cc

@@ -83 +83 @@
 }
 
-long long int ConstantExpr::intValue() const {
-        if ( BasicType * basicType = dynamic_cast< BasicType * >( result ) ) {
-                if ( basicType->isInteger() ) {
-                        return get_constant()->get_ival();
-                }
-        } else if ( dynamic_cast< OneType * >( result ) ) {
-                return 1;
-        } else if ( dynamic_cast< ZeroType * >( result ) ) {
-                return 0;
-        }
-        throw SemanticError( "Constant expression of non-integral type ", this );
-}
-
 VariableExpr::VariableExpr( DeclarationWithType *_var ) : Expression(), var( _var ) {
         assert( var );
@@ -602 +589 @@
         if ( ! body.empty() ) {
                 if ( ExprStmt * exprStmt = dynamic_cast< ExprStmt * >( body.back() ) ) {
-                        result = maybeClone( exprStmt->expr->result );
+                        set_result( maybeClone( exprStmt->get_expr()->get_result() ) );
                 }
         }
         // ensure that StmtExpr has a result type
         if ( ! result ) {
-                result = new VoidType( Type::Qualifiers() );
+                set_result( new VoidType( Type::Qualifiers() ) );
         }
 }