Changeset fa761c2

Timestamp:

Nov 1, 2023, 10:40:54 AM (7 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

be3f163

Parents:

6e7ed0aa

Message:

Changed some new uses of UniqueId? to the ast version. Changed where some debugging variables are stored.

Location:

src

Files:

• InitTweak/FixInit.cc (modified) (1 diff)
• InitTweak/FixInitNew.cpp (modified) (1 diff)
• ResolvExpr/CandidateFinder.cpp (modified) (2 diffs)
• ResolvExpr/SatisfyAssertions.cpp (modified) (2 diffs)

src/InitTweak/FixInit.cc

@@ -58 +58 @@
 #include "Validate/FindSpecialDecls.h" // for dtorStmt, dtorStructDestroy
 
-bool ctordtorp = false; // print all debug
-bool ctorp = false; // print ctor debug
-bool cpctorp = false; // print copy ctor debug
-bool dtorp = false; // print dtor debug
+extern bool ctordtorp; // print all debug
+extern bool ctorp; // print ctor debug
+extern bool cpctorp; // print copy ctor debug
+extern bool dtorp; // print dtor debug
 #define PRINT( text ) if ( ctordtorp ) { text }
 #define CP_CTOR_PRINT( text ) if ( ctordtorp || cpctorp ) { text }

src/InitTweak/FixInitNew.cpp

@@ -33 +33 @@
 #include "SymTab/GenImplicitCall.hpp"  // for genImplicitCall
 
-extern bool ctordtorp; // print all debug
-extern bool ctorp; // print ctor debug
-extern bool cpctorp; // print copy ctor debug
-extern bool dtorp; // print dtor debug
+bool ctordtorp = false; // print all debug
+bool ctorp = false; // print ctor debug
+bool cpctorp = false; // print copy ctor debug
+bool dtorp = false; // print dtor debug
 #define PRINT( text ) if ( ctordtorp ) { text }
 #define CP_CTOR_PRINT( text ) if ( ctordtorp || cpctorp ) { text }

src/ResolvExpr/CandidateFinder.cpp

@@ -57 +57 @@
 
 /// Unique identifier for matching expression resolutions to their requesting expression
-UniqueId globalResnSlot = 0;
+ast::UniqueId globalResnSlot = 0;
 
 namespace {
@@ -686 +686 @@
         void Finder::inferParameters( CandidateRef & newCand, CandidateList & out ) {
                 // Set need bindings for any unbound assertions
-                UniqueId crntResnSlot = 0; // matching ID for this expression's assertions
+                ast::UniqueId crntResnSlot = 0; // matching ID for this expression's assertions
                 for ( auto & assn : newCand->need ) {
                         // skip already-matched assertions

src/ResolvExpr/SatisfyAssertions.cpp

@@ -51 +51 @@
 
 // in CandidateFinder.cpp; unique ID for assertion satisfaction
-extern UniqueId globalResnSlot;
+extern ast::UniqueId globalResnSlot;
 
 namespace {
@@ -298 +298 @@
                         if ( !expr->inferred.hasSlots() ) return expr;
                         // if ( expr->inferred.mode != ast::Expr::InferUnion::Slots ) return expr;
-                        std::vector<UniqueId> missingSlots;
+                        std::vector<ast::UniqueId> missingSlots;
                         // find inferred parameters for resolution slots
                         ast::InferredParams * newInferred = new ast::InferredParams();
-                        for ( UniqueId slot : expr->inferred.resnSlots() ) {
+                        for ( ast::UniqueId slot : expr->inferred.resnSlots() ) {
                                 // fail if no matching assertions found
                                 auto it = inferred.find( slot );