Changeset 3e2f5e3 for src

Timestamp:

Jun 24, 2019, 4:11:41 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

28564382, 6c55a3d

Parents:

3623f9d (diff), 1335e6f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src

Files:

• AST/Type.hpp (modified) (1 diff)
• ResolvExpr/CastCost.cc (modified) (6 diffs)
• ResolvExpr/ConversionCost.h (modified) (1 diff)
• ResolvExpr/PtrsAssignable.cc (modified) (2 diffs)
• ResolvExpr/PtrsCastable.cc (modified) (5 diffs)
• ResolvExpr/ResolveTypeof.cc (modified) (4 diffs)
• ResolvExpr/Resolver.cc (modified) (2 diffs)
• ResolvExpr/typeops.h (modified) (1 diff)

src/AST/Type.hpp

@@ -164 +164 @@
         static const char *typeNames[];
 
-        BasicType( Kind k, CV::Qualifiers q = {} ) : Type(q), kind(k) {}
+        BasicType( Kind k, CV::Qualifiers q = {}, std::vector<ptr<Attribute>> && as = {} ) 
+        : Type(q, std::move(as)), kind(k) {}
 
         /// Check if this type represents an integer type

src/ResolvExpr/CastCost.cc

@@ -16 +16 @@
 #include <cassert>                       // for assert
 
+#include "AST/Print.hpp"
+#include "AST/SymbolTable.hpp"
+#include "AST/Type.hpp"
+#include "AST/TypeEnvironment.hpp"
 #include "ConversionCost.h"              // for ConversionCost
 #include "Cost.h"                        // for Cost, Cost::infinity
@@ -31 +35 @@
 
 namespace ResolvExpr {
-        struct CastCost : public ConversionCost {
+        struct CastCost_old : public ConversionCost {
           public:
-                CastCost( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc );
+                CastCost_old( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc );
 
                 using ConversionCost::previsit;
@@ -78 +82 @@
                         });
                 } else {
-                        #warning cast on castCost artifact of having two functions, remove when port done
-                        PassVisitor<CastCost> converter( 
+                        PassVisitor<CastCost_old> converter( 
                                 dest, indexer, env, 
                                 (Cost (*)( Type *, Type *, const SymTab::Indexer &, const TypeEnvironment & ))
@@ -93 +96 @@
         }
 
-        CastCost::CastCost( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc )
+        CastCost_old::CastCost_old( Type *dest, const SymTab::Indexer &indexer, const TypeEnvironment &env, CostFunction costFunc )
                 : ConversionCost( dest, indexer, env, costFunc ) {
         }
 
-        void CastCost::postvisit( BasicType *basicType ) {
+        void CastCost_old::postvisit( BasicType *basicType ) {
                 PointerType *destAsPointer = dynamic_cast< PointerType* >( dest );
                 if ( destAsPointer && basicType->isInteger() ) {
@@ -107 +110 @@
         }
 
-        void CastCost::postvisit( PointerType *pointerType ) {
+        void CastCost_old::postvisit( PointerType *pointerType ) {
                 if ( PointerType *destAsPtr = dynamic_cast< PointerType* >( dest ) ) {
                         if ( pointerType->get_qualifiers() <= destAsPtr->get_qualifiers() && typesCompatibleIgnoreQualifiers( pointerType->base, destAsPtr->base, indexer, env ) ) {
@@ -130 +133 @@
         }
 
-        Cost castCost( 
-                const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab, 
-                const ast::TypeEnvironment & env 
-        ) {
-                #warning unimplmented
-                (void)src; (void)dst; (void)symtab; (void)env;
-                assert(false);
+namespace {
+        struct CastCost_new : public ConversionCost_new {
+                using ConversionCost_new::previsit;
+                using ConversionCost_new::postvisit;
+
+                CastCost_new( 
+                        const ast::Type * dst, const ast::SymbolTable & symtab, 
+                        const ast::TypeEnvironment & env, CostCalculation costFunc )
+                : ConversionCost_new( dst, symtab, env, costFunc ) {}
+
+                void postvisit( const ast::BasicType * basicType ) {
+                        auto ptr = dynamic_cast< const ast::PointerType * >( dst );
+                        if ( ptr && basicType->isInteger() ) {
+                                // needed for, e.g. unsigned long => void *
+                                cost = Cost::unsafe;
+                        } else {
+                                cost = conversionCost( basicType, dst, symtab, env );
+                        }
+                }
+
+                void postvisit( const ast::PointerType * pointerType ) {
+                        if ( auto ptr = dynamic_cast< const ast::PointerType * >( dst ) ) {
+                                if (
+                                        pointerType->qualifiers <= ptr->qualifiers
+                                        && typesCompatibleIgnoreQualifiers( pointerType->base, ptr->base, symtab, env )
+                                ) {
+                                        cost = Cost::safe;
+                                } else {
+                                        ast::TypeEnvironment newEnv{ env };
+                                        if ( auto wParams = pointerType->base.as< ast::ParameterizedType >() ) {
+                                                newEnv.add( wParams->forall );
+                                        }
+                                        int castResult = ptrsCastable( pointerType->base, ptr->base, symtab, newEnv );
+                                        if ( castResult > 0 ) {
+                                                cost = Cost::safe;
+                                        } else if ( castResult < 0 ) {
+                                                cost = Cost::infinity;
+                                        }
+                                }
+                        } else if ( auto basic = dynamic_cast< const ast::BasicType * >( dst ) ) {
+                                if ( basic->isInteger() ) {
+                                        // necessary for, e.g. void * => unsigned long
+                                        cost = Cost::unsafe;
+                                }
+                        }
+                }
+        };
+} // anonymous namespace
+
+Cost castCost( 
+        const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab, 
+        const ast::TypeEnvironment & env 
+) {
+        if ( auto typeInst = dynamic_cast< const ast::TypeInstType * >( dst ) ) {
+                if ( const ast::EqvClass * eqvClass = env.lookup( typeInst->name ) ) {
+                        // check cast cost against bound type, if present
+                        if ( eqvClass->bound ) {
+                                return castCost( src, eqvClass->bound, symtab, env );
+                        } else {
+                                return Cost::infinity;
+                        }
+                } else if ( const ast::NamedTypeDecl * named = symtab.lookupType( typeInst->name ) ) {
+                        // all typedefs should be gone by now
+                        auto type = strict_dynamic_cast< const ast::TypeDecl * >( named );
+                        if ( type->base ) {
+                                return castCost( src, type->base, symtab, env ) + Cost::safe;
+                        }
+                }
+        }
+
+        PRINT(
+                std::cerr << "castCost ::: src is ";
+                ast::print( std::cerr, src );
+                std::cerr << std::endl << "dest is ";
+                ast::print( std::cerr, dst );
+                std::cerr << std::endl << "env is" << std::endl;
+                ast::print( std::cerr, env, 2 );
+        )
+
+        if ( typesCompatibleIgnoreQualifiers( src, dst, symtab, env ) ) {
+                PRINT( std::cerr << "compatible!" << std::endl; )
                 return Cost::zero;
-        }
+        } else if ( dynamic_cast< const ast::VoidType * >( dst ) ) {
+                return Cost::safe;
+        } else if ( auto refType = dynamic_cast< const ast::ReferenceType * >( dst ) ) {
+                PRINT( std::cerr << "conversionCost: dest is reference" << std::endl; )
+                #warning cast on ptrsCastable artifact of having two functions, remove when port done
+                return convertToReferenceCost( 
+                        src, refType, symtab, env, 
+                        ( int (*)( 
+                                const ast::Type *, const ast::Type *, const ast::SymbolTable &, 
+                                const ast::TypeEnvironment & )
+                        ) ptrsCastable );
+        } else {
+                #warning cast on castCost artifact of having two functions, remove when port done
+                ast::Pass< CastCost_new > converter{
+                        dst, symtab, env, 
+                        ( Cost (*)( 
+                                const ast::Type *, const ast::Type *, const ast::SymbolTable &, 
+                                const ast::TypeEnvironment & )
+                        ) castCost };
+                src->accept( converter );
+                return converter.pass.cost;
+        }
+}
+
 } // namespace ResolvExpr
 

src/ResolvExpr/ConversionCost.h

@@ -74 +74 @@
         const ast::SymbolTable &, const ast::TypeEnvironment &)>;
 
-// TODO: When the old ConversionCost is removed, get ride of the _new suffix.
+#warning when the old ConversionCost is removed, get ride of the _new suffix.
 class ConversionCost_new : public ast::WithShortCircuiting {
+protected:
         const ast::Type * dst;
         const ast::SymbolTable & symtab;

src/ResolvExpr/PtrsAssignable.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 11:44:11 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Mar  2 17:36:05 2016
-// Update Count     : 8
-//
-
-#include "AST/Fwd.hpp"
+// Last Modified By : Andrew
+// Last Modified On : Mon Jun 24 15:29:00 2019
+// Update Count     : 9
+//
+
+#include "typeops.h"
+
+#include "AST/Pass.hpp"
+#include "AST/Type.hpp"
+#include "AST/TypeEnvironment.hpp"
 #include "Common/PassVisitor.h"
 #include "ResolvExpr/TypeEnvironment.h"  // for EqvClass, TypeEnvironment
@@ -108 +112 @@
         void PtrsAssignable::postvisit(  __attribute__((unused)) OneType *oneType ) {}
 
+// TODO: Get rid of the `_new` suffix when the old version is removed.
+struct PtrsAssignable_new : public ast::WithShortCircuiting {
+        const ast::Type * dst;
+        const ast::TypeEnvironment & typeEnv;
+        int result;
+
+        PtrsAssignable_new( const ast::Type * dst, const ast::TypeEnvironment & env ) :
+                dst( dst ), typeEnv( env ), result( 0 ) {}
+
+        void previsit( Type * ) { visit_children = false; }
+
+        void postvisit( const ast::EnumInstType * ) {
+                if ( dynamic_cast< const ast::BasicType * >( dst ) ) {
+                        // int * = E *, etc. is safe. This isn't technically correct, as each
+                        // enum has one basic type that it is compatible with, an that type can
+                        // differ from enum to enum. Without replicating GCC's internal logic,
+                        // there is no way to know which type this particular enum is compatible
+                        // with, so punt on this for now.
+                        result = 1;
+                }
+        }
+        void postvisit( const ast::TypeInstType * inst ) {
+                if ( const ast::EqvClass * eqv = typeEnv.lookup( inst->name ) ) {
+                        if ( eqv->bound ) {
+                                // T * = S * for any S depends on the type bound to T
+                                result = ptrsAssignable( eqv->bound, dst, typeEnv );
+                        }
+                }
+        }
+};
+
 int ptrsAssignable( const ast::Type * src, const ast::Type * dst,
                 const ast::TypeEnvironment & env ) {
-        #warning unimplemented
-        (void)src;
-        (void)dst;
-        (void)env;
-        assert(0);
+        if ( const ast::TypeInstType * dstAsInst = dynamic_cast< const ast::TypeInstType * >( dst ) ) {
+                if ( const ast::EqvClass * eqv = env.lookup( dstAsInst->name ) ) {
+                        return ptrsAssignable( src, eqv->bound, env );
+                }
+        }
+        if ( dynamic_cast< const ast::VoidType * >( dst ) ) {
+                return -1;
+        } else {
+                ast::Pass<PtrsAssignable_new> visitor( dst, env );
+                src->accept( visitor );
+                return visitor.pass.result;
+        }
+
+// see ticket #136 (this should be able to replace the visitor).
+#if 0
+        if ( const ast::TypeInstType * dstAsTypeInst =
+                        dynamic_cast< const ast::TypeInstType* >( dst ) ) {
+                if ( const ast::EqvClass * eqv = env.lookup( dstAsTypeInst->get_name() ) ) {
+                        return ptrsAssignable( src, eqv->type, env );
+                } // if
+        } // if
+        if ( dynamic_cast< VoidType* >( dst ) ) {
+                // void * = T * for any T is unsafe
+                // xxx - this should be safe, but that currently breaks the build
+                return -1;
+        } else if ( dynamic_cast< EnumInstType * >( src ) ) {
+                if ( dynamic_cast< BasicType * >( dst ) ) {
+                        // int * = E *, etc. is safe. This isn't technically correct, as each
+                        // enum has one basic type that it is compatible with, an that type can
+                        // differ from enum to enum. Without replicating GCC's internal logic,
+                        // there is no way to know which type this particular enum is compatible
+                        // with, so punt on this for now.
+                        return 1;
+                }
+        } else if ( const ast::TypeInstType * typeInstType =
+                        dynamic_cast< const ast::TypeInstType * >( src ) ) {
+                if ( const ast::EqvClass * eqv = env.lookup( typeInstType->name ) ) {
+                        if ( eqv->bound ) {
+                                // T * = S * for any S depends on the type bound to T
+                                return ptrsAssignable( eqv->bound, dst, env );
+                        }
+                }
+        }
         return 0;
+#endif
 }
 

src/ResolvExpr/PtrsCastable.cc

@@ -14 +14 @@
 //
 
+#include "AST/Decl.hpp"
+#include "AST/Pass.hpp"
+#include "AST/Type.hpp"
+#include "AST/TypeEnvironment.hpp"
 #include "Common/PassVisitor.h"
 #include "ResolvExpr/TypeEnvironment.h"  // for EqvClass, TypeEnvironment
@@ -23 +27 @@
 
 namespace ResolvExpr {
-        struct PtrsCastable : public WithShortCircuiting  {
+        struct PtrsCastable_old : public WithShortCircuiting  {
           public:
-                PtrsCastable( Type *dest, const TypeEnvironment &env, const SymTab::Indexer &indexer );
+                PtrsCastable_old( Type *dest, const TypeEnvironment &env, const SymTab::Indexer &indexer );
 
                 int get_result() const { return result; }
@@ -86 +90 @@
                         return objectCast( src, env, indexer );
                 } else {
-                        PassVisitor<PtrsCastable> ptrs( dest, env, indexer );
+                        PassVisitor<PtrsCastable_old> ptrs( dest, env, indexer );
                         src->accept( ptrs );
                         return ptrs.pass.get_result();
@@ -92 +96 @@
         }
 
-        PtrsCastable::PtrsCastable( Type *dest, const TypeEnvironment &env, const SymTab::Indexer &indexer )
+        PtrsCastable_old::PtrsCastable_old( Type *dest, const TypeEnvironment &env, const SymTab::Indexer &indexer )
                 : dest( dest ), result( 0 ), env( env ), indexer( indexer )     {
         }
 
-        void PtrsCastable::postvisit( VoidType * ) {
-                result = objectCast( dest, env, indexer );
-        }
-
-        void PtrsCastable::postvisit( BasicType * ) {
-                result = objectCast( dest, env, indexer );
-        }
-
-        void PtrsCastable::postvisit( PointerType * ) {
-                result = objectCast( dest, env, indexer );
-        }
-
-        void PtrsCastable::postvisit( ArrayType * ) {
-                result = objectCast( dest, env, indexer );
-        }
-
-        void PtrsCastable::postvisit( FunctionType * ) {
+        void PtrsCastable_old::postvisit( VoidType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+
+        void PtrsCastable_old::postvisit( BasicType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+
+        void PtrsCastable_old::postvisit( PointerType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+
+        void PtrsCastable_old::postvisit( ArrayType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+
+        void PtrsCastable_old::postvisit( FunctionType * ) {
                 // result = -1;
                 result = functionCast( dest, env, indexer );
         }
 
-        void PtrsCastable::postvisit( StructInstType * ) {
-                result = objectCast( dest, env, indexer );
-        }
-
-        void PtrsCastable::postvisit( UnionInstType * ) {
-                result = objectCast( dest, env, indexer );
-        }
-
-        void PtrsCastable::postvisit( EnumInstType * ) {
+        void PtrsCastable_old::postvisit( StructInstType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+
+        void PtrsCastable_old::postvisit( UnionInstType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+
+        void PtrsCastable_old::postvisit( EnumInstType * ) {
                 if ( dynamic_cast< EnumInstType* >( dest ) ) {
                         result = 1;
@@ -139 +143 @@
         }
 
-        void PtrsCastable::postvisit( TraitInstType * ) {}
-
-        void PtrsCastable::postvisit(TypeInstType *inst) {
+        void PtrsCastable_old::postvisit( TraitInstType * ) {}
+
+        void PtrsCastable_old::postvisit(TypeInstType *inst ) {
                 //result = objectCast( inst, env, indexer ) > 0 && objectCast( dest, env, indexer ) > 0 ? 1 : -1;
                 result = objectCast( inst, env, indexer ) == objectCast( dest, env, indexer ) ? 1 : -1;
         }
 
-        void PtrsCastable::postvisit( TupleType * ) {
-                result = objectCast( dest, env, indexer );
-        }
-
-        void PtrsCastable::postvisit( VarArgsType * ) {
-                result = objectCast( dest, env, indexer );
-        }
-
-        void PtrsCastable::postvisit( ZeroType * ) {
-                result = objectCast( dest, env, indexer );
-        }
-
-        void PtrsCastable::postvisit( OneType * ) {
-                result = objectCast( dest, env, indexer );
-        }
+        void PtrsCastable_old::postvisit( TupleType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+
+        void PtrsCastable_old::postvisit( VarArgsType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+
+        void PtrsCastable_old::postvisit( ZeroType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+
+        void PtrsCastable_old::postvisit( OneType * ) {
+                result = objectCast( dest, env, indexer );
+        }
+
+namespace {
+        // can this type be cast to an object (1 for yes, -1 for no)
+        int objectCast( 
+                const ast::Type * src, const ast::TypeEnvironment & env, const ast::SymbolTable & symtab 
+        ) {
+                if ( dynamic_cast< const ast::FunctionType * >( src ) ) {
+                        return -1;
+                } else if ( auto inst = dynamic_cast< const ast::TypeInstType * >( src ) ) {
+                        if ( const ast::NamedTypeDecl * named = symtab.lookupType( inst->name ) ) {
+                                if ( auto tyDecl = dynamic_cast< const ast::TypeDecl * >( named ) ) {
+                                        if ( tyDecl->kind == ast::TypeVar::Ftype ) {
+                                                return -1;
+                                        }
+                                }
+                        } else if ( const ast::EqvClass * eqvClass = env.lookup( inst->name ) ) {
+                                if ( eqvClass->data.kind == ast::TypeVar::Ftype ) {
+                                        return -1;
+                                }
+                        }
+                }
+
+                return 1;
+        }
+
+        // can this type be cast to a function (inverse of objectCast)
+        int functionCast( 
+                const ast::Type * src, const ast::TypeEnvironment & env, const ast::SymbolTable & symtab 
+        ) {
+                return -1 * objectCast( src, env, symtab );
+        }
+
+        class PtrsCastable_new : public ast::WithShortCircuiting {
+                const ast::Type * dst;
+                const ast::TypeEnvironment & env;
+                const ast::SymbolTable & symtab;
+        public:
+                int result;
+
+                PtrsCastable_new( 
+                        const ast::Type * d, const ast::TypeEnvironment & e, const ast::SymbolTable & syms )
+                : dst( d ), env( e ), symtab( syms ), result( 0 ) {}
+
+                void previsit( const ast::Type * ) { visit_children = false; }
+
+                void postvisit( const ast::VoidType * ) {
+                        result = objectCast( dst, env, symtab );
+                }
+
+                void postvisit( const ast::BasicType * ) {
+                        result = objectCast( dst, env, symtab );
+                }
+
+                void postvisit( const ast::PointerType * ) {
+                        result = objectCast( dst, env, symtab );
+                }
+
+                void postvisit( const ast::ArrayType * ) {
+                        result = objectCast( dst, env, symtab );
+                }
+
+                void postvisit( const ast::FunctionType * ) {
+                        result = functionCast( dst, env, symtab );
+                }
+
+                void postvisit( const ast::StructInstType * ) {
+                        result = objectCast( dst, env, symtab );
+                }
+
+                void postvisit( const ast::UnionInstType * ) {
+                        result = objectCast( dst, env, symtab );
+                }
+
+                void postvisit( const ast::EnumInstType * ) {
+                        if ( dynamic_cast< const ast::EnumInstType * >( dst ) ) {
+                                result = 1;
+                        } else if ( auto bt = dynamic_cast< const ast::BasicType * >( dst ) ) {
+                                if ( bt->kind == ast::BasicType::SignedInt ) {
+                                        result = 0;
+                                } else {
+                                        result = 1;
+                                }
+                        } else {
+                                result = objectCast( dst, env, symtab );
+                        }
+                }
+
+                void postvisit( const ast::TraitInstType * ) {}
+
+                void postvisit( const ast::TypeInstType * inst ) {
+                        // check trait and destination type are both object or both function
+                        result = objectCast( inst, env, symtab ) == objectCast( dst, env, symtab ) ? 1 : -1;
+                }
+
+                void postvisit( const ast::TupleType * ) {
+                        result = objectCast( dst, env, symtab );
+                }
+
+                void postvisit( const ast::VarArgsType * ) {
+                        result = objectCast( dst, env, symtab );
+                }
+
+                void postvisit( const ast::ZeroType * ) {
+                        result = objectCast( dst, env, symtab );
+                }
+
+                void postvisit( const ast::OneType * ) {
+                        result = objectCast( dst, env, symtab );
+                }
+
+        };
+} // anonymous namespace
+
+int ptrsCastable( 
+        const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab, 
+        const ast::TypeEnvironment & env 
+) {
+        if ( auto inst = dynamic_cast< const ast::TypeInstType * >( dst ) ) {
+                if ( const ast::EqvClass * eqvClass = env.lookup( inst->name ) ) {
+                        return ptrsAssignable( src, eqvClass->bound, env );
+                }
+        }
+
+        if ( dynamic_cast< const ast::VoidType * >( dst ) ) {
+                return objectCast( src, env, symtab );
+        } else {
+                ast::Pass< PtrsCastable_new > ptrs{ dst, env, symtab };
+                src->accept( ptrs );
+                return ptrs.pass.result;
+        }
+}
+
 } // namespace ResolvExpr
 

src/ResolvExpr/ResolveTypeof.cc

@@ -18 +18 @@
 #include <cassert>               // for assert
 
+#include "AST/CVQualifiers.hpp"
+#include "AST/Node.hpp"
+#include "AST/Pass.hpp"
+#include "AST/Type.hpp"
+#include "AST/TypeEnvironment.hpp"
 #include "Common/PassVisitor.h"  // for PassVisitor
+#include "Common/utility.h"      // for copy
 #include "Resolver.h"            // for resolveInVoidContext
 #include "SynTree/Expression.h"  // for Expression
@@ -42 +48 @@
         }
 
-        class ResolveTypeof : public WithShortCircuiting {
+        class ResolveTypeof_old : public WithShortCircuiting {
           public:
-                ResolveTypeof( const SymTab::Indexer &indexer ) : indexer( indexer ) {}
+                ResolveTypeof_old( const SymTab::Indexer &indexer ) : indexer( indexer ) {}
                 void premutate( TypeofType *typeofType );
                 Type * postmutate( TypeofType *typeofType );
@@ -53 +59 @@
 
         Type * resolveTypeof( Type *type, const SymTab::Indexer &indexer ) {
-                PassVisitor<ResolveTypeof> mutator( indexer );
+                PassVisitor<ResolveTypeof_old> mutator( indexer );
                 return type->acceptMutator( mutator );
         }
 
-        void ResolveTypeof::premutate( TypeofType * ) {
+        void ResolveTypeof_old::premutate( TypeofType * ) {
                 visit_children = false;
         }
 
-        Type * ResolveTypeof::postmutate( TypeofType *typeofType ) {
+        Type * ResolveTypeof_old::postmutate( TypeofType *typeofType ) {
 #if 0
                 std::cerr << "resolving typeof: ";
@@ -108 +114 @@
         }
 
-        const ast::Type * resolveTypeof( const ast::Type * type , const ast::SymbolTable & symtab ) {
-                #warning unimplemented
-                (void)type; (void)symtab;
-                assert(false);
-                return nullptr;
-        }
+namespace {
+        struct ResolveTypeof_new : public ast::WithShortCircuiting {
+                const ast::SymbolTable & localSymtab;
+
+                ResolveTypeof_new( const ast::SymbolTable & syms ) : localSymtab( syms ) {}
+
+                void premutate( const ast::TypeofType * ) { visit_children = false; }
+
+                const ast::Type * postmutate( const ast::TypeofType * typeofType ) {
+                        // pass on null expression
+                        if ( ! typeofType->expr ) return typeofType;
+
+                        ast::ptr< ast::Type > newType;
+                        if ( auto tyExpr = typeofType->expr.as< ast::TypeExpr >() ) {
+                                // typeof wrapping type
+                                newType = tyExpr->type;
+                        } else {
+                                // typeof wrapping expression
+                                ast::TypeEnvironment dummy;
+                                ast::ptr< ast::Expr > newExpr = 
+                                        resolveInVoidContext( typeofType->expr, localSymtab, dummy );
+                                assert( newExpr->result && ! newExpr->result->isVoid() );
+                                newType = newExpr->result;
+                        }
+
+                        // clear qualifiers for base, combine with typeoftype quals regardless
+                        if ( typeofType->kind == ast::TypeofType::Basetypeof ) {
+                                // replace basetypeof(<enum>) by int
+                                if ( newType.as< ast::EnumInstType >() ) {
+                                        newType = new ast::BasicType{ 
+                                                ast::BasicType::SignedInt, newType->qualifiers, copy(newType->attributes) };
+                                }
+                                reset_qualifiers( 
+                                        newType, 
+                                        ( newType->qualifiers & ~ast::CV::EquivQualifiers ) | typeofType->qualifiers );
+                        } else {
+                                add_qualifiers( newType, typeofType->qualifiers );
+                        }
+
+                        return newType;
+                }
+        };
+} // anonymous namespace
+
+const ast::Type * resolveTypeof( const ast::Type * type , const ast::SymbolTable & symtab ) {
+        ast::Pass< ResolveTypeof_new > mutator{ symtab };
+        return type->accept( mutator );
+}
+
 } // namespace ResolvExpr
 

src/ResolvExpr/Resolver.cc

@@ -1226 +1226 @@
                 const ast::StaticAssertDecl * previsit( const ast::StaticAssertDecl * );
 
-                void previsit( const ast::ArrayType * );
-                void previsit( const ast::PointerType * );
+                const ast::ArrayType * previsit( const ast::ArrayType * );
+                const ast::PointerType * previsit( const ast::PointerType * );
 
                 const ast::ExprStmt *        previsit( const ast::ExprStmt * );
@@ -1334 +1334 @@
 
         template< typename PtrType >
-        void handlePtrType( const PtrType * type, const ast::SymbolTable & symtab ) {
-                #warning unimplemented; needs support for new Validate::SizeType global
-                (void)type; (void)symtab;
-                assert( false );
-        }
-
-        void Resolver_new::previsit( const ast::ArrayType * at ) {
-                handlePtrType( at, symtab );
-        }
-
-        void Resolver_new::previsit( const ast::PointerType * pt ) {
-                handlePtrType( pt, symtab );
+        const PtrType * handlePtrType( const PtrType * type, const ast::SymbolTable & symtab ) {
+                if ( type->dimension ) {
+                        #warning should use new equivalent to Validate::SizeType rather than sizeType here
+                        ast::ptr< ast::Type > sizeType = new ast::BasicType{ ast::BasicType::LongUnsignedInt };
+                        ast::mutate_field( 
+                                type, &PtrType::dimension, 
+                                findSingleExpression( type->dimension, sizeType, symtab ) );
+                }
+                return type;
+        }
+
+        const ast::ArrayType * Resolver_new::previsit( const ast::ArrayType * at ) {
+                return handlePtrType( at, symtab );
+        }
+
+        const ast::PointerType * Resolver_new::previsit( const ast::PointerType * pt ) {
+                return handlePtrType( pt, symtab );
         }
 

src/ResolvExpr/typeops.h

@@ -99 +99 @@
         // in PtrsCastable.cc
         int ptrsCastable( Type *src, Type *dest, const TypeEnvironment &env, const SymTab::Indexer &indexer );
+        int ptrsCastable( 
+                const ast::Type * src, const ast::Type * dst, const ast::SymbolTable & symtab, 
+                const ast::TypeEnvironment & env );
 
         // in Unify.cc