Changeset e67a82d for src/ResolvExpr/ResolveTypeof.cc

Timestamp:

Aug 20, 2020, 11:48:15 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

d685cb0

Parents:

67ca73e (diff), 013b028 (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:

fix conflicts

File:

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

src/ResolvExpr/ResolveTypeof.cc

@@ -99 +99 @@
                         // replace basetypeof(<enum>) by int
                         if ( dynamic_cast<EnumInstType*>(newType) ) {
-                                Type* newerType = 
-                                        new BasicType{ newType->get_qualifiers(), BasicType::SignedInt, 
+                                Type* newerType =
+                                        new BasicType{ newType->get_qualifiers(), BasicType::SignedInt,
                                         newType->attributes };
                                 delete newType;
                                 newType = newerType;
                         }
-                        newType->get_qualifiers().val 
+                        newType->get_qualifiers().val
                                 = ( newType->get_qualifiers().val & ~Type::Qualifiers::Mask ) | oldQuals;
                 } else {
                         newType->get_qualifiers().val |= oldQuals;
                 }
-                
+
                 return newType;
         }
@@ -120 +120 @@
                 ResolveTypeof_new( const ast::SymbolTable & syms ) : localSymtab( syms ) {}
 
-                void premutate( const ast::TypeofType * ) { visit_children = false; }
+                void previsit( const ast::TypeofType * ) { visit_children = false; }
 
-                const ast::Type * postmutate( const ast::TypeofType * typeofType ) {
+                const ast::Type * postvisit( const ast::TypeofType * typeofType ) {
                         // pass on null expression
                         if ( ! typeofType->expr ) return typeofType;
@@ -133 +133 @@
                                 // typeof wrapping expression
                                 ast::TypeEnvironment dummy;
-                                ast::ptr< ast::Expr > newExpr = 
+                                ast::ptr< ast::Expr > newExpr =
                                         resolveInVoidContext( typeofType->expr, localSymtab, dummy );
                                 assert( newExpr->result && ! newExpr->result->isVoid() );
@@ -143 +143 @@
                                 // replace basetypeof(<enum>) by int
                                 if ( newType.as< ast::EnumInstType >() ) {
-                                        newType = new ast::BasicType{ 
+                                        newType = new ast::BasicType{
                                                 ast::BasicType::SignedInt, newType->qualifiers, copy(newType->attributes) };
                                 }
-                                reset_qualifiers( 
-                                        newType, 
+                                reset_qualifiers(
+                                        newType,
                                         ( newType->qualifiers & ~ast::CV::EquivQualifiers ) | typeofType->qualifiers );
                         } else {
@@ -153 +153 @@
                         }
 
-                        return newType;
+                        return newType.release();
                 }
         };