Changeset 1ee0a4da for src/GenPoly/InstantiateGenericNew.cpp

Timestamp:

Oct 3, 2023, 10:58:40 AM (10 months ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

master

Children:

cf34e82

Parents:

46f9f02

Message:

Translated the box pass to the new AST. This includes direct as possible translations of the existing passes are two fix in passes which correct AST problems the direct translation causes. Outside the box pass there have already been many changes, ad there is another in Instantiate Generics, which disconnects designators instead of leaving them connected to the original polymorphic type, which breaks the invarants once the fields are removed in the Eraser sub-pass. There was also a change that was made and un-made in one commit. If translate from the new-AST to the old-AST part way you must, where possible, sort the TypeEnvKey? values by string comparison. However, it now passes over that so it would be just extra complexity and run time, so I removed it. I stand at the exit from a great woods, just shy of a year from when I entered it. It has been a difficult and tiring journey. The path has been long and at times comically winding; but most often it was invisible, hidden under an impenetrable canopy and I spend days looking for it. All for a short jog forward before getting lost again. In front of me is another woods. It looks smaller, but I can't see the other side. Anyways, time to keep walking.

File:

• src/GenPoly/InstantiateGenericNew.cpp (modified) (3 diffs)

src/GenPoly/InstantiateGenericNew.cpp

@@ -335 +335 @@
 ast::Expr const * FixDtypeStatic::postvisit( ast::MemberExpr const * expr ) {
         ast::ptr<ast::Type> const & type = expr->aggregate->result;
-        if ( !isGenericType( type ) ) {
-                return expr;
-        } else if ( auto inst = type.as<ast::StructInstType>() ) {
-                return fixMemberExpr( inst, expr );
+        if ( auto inst = type.as<ast::StructInstType>() ) {
+                if ( !inst->params.empty() ) return fixMemberExpr( inst, expr );
         } else if ( auto inst = type.as<ast::UnionInstType>() ) {
-                return fixMemberExpr( inst, expr );
+                if ( !inst->params.empty() ) return fixMemberExpr( inst, expr );
         }
         return expr;
@@ -451 +449 @@
         ast::Expr const * postvisit( ast::MemberExpr const * expr );
         ast::Expr const * postvisit( ast::Expr const * expr );
-        void previsit( ast::ParseNode const * node );
-
+        ast::Designation const * postvisit( ast::Designation const * );
+
+        void previsit( ast::ParseNode const * node ) {
+                GuardValue( location ) = &node->location;
+        }
         void previsit( ast::FunctionType const * ) {
                 GuardValue( inFunctionType ) = true;
@@ -628 +629 @@
 }
 
-void GenericInstantiator::previsit( ast::ParseNode const * node ) {
-        GuardValue( location ) = &node->location;
+// This attempts to figure out what the final name of the field will be.
+// Pretty printing can cause this to become incorrect.
+std::string getPrintName( ast::DeclWithType const * decl ) {
+        return ( decl->linkage.is_mangled )
+                ? decl->scopedMangleName() : decl->name;
+}
+
+ast::Designation const * GenericInstantiator::postvisit(
+                ast::Designation const * designation ) {
+        // Disconnect designator names from their fields.
+        // It is now incorrect to point at the generic definition where the used
+        // type now is replaced with a concrete instance. Ideally, new variable
+        // expressions would point at fields in the concrete instances, but that
+        // is work and that information should not be needed this late in
+        // compilation.
+
+        // Modify all designations, even if not needed.
+        auto mutNode = mutate( designation );
+        for ( ast::ptr<ast::Expr> & designator : mutNode->designators ) {
+                if ( auto var = designator.as<ast::VariableExpr>() ) {
+                        designator = new ast::NameExpr(
+                                var->location, getPrintName( var->var ) );
+                }
+        }
+        return mutNode;
 }