Changeset 90152a4 for src/ResolvExpr/AdjustExprType.cc

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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 cleanup-dtors

File:

• src/ResolvExpr/AdjustExprType.cc (modified) (5 diffs)

src/ResolvExpr/AdjustExprType.cc

@@ -24 +24 @@
         class AdjustExprType : public WithShortCircuiting {
           public:
-                AdjustExprType( const TypeEnvironment &env, const SymTab::Indexer &indexer );
+                AdjustExprType( const TypeEnvironment & env, const SymTab::Indexer & indexer );
                 void premutate( VoidType * ) { visit_children = false; }
                 void premutate( BasicType * ) { visit_children = false; }
@@ -45 +45 @@
 
           private:
-                const TypeEnvironment &env;
-                const SymTab::Indexer &indexer;
+                const TypeEnvironment & env;
+                const SymTab::Indexer & indexer;
         };
 
@@ -55 +55 @@
         }
 
+        void adjustExprType( Type *& type ) {
+                TypeEnvironment env;
+                SymTab::Indexer indexer;
+                adjustExprType( type, env, indexer );
+        }
+
         AdjustExprType::AdjustExprType( const TypeEnvironment &env, const SymTab::Indexer &indexer )
                 : env( env ), indexer( indexer ) {
@@ -60 +66 @@
 
         Type * AdjustExprType::postmutate( ArrayType * arrayType ) {
-                PointerType *pointerType = new PointerType( arrayType->get_qualifiers(), arrayType->base );
+                PointerType *pointerType = new PointerType{ arrayType->get_qualifiers(), arrayType->base };
                 arrayType->base = nullptr;
                 delete arrayType;
@@ -67 +73 @@
 
         Type * AdjustExprType::postmutate( FunctionType * functionType ) {
-                return new PointerType( Type::Qualifiers(), functionType );
+                return new PointerType{ Type::Qualifiers(), functionType };
         }
 
         Type * AdjustExprType::postmutate( TypeInstType * typeInst ) {
-                EqvClass eqvClass;
-                if ( env.lookup( typeInst->get_name(), eqvClass ) ) {
-                        if ( eqvClass.data.kind == TypeDecl::Ftype ) {
-                                PointerType *pointerType = new PointerType( Type::Qualifiers(), typeInst );
-                                return pointerType;
+                if ( const EqvClass* eqvClass = env.lookup( typeInst->get_name() ) ) {
+                        if ( eqvClass->data.kind == TypeDecl::Ftype ) {
+                                return new PointerType{ Type::Qualifiers(), typeInst };
                         }
                 } else if ( NamedTypeDecl *ntDecl = indexer.lookupType( typeInst->get_name() ) ) {
                         if ( TypeDecl *tyDecl = dynamic_cast< TypeDecl* >( ntDecl ) ) {
                                 if ( tyDecl->get_kind() == TypeDecl::Ftype ) {
-                                        PointerType *pointerType = new PointerType( Type::Qualifiers(), typeInst );
-                                        return pointerType;
+                                        return new PointerType{ Type::Qualifiers(), typeInst };
                                 } // if
                         } // if