Changeset 24d6572 for src/InitTweak/FixInit.cc

Timestamp:

Jun 12, 2023, 2:45:32 PM (2 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ast-experimental, master

Children:

62d62db

Parents:

34b4268 (diff), 251ce80 (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' into ast-experimental

File:

• src/InitTweak/FixInit.cc (modified) (3 diffs)

src/InitTweak/FixInit.cc

@@ -32 +32 @@
 #include "Common/PassVisitor.h"        // for PassVisitor, WithStmtsToAdd
 #include "Common/SemanticError.h"      // for SemanticError
+#include "Common/ToString.hpp"         // for toCString
 #include "Common/UniqueName.h"         // for UniqueName
-#include "Common/utility.h"            // for CodeLocation, ValueGuard, toSt...
 #include "FixGlobalInit.h"             // for fixGlobalInit
 #include "GenInit.h"                   // for genCtorDtor
@@ -39 +39 @@
 #include "InitTweak.h"                 // for getFunctionName, getCallArg
 #include "ResolvExpr/Resolver.h"       // for findVoidExpression
-#include "ResolvExpr/typeops.h"        // for typesCompatible
+#include "ResolvExpr/Unify.h"          // for typesCompatible
 #include "SymTab/Autogen.h"            // for genImplicitCall
 #include "SymTab/Indexer.h"            // for Indexer
@@ -1233 +1233 @@
                 }
 
-                template< typename Visitor, typename... Params >
-                void error( Visitor & v, CodeLocation loc, const Params &... params ) {
-                        SemanticErrorException err( loc, toString( params... ) );
-                        v.errors.append( err );
-                }
-
                 template< typename... Params >
                 void GenStructMemberCalls::emit( CodeLocation loc, const Params &... params ) {
-                        // toggle warnings vs. errors here.
-                        // warn( params... );
-                        error( *this, loc, params... );
+                        SemanticErrorException err( loc, toString( params... ) );
+                        errors.append( err );
                 }