Changeset 982f95d for src/ResolvExpr/PtrsCastable.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/PtrsCastable.cc (modified) (3 diffs)

src/ResolvExpr/PtrsCastable.cc

@@ -15 +15 @@
 
 #include "Common/PassVisitor.h"
-#include "ResolvExpr/TypeEnvironment.h"  // for EqvClass, TypeEnvironment
+#include "ResolvExpr/TypeEnvironment.h"  // for ClassRef, TypeEnvironment
 #include "SymTab/Indexer.h"              // for Indexer
 #include "SynTree/Declaration.h"         // for TypeDecl, TypeDecl::Kind::Ftype
@@ -63 +63 @@
                                                 } // if
                                         } //if
-                                } else if ( const EqvClass *eqvClass = env.lookup( typeInst->get_name() ) ) {
-                                        if ( eqvClass->data.kind == TypeDecl::Ftype ) {
+                                } else if ( ClassRef eqvClass = env.lookup( typeInst->get_name() ) ) {
+                                        if ( eqvClass.get_bound().data.kind == TypeDecl::Ftype ) {
                                                 return -1;
                                         } // if
@@ -78 +78 @@
         int ptrsCastable( Type *src, Type *dest, const TypeEnvironment &env, const SymTab::Indexer &indexer ) {
                 if ( TypeInstType *destAsTypeInst = dynamic_cast< TypeInstType* >( dest ) ) {
-                        if ( const EqvClass *eqvClass = env.lookup( destAsTypeInst->get_name() ) ) {
+                        if ( ClassRef eqvClass = env.lookup( destAsTypeInst->get_name() ) ) {
                                 // xxx - should this be ptrsCastable?
-                                return ptrsAssignable( src, eqvClass->type, env );
+                                return ptrsAssignable( src, eqvClass.get_bound().type, env );
                         } // if
                 } // if