Changeset eef8dfb for src/ResolvExpr/AdjustExprType.cc

Timestamp:

Jan 7, 2021, 2:55:57 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

58fe85a

Parents:

bdfc032 (diff), 44e37ef (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' into dkobets-vector

File:

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

src/ResolvExpr/AdjustExprType.cc

@@ -100 +100 @@
 
 namespace {
-        struct AdjustExprType_new final : public ast::WithShortCircuiting {
+        class AdjustExprType_new final : public ast::WithShortCircuiting {
+                const ast::SymbolTable & symtab;
+        public:
                 const ast::TypeEnvironment & tenv;
-                const ast::SymbolTable & symtab;
 
                 AdjustExprType_new( const ast::TypeEnvironment & e, const ast::SymbolTable & syms )
-                : tenv( e ), symtab( syms ) {}
+                : symtab( syms ), tenv( e ) {}
 
-                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; }
+                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; }
 
-                const ast::Type * postmutate( const ast::ArrayType * at ) {
+                const ast::Type * postvisit( const ast::ArrayType * at ) {
                         return new ast::PointerType{ at->base, at->qualifiers };
                 }
 
-                const ast::Type * postmutate( const ast::FunctionType * ft ) {
+                const ast::Type * postvisit( const ast::FunctionType * ft ) {
                         return new ast::PointerType{ ft };
                 }
 
-                const ast::Type * postmutate( const ast::TypeInstType * inst ) {
+                const ast::Type * postvisit( const ast::TypeInstType * inst ) {
                         // replace known function-type-variables with pointer-to-function
-                        if ( const ast::EqvClass * eqvClass = tenv.lookup( inst->name ) ) {
+                        if ( const ast::EqvClass * eqvClass = tenv.lookup( *inst ) ) {
                                 if ( eqvClass->data.kind == ast::TypeDecl::Ftype ) {
                                         return new ast::PointerType{ inst };