Changeset 3bbd012 for src/ResolvExpr

Timestamp:

Jul 31, 2018, 2:43:04 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:

642bc83

Parents:

d1e0979 (diff), 04e367c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into demangler

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (2 diffs)
• CurrentObject.cc (modified) (2 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -25 +25 @@
 #include <vector>                  // for vector
 
+#include "CompilationState.h"      // for resolvep
 #include "Alternative.h"           // for AltList, Alternative
 #include "AlternativeFinder.h"
@@ -49 +50 @@
 #include "typeops.h"               // for adjustExprType, polyCost, castCost
 
-bool resolvep;
 #define PRINT( text ) if ( resolvep ) { text }
 //#define DEBUG_COST

src/ResolvExpr/CurrentObject.cc

@@ -139 +139 @@
                 ArrayIterator( ArrayType * at ) : array( at ) {
                         PRINT( std::cerr << "Creating array iterator: " << at << std::endl; )
-                        base = at->get_base();
+                        base = at->base;
                         memberIter = createMemberIterator( base );
-                        if ( at->isVarLen ) SemanticError( at, "VLA initialization does not support @=" );
-                        setSize( at->get_dimension() );
+                        if ( at->isVarLen ) SemanticError( at, "VLA initialization does not support @=: " );
+                        setSize( at->dimension );
                 }
 
@@ -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) );
                         }
                 }