Changeset 5546eee4 for src/AST/Decl.cpp

Timestamp:

Dec 16, 2023, 1:01:44 AM (22 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

b7898ac

Parents:

0fa0201d (diff), 69ab896 (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) (2 diffs)

src/AST/Decl.cpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Thu May 9 10:00:00 2019
-// Last Modified By : Andrew Beach
-// Last Modified On : Thu May  5 12:10:00 2022
-// Update Count     : 24
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Dec  9 16:28:51 2023
+// Update Count     : 31
 //
 
@@ -113 +113 @@
 // --- EnumDecl
 
-bool EnumDecl::valueOf( const Decl * enumerator, long long& value ) const {
+bool EnumDecl::valueOf( const Decl * enumerator, long long & value ) const {
         if ( enumValues.empty() ) {
                 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 );
+                        const ObjectDecl * field = strict_dynamic_cast< const ObjectDecl * >( member );
                         if ( field->init ) {
-                                const SingleInit * init = strict_dynamic_cast< const SingleInit* >( field->init.get() );
+                                const SingleInit * init = strict_dynamic_cast< const SingleInit * >( field->init.get() );
                                 crntVal = eval( init->value );
                                 if ( ! crntVal.isEvaluableInGCC ) {
-                                        SemanticError( init->location, ::toString( "Non-constexpr in initialization of "
-                                                "enumerator: ", field ) );
+                                        SemanticError( init->location, "Non-constexpr in initialization of enumerator %s", field->name.c_str() );
                                 }
                         }
                         if ( enumValues.count( field->name ) != 0 ) {
-                                SemanticError( location, ::toString( "Enum ", name, " has multiple members with the "   "name ", field->name ) );
+                                SemanticError( location, "Enum %s has multiple members with %s", name.c_str(), field->name.c_str() );
                         }
                         if (crntVal.hasKnownValue) {