Changes in src/ResolvExpr/AdjustExprType.cc [3e5dd913:07de76b]

File:

• src/ResolvExpr/AdjustExprType.cc (modified) (1 diff)

src/ResolvExpr/AdjustExprType.cc

@@ -100 +100 @@
 
 namespace {
-        class AdjustExprType_new final : public ast::WithShortCircuiting {
+        struct AdjustExprType_new final : public ast::WithShortCircuiting {
+                const ast::TypeEnvironment & tenv;
                 const ast::SymbolTable & symtab;
-        public:
-                const ast::TypeEnvironment & tenv;
 
                 AdjustExprType_new( const ast::TypeEnvironment & e, const ast::SymbolTable & syms )
-                : symtab( syms ), tenv( e ) {}
+                : tenv( e ), symtab( syms ) {}
 
-                void previsit( const ast::VoidType * ) { visit_children = false; }
-                void previsit( const ast::BasicType * ) { visit_children = false; }
-                void previsit( const ast::PointerType * ) { visit_children = false; }
-                void previsit( const ast::ArrayType * ) { visit_children = false; }
-                void previsit( const ast::FunctionType * ) { visit_children = false; }
-                void previsit( const ast::StructInstType * ) { visit_children = false; }
-                void previsit( const ast::UnionInstType * ) { visit_children = false; }
-                void previsit( const ast::EnumInstType * ) { visit_children = false; }
-                void previsit( const ast::TraitInstType * ) { visit_children = false; }
-                void previsit( const ast::TypeInstType * ) { visit_children = false; }
-                void previsit( const ast::TupleType * ) { visit_children = false; }
-                void previsit( const ast::VarArgsType * ) { visit_children = false; }
-                void previsit( const ast::ZeroType * ) { visit_children = false; }
-                void previsit( const ast::OneType * ) { visit_children = false; }
+                void premutate( const ast::VoidType * ) { visit_children = false; }
+                void premutate( const ast::BasicType * ) { visit_children = false; }
+                void premutate( const ast::PointerType * ) { visit_children = false; }
+                void premutate( const ast::ArrayType * ) { visit_children = false; }
+                void premutate( const ast::FunctionType * ) { visit_children = false; }
+                void premutate( const ast::StructInstType * ) { visit_children = false; }
+                void premutate( const ast::UnionInstType * ) { visit_children = false; }
+                void premutate( const ast::EnumInstType * ) { visit_children = false; }
+                void premutate( const ast::TraitInstType * ) { visit_children = false; }
+                void premutate( const ast::TypeInstType * ) { visit_children = false; }
+                void premutate( const ast::TupleType * ) { visit_children = false; }
+                void premutate( const ast::VarArgsType * ) { visit_children = false; }
+                void premutate( const ast::ZeroType * ) { visit_children = false; }
+                void premutate( const ast::OneType * ) { visit_children = false; }
 
-                const ast::Type * postvisit( const ast::ArrayType * at ) {
+                const ast::Type * postmutate( const ast::ArrayType * at ) {
                         return new ast::PointerType{ at->base, at->qualifiers };
                 }
 
-                const ast::Type * postvisit( const ast::FunctionType * ft ) {
+                const ast::Type * postmutate( const ast::FunctionType * ft ) {
                         return new ast::PointerType{ ft };
                 }
 
-                const ast::Type * postvisit( const ast::TypeInstType * inst ) {
+                const ast::Type * postmutate( const ast::TypeInstType * inst ) {
                         // replace known function-type-variables with pointer-to-function
-                        if ( const ast::EqvClass * eqvClass = tenv.lookup( *inst ) ) {
+                        if ( const ast::EqvClass * eqvClass = tenv.lookup( inst->name ) ) {
                                 if ( eqvClass->data.kind == ast::TypeDecl::Ftype ) {
                                         return new ast::PointerType{ inst };