Changeset 5668740 for src/AST/Decl.cpp

Timestamp:

Jun 14, 2023, 11:35:49 AM (13 months ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

7e4bd9b6

Parents:

32a4f3e (diff), 8f557161 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/AST/Decl.cpp (modified) (1 diff)

src/AST/Decl.cpp

@@ -142 +142 @@
 bool EnumDecl::valueOf( const Decl * enumerator, long long& value ) const {
         if ( enumValues.empty() ) {
-                long long crntVal = 0;
+                Evaluation crntVal = {0, true, true};  // until expression is given, we know to start counting from 0
                 for ( const Decl * member : members ) {
                         const ObjectDecl* field = strict_dynamic_cast< const ObjectDecl* >( member );
                         if ( field->init ) {
                                 const SingleInit * init = strict_dynamic_cast< const SingleInit* >( field->init.get() );
-                                auto result = eval( init->value );
-                                if ( ! result.second ) {
+                                crntVal = eval( init->value );
+                                if ( ! crntVal.isEvaluableInGCC ) {
                                         SemanticError( init->location, ::toString( "Non-constexpr in initialization of "
                                                 "enumerator: ", field ) );
                                 }
-                                crntVal = result.first;
                         }
                         if ( enumValues.count( field->name ) != 0 ) {
                                 SemanticError( location, ::toString( "Enum ", name, " has multiple members with the "   "name ", field->name ) );
                         }
-                        enumValues[ field->name ] = crntVal;
-                        ++crntVal;
+                        if (crntVal.hasKnownValue) {
+                                enumValues[ field->name ] = crntVal.knownValue;
+                        }
+                        ++crntVal.knownValue;
                 }
         }