Changeset 455a7d5 for src/SynTree/AggregateDecl.cc

Timestamp:

Aug 9, 2018, 6:35:02 PM (7 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

ea5b7d6

Parents:

fb975a50 (diff), 0c827019 (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 jenkins-sandbox

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() ) {
@@ -108 +93 @@
                         if ( field->init ) {
                                 SingleInit * init = strict_dynamic_cast< SingleInit * >( field->init );
-                                currentValue = getConstValue( init->value );
+                                auto result = eval( init->value );
+                                if ( ! result.second ) SemanticError( init->location, toString( "Non-constexpr in initialization of enumerator: ", field ) );
+                                currentValue = result.first;
                         }
                         assertf( enumValues.count( field->name ) == 0, "Enum %s has multiple members with the name %s", name.c_str(), field->name.c_str() );