Changeset 5546eee4 for src/ResolvExpr

Timestamp:

Dec 16, 2023, 1:01:44 AM (2 years 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

Location:

src/ResolvExpr

Files:

• CurrentObject.cc (modified) (2 diffs)
• Resolver.cc (modified) (3 diffs)

src/ResolvExpr/CurrentObject.cc

@@ -9 +9 @@
 // Author           : Rob Schluntz
 // Created On       : Tue Jun 13 15:28:32 2017
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Apr 10  9:40:00 2023
-// Update Count     : 18
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Sat Dec  9 17:49:51 2023
+// Update Count     : 20
 //
 
@@ -181 +181 @@
                 auto res = eval( expr );
                 if ( !res.hasKnownValue ) {
-                        SemanticError( location, toString( "Array designator must be a constant expression: ", expr ) );
+                        SemanticError( location, "Array designator must be a constant expression %s", toString( expr ).c_str() );
                 }
                 return res.knownValue;

src/ResolvExpr/Resolver.cc

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Sun May 17 12:17:01 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed Apr 20 10:41:00 2022
-// Update Count     : 248
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Dec 14 18:44:43 2023
+// Update Count     : 251
 //
 
@@ -632 +632 @@
                                                 maybe_accept( mutDecl->init.get(), res );
                                                 if ( !res.core.result ) {
-                                                        SemanticError( mutDecl, "Cannot include designations in the initializer for a managed Object. If this is really what you want, then initialize with @=.\n" );
+                                                        SemanticError( mutDecl, "Cannot include designations in the initializer for a managed Object.\n"
+                                                                                   "If this is really what you want, initialize with @=." );
                                                 }
                                         }
@@ -958 +959 @@
                                                                 ++n_mutex_param;
 
-                                                                // Check if the argument matches the parameter type in the current
-                                                                // scope
+                                                                // Check if the argument matches the parameter type in the current scope.
                                                                 // ast::ptr< ast::Type > paramType = (*param)->get_type();
+
                                                                 if (
                                                                         ! unify(