Changeset 90152a4 for src/SynTree/AggregateDecl.cc

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, arm-eh, ast-experimental, cleanup-dtors, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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 cleanup-dtors

File:

• src/SynTree/AggregateDecl.cc (modified) (1 diff)

src/SynTree/AggregateDecl.cc

@@ -86 +86 @@
 std::string TraitDecl::typeString() const { return "trait"; }
 
+bool EnumDecl::valueOf( Declaration * enumerator, long long int & value ) {
+        if ( enumValues.empty() ) {
+                long long int currentValue = 0;
+                for ( Declaration * member : members ) {
+                        ObjectDecl * field = strict_dynamic_cast< ObjectDecl * >( member );
+                        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;
+                        }
+                        assertf( enumValues.count( field->name ) == 0, "Enum %s has multiple members with the name %s", name.c_str(), field->name.c_str() );
+                        enumValues[ field->name ] = currentValue;
+                        ++currentValue;
+                }
+        }
+        if ( enumValues.count( enumerator->name ) ) {
+                value = enumValues[ enumerator->name ];
+                return true;
+        }
+        return false;
+}
+
 // Local Variables: //
 // tab-width: 4 //