Changeset 5546eee4 for src/Parser/TypeData.cc

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/Parser/TypeData.cc (modified) (4 diffs)

src/Parser/TypeData.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 15:12:51 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Tue Apr  4 13:39:00 2023
-// Update Count     : 680
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Dec 14 18:59:12 2023
+// Update Count     : 684
 //
 
@@ -864 +864 @@
 
 static string genTSError( string msg, DeclarationNode::BasicType basictype ) {
-        SemanticError( yylloc, string( "invalid type specifier \"" ) + msg + "\" for type \"" + DeclarationNode::basicTypeNames[basictype] + "\"." );
+        SemanticError( yylloc, "invalid type specifier \"%s\" for type \"%s\".", msg.c_str(), DeclarationNode::basicTypeNames[basictype] );
 } // genTSError
 
@@ -1496 +1496 @@
                                 // type set => parameter name already transformed by a declaration names so there is a duplicate
                                 // declaration name attempting a second transformation
-                                if ( param->type ) SemanticError( param->location, string( "duplicate declaration name " ) + *param->name );
+                                if ( param->type ) SemanticError( param->location, "duplicate declaration name \"%s\".", param->name->c_str() );
                                 // declaration type reset => declaration already transformed by a parameter name so there is a duplicate
                                 // parameter name attempting a second transformation
-                                if ( ! decl->type ) SemanticError( param->location, string( "duplicate parameter name " ) + *param->name );
+                                if ( ! decl->type ) SemanticError( param->location, "duplicate parameter name \"%s\".", param->name->c_str() );
                                 param->type = decl->type;                               // set copy declaration type to parameter type
                                 decl->type = nullptr;                                   // reset declaration type
@@ -1507 +1507 @@
                 } // for
                 // declaration type still set => type not moved to a matching parameter so there is a missing parameter name
-                if ( decl->type ) SemanticError( decl->location, string( "missing name in parameter list " ) + *decl->name );
+                if ( decl->type ) SemanticError( decl->location, "missing name in parameter list %s", decl->name->c_str() );
         } // for