Changeset 5546eee4 for src/AST

Timestamp:

Dec 16, 2023, 1:01:44 AM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master, stuck-waitfor-destruct

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

Location:

src/AST

Files:

• Decl.cpp (modified) (2 diffs)
• Expr.cpp (modified) (3 diffs)
• LinkageSpec.cpp (modified) (2 diffs)
• TypeSubstitution.hpp (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) {

src/AST/Expr.cpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Wed May 15 17:00:00 2019
-// Last Modified By : Andrew Beach
+// Last Modified By : Peter A. Buhr
 // Created On       : Wed May 18 13:56:00 2022
-// Update Count     : 8
+// Update Count     : 12
 //
 
@@ -168 +168 @@
                         return addrType( refType->base );
                 } else {
-                        SemanticError( loc, arg->result.get(),
-                                "Attempt to take address of non-lvalue expression: " );
+                        SemanticError( loc, "Attempt to take address of non-lvalue expression %s",
+                                                   toString( arg->result.get() ).c_str() );
                 }
         }
@@ -240 +240 @@
                 return 1;
         }
-        SemanticError( this, "Constant expression of non-integral type " );
+        SemanticError( this->location, "Constant expression of non-integral type %s",
+                                   toString( this ).c_str() );
 }
 

src/AST/LinkageSpec.cpp

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Thu May 9 10:00:00 2019
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Thu May 9 10:00:00 2019
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Dec 11 16:08:58 2023
+// Update Count     : 2
 //
 
@@ -37 +37 @@
                 return spec;
         } else {
-                SemanticError( loc, "Invalid linkage specifier " + *cmd );
+                SemanticError( loc, "Invalid linkage specifier %s", cmd->c_str() );
         }
 }

src/AST/TypeSubstitution.hpp

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr May 25 12:31:00 2023
-// Update Count     : 10
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Dec 11 16:07:30 2023
+// Update Count     : 15
 //
 
@@ -156 +156 @@
                                 } // if
                         } else {
-                                SemanticError( formal, toString( "Attempt to provide non-type parameter: ", toString( *actualIt ).c_str(), " for type parameter " ) );
+                                SemanticError( formal->location, "Attempt to provide non-type parameter %s for type parameter %s",
+                                                           toString( *actualIt ).c_str(), formal->name.c_str() );
                         } // if
                 } else {