Changeset ba4a1d8

Timestamp:

Jul 30, 2018, 4:43:48 PM (6 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

04e367c

Parents:

5cbacf1

git-author:

Rob Schluntz <rschlunt@…> (07/30/18 16:42:49)

git-committer:

Rob Schluntz <rschlunt@…> (07/30/18 16:43:48)

Message:

Use eval in CurrentObject?

File:

• src/ResolvExpr/CurrentObject.cc (modified) (1 diff)

src/ResolvExpr/CurrentObject.cc

@@ -150 +150 @@
 
         private:
-                void setSize( Expression * expr ) {
-                        if ( ConstantExpr * constExpr = dynamic_cast< ConstantExpr * >( expr ) ) {
-                                try {
-                                        size = constExpr->intValue();
-                                        PRINT( std::cerr << "array type with size: " << size << std::endl; )
-                                } catch ( SemanticErrorException & ) {
-                                        SemanticError( expr, "Constant expression of non-integral type in array dimension: " );
-                                }
-                        }       else if ( CastExpr * castExpr = dynamic_cast< CastExpr * >( expr ) ) {
-                                setSize( castExpr->get_arg() ); // xxx - need to perform the conversion specified by the cast
-                        } else if ( VariableExpr * varExpr = dynamic_cast< VariableExpr * >( expr ) ) {
-                                if ( EnumInstType * inst = dynamic_cast< EnumInstType * > ( varExpr->result ) ) {
-                                        long long int value;
-                                        if ( inst->baseEnum->valueOf( varExpr->var, value ) ) {
-                                                size = value;
-                                        }
-                                }
+                void setSize( Expression * expr ) { // replace this logic with an eval call
+                        auto res = eval(expr);
+                        if (res.second) {
+                                size = res.first;
                         } else {
-                                assertf( false, "unhandled expression in setSize: %s", toString( expr ).c_str() ); // xxx - if not a constant expression, it's not simple to determine how long the array actually is, which is necessary for initialization to be done correctly -- fix this
+                                SemanticError( expr->location, toString("Array designator must be a constant expression: ", expr) );
                         }
                 }