Changes in src/ResolvExpr/CurrentObject.cc [699a97d:8f557161]

File:

• src/ResolvExpr/CurrentObject.cc (modified) (2 diffs)

src/ResolvExpr/CurrentObject.cc

@@ -689 +689 @@
 
                         auto arg = eval( expr );
-                        index = arg.first;
+                        assertf( arg.hasKnownValue, "Non-evaluable expression made it to IndexIterator" );
+                        index = arg.knownValue;
 
                         // if ( auto constExpr = dynamic_cast< const ConstantExpr * >( expr ) ) {
@@ -728 +729 @@
                 size_t getSize( const Expr * expr ) {
                         auto res = eval( expr );
-                        if ( !res.second ) {
+                        if ( !res.hasKnownValue ) {
                                 SemanticError( location, toString( "Array designator must be a constant expression: ", expr ) );
                         }
-                        return res.first;
+                        return res.knownValue;
                 }