Changeset be4335b

Timestamp:

Feb 2, 2024, 6:31:52 PM (11 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

47bd204

Parents:

bd67442

Message:

The remaining improvements I had planned for the Box pass are either very hard or (on reflection) of questionable value, and none are required. Cleans up some loose threads before I may move on.

File:

• src/GenPoly/Box.cpp (modified) (7 diffs)

src/GenPoly/Box.cpp

@@ -25 +25 @@
 #include "AST/GenericSubstitution.hpp" // for genericSubstitution
 #include "CodeGen/OperatorTable.h"     // for isAssignment
+#include "Common/Iterate.hpp"          // for group_iterate
 #include "Common/ScopedMap.h"          // for ScopedMap
+#include "Common/ToString.hpp"         // for toCString
 #include "Common/UniqueName.h"         // for UniqueName
-#include "Common/utility.h"            // for toCString, group_iterate
 #include "GenPoly/FindFunction.h"      // for findFunction
 #include "GenPoly/GenPoly.h"           // for getFunctionType, ...
@@ -236 +237 @@
         ) );
         // TODO: Polymorphic types will be out of the struct declaration scope.
-        // Should be removed by PolyGenericCalculator.
+        // This breaks invariants until it is corrected later.
         for ( auto const & member : enumerate( decl->members ) ) {
                 auto dwt = member.val.strict_as<ast::DeclWithType>();
@@ -309 +310 @@
         ) );
         // TODO: Polymorphic types will be out of the union declaration scope.
+        // This breaks invariants until it is corrected later.
         for ( auto const & member : decl->members ) {
                 auto dwt = member.strict_as<ast::DeclWithType>();
@@ -575 +577 @@
                 if ( adapters.contains( mangleName ) ) continue;
                 std::string adapterName = makeAdapterName( mangleName );
-                // TODO: The forwarding here is problematic because these
-                // declarations are not rooted anywhere in the translation unit.
+                // NODE: This creates floating nodes, breaking invariants.
+                // This is corrected in the RewireAdapters sub-pass.
                 adapters.insert(
                         mangleName,
@@ -639 +641 @@
 
         TypeVarMap exprTypeVars;
-        // TODO: Should this take into account the variables already bound in
-        // scopeTypeVars ([ex] remove them from exprTypeVars)?
         makeTypeVarMap( function, exprTypeVars );
         auto dynRetType = isDynRet( function, exprTypeVars );
@@ -1521 +1521 @@
 
 // --------------------------------------------------------------------------
-// TODO: Ideally, there would be no floating nodes at all.
 /// Corrects the floating nodes created in CallAdapter.
 struct RewireAdapters final : public ast::WithGuards {
@@ -1837 +1836 @@
 
         // Not all members of a polymorphic type are themselves of a polymorphic
-        // type; in this cas the member expression should be wrapped and
+        // type; in this case the member expression should be wrapped and
         // dereferenced to form an lvalue.
         if ( !isPolyType( memberType, scopeTypeVars ) ) {