Changes in src/GenPoly/Box.cpp [be4335b:9ddcee1]

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, ...
@@ -237 +236 @@
         ) );
         // TODO: Polymorphic types will be out of the struct declaration scope.
-        // This breaks invariants until it is corrected later.
+        // Should be removed by PolyGenericCalculator.
         for ( auto const & member : enumerate( decl->members ) ) {
                 auto dwt = member.val.strict_as<ast::DeclWithType>();
@@ -310 +309 @@
         ) );
         // 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>();
@@ -577 +575 @@
                 if ( adapters.contains( mangleName ) ) continue;
                 std::string adapterName = makeAdapterName( mangleName );
-                // NODE: This creates floating nodes, breaking invariants.
-                // This is corrected in the RewireAdapters sub-pass.
+                // TODO: The forwarding here is problematic because these
+                // declarations are not rooted anywhere in the translation unit.
                 adapters.insert(
                         mangleName,
@@ -641 +639 @@
 
         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 {
@@ -1836 +1837 @@
 
         // Not all members of a polymorphic type are themselves of a polymorphic
-        // type; in this case the member expression should be wrapped and
+        // type; in this cas the member expression should be wrapped and
         // dereferenced to form an lvalue.
         if ( !isPolyType( memberType, scopeTypeVars ) ) {