Changes in src/SynTree/AggregateDecl.cc [ac3362c:0690350]

File:

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

src/SynTree/AggregateDecl.cc

@@ -86 +86 @@
 std::string TraitDecl::typeString() const { return "trait"; }
 
+namespace {
+        long long int getConstValue( Expression * expr ) {
+                if ( CastExpr * castExpr = dynamic_cast< CastExpr * > ( expr ) ) {
+                        return getConstValue( castExpr->arg );
+                } else if ( ConstantExpr * constExpr = dynamic_cast< ConstantExpr * >( expr ) ) {
+                        return constExpr->intValue();
+                // can be -1, +1, etc.
+                // } else if ( UntypedExpr * untypedExpr = dynamic_cast< UntypedExpr * >( expr ) ) {
+                //      if ( untypedExpr-> )
+                } else {
+                        assertf( false, "Unhandled expression type in getConstValue for enumerators: %s", toString( expr ).c_str() );
+                }
+        }
+}
+
 bool EnumDecl::valueOf( Declaration * enumerator, long long int & value ) {
         if ( enumValues.empty() ) {
@@ -93 +108 @@
                         if ( field->init ) {
                                 SingleInit * init = strict_dynamic_cast< SingleInit * >( field->init );
-                                auto result = eval( init->value );
-                                if ( ! result.second ) SemanticError( init->location, toString( "Non-constexpr in initialization of enumerator: ", field ) );
-                                currentValue = result.first;
+                                currentValue = getConstValue( init->value );
                         }
                         assertf( enumValues.count( field->name ) == 0, "Enum %s has multiple members with the name %s", name.c_str(), field->name.c_str() );