Changeset 982f95d for src/ResolvExpr/PtrsAssignable.cc

Timestamp:

Jun 15, 2018, 5:09:29 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env

Children:

97397a26

Parents:

1d7b0a8

Message:

Start of new environment implementation; terribly broken

File:

• src/ResolvExpr/PtrsAssignable.cc (modified) (3 diffs)

src/ResolvExpr/PtrsAssignable.cc

@@ -15 +15 @@
 
 #include "Common/PassVisitor.h"
-#include "ResolvExpr/TypeEnvironment.h"  // for EqvClass, TypeEnvironment
+#include "ResolvExpr/TypeEnvironment.h"  // for ClassRef, TypeEnvironment
 #include "SynTree/Type.h"                // for TypeInstType, Type, BasicType
 #include "SynTree/Visitor.h"             // for Visitor
@@ -51 +51 @@
                 // std::cerr << "assignable: " << src << " | " << dest << std::endl;
                 if ( TypeInstType *destAsTypeInst = dynamic_cast< TypeInstType* >( dest ) ) {
-                        if ( const EqvClass *eqvClass = env.lookup( destAsTypeInst->get_name() ) ) {
-                                return ptrsAssignable( src, eqvClass->type, env );
+                        if ( ClassRef eqvClass = env.lookup( destAsTypeInst->get_name() ) ) {
+                                return ptrsAssignable( src, eqvClass.get_bound().type, env );
                         } // if
                 } // if
@@ -94 +94 @@
         void PtrsAssignable::postvisit(  __attribute__((unused)) TraitInstType *inst ) {}
         void PtrsAssignable::postvisit( TypeInstType *inst ) {
-                if ( const EqvClass *eqvClass = env.lookup( inst->get_name() ) ) {
-                        if ( eqvClass->type ) {
+                if ( ClassRef eqvClass = env.lookup( inst->get_name() ) ) {
+                        if ( Type* boundTy = eqvClass.get_bound().type ) {
                                 // T * = S * for any S depends on the type bound to T
-                                result = ptrsAssignable( eqvClass->type, dest, env );
+                                result = ptrsAssignable( boundTy, dest, env );
                         }
                 } // if