Changeset 51b8582

Timestamp:

Feb 16, 2022, 11:33:08 AM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

7d7ef6f

Parents:

9490621

Message:

So it was a bug in old code that seemed to be cancelling itself out but the new version does not have it. This solution got everything but one test (a polymorphic function calling itself) working.

Location:

src

Files:

• SynTree/TypeSubstitution.cc (modified) (2 diffs)
• Validate/ForallPointerDecay.cpp (modified) (3 diffs)

src/SynTree/TypeSubstitution.cc

@@ -146 +146 @@
 }
 
+static bool are_same( TypeInstType * left, TypeInstType * right ) {
+        if ( left->baseType && right->baseType ) {
+                return left->baseType == right->baseType;
+        } else {
+                return left->name == right->name;
+        }
+}
+
 Type * TypeSubstitution::Substituter::postmutate( TypeInstType *inst ) {
         BoundVarsType::const_iterator bound = boundVars.find( inst->name );
@@ -158 +166 @@
                 // TODO: investigate preventing type variables from being bound to themselves in the first place.
                 if ( TypeInstType * replacement = dynamic_cast< TypeInstType * >( i->second ) ) {
-                        if ( inst->name == replacement->name ) {
+                        if ( are_same( inst, replacement ) ) {
                                 return inst;
                         }

src/Validate/ForallPointerDecay.cpp

@@ -177 +177 @@
                 }
                 auto mut = ast::mutate( decl );
-                //mut->assertions = expandAssertions( decl->assertions );
-                mut->assertions = expandAssertions_DR( decl->type_params, decl->assertions );
+                mut->assertions = expandAssertions( decl->assertions );
                 auto mutType = ast::mutate( mut->type.get() );
                 // *
@@ -209 +208 @@
                 }
                 return ast::mutate_field( decl, &ast::StructDecl::params,
-                        //expandTypeDecls( decl->params ) );
-                        expandTypeDecls_DR( decl->params ) );
+                        expandTypeDecls( decl->params ) );
         }
 
@@ -218 +216 @@
                 }
                 return ast::mutate_field( decl, &ast::UnionDecl::params,
-                        //expandTypeDecls( decl->params ) );
-                        expandTypeDecls_DR( decl->params ) );
+                        expandTypeDecls( decl->params ) );
         }
 };