Changeset adb6a4f1 for src/ResolvExpr/AdjustExprType.cc

Timestamp:

Jun 1, 2018, 7:53:55 PM (6 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, with_gc

Children:

d56cc219

Parents:

ecae5860 (diff), 262bd63 (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 plg2:software/cfa/cfa-cc

File:

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

src/ResolvExpr/AdjustExprType.cc

@@ -66 +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;
@@ -73 +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