Changeset 6840e7c for src/ResolvExpr/ResolveTypeof.cc

Timestamp:

Oct 19, 2017, 12:01:04 PM (8 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:

837ce06

Parents:

b96ec83 (diff), a15b72c (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/ResolveTypeof.cc (modified) (3 diffs)

src/ResolvExpr/ResolveTypeof.cc

@@ -18 +18 @@
 #include <cassert>               // for assert
 
+#include "Common/PassVisitor.h"  // for PassVisitor
 #include "Resolver.h"            // for resolveInVoidContext
 #include "SynTree/Expression.h"  // for Expression
@@ -41 +42 @@
         }
 
-        class ResolveTypeof : public Mutator {
+        class ResolveTypeof : public WithShortCircuiting {
           public:
                 ResolveTypeof( const SymTab::Indexer &indexer ) : indexer( indexer ) {}
-                Type *mutate( TypeofType *typeofType );
+                void premutate( TypeofType *typeofType );
+                Type * postmutate( TypeofType *typeofType );
 
           private:
@@ -50 +52 @@
         };
 
-        Type *resolveTypeof( Type *type, const SymTab::Indexer &indexer ) {
-                ResolveTypeof mutator( indexer );
+        Type * resolveTypeof( Type *type, const SymTab::Indexer &indexer ) {
+                PassVisitor<ResolveTypeof> mutator( indexer );
                 return type->acceptMutator( mutator );
         }
 
-        Type *ResolveTypeof::mutate( TypeofType *typeofType ) {
+        void ResolveTypeof::premutate( TypeofType * ) {
+                visit_children = false;
+        }
+
+        Type * ResolveTypeof::postmutate( TypeofType *typeofType ) {
 #if 0
-                std::cout << "resolving typeof: ";
-                typeofType->print( std::cout );
-                std::cout << std::endl;
+                std::cerr << "resolving typeof: ";
+                typeofType->print( std::cerr );
+                std::cerr << std::endl;
 #endif
-                if ( typeofType->get_expr() ) {
-                        Expression *newExpr = resolveInVoidContext( typeofType->get_expr(), indexer );
-                        assert( newExpr->has_result() && ! newExpr->get_result()->isVoid() );
-                        Type *newType = newExpr->get_result();
-                        newExpr->set_result( nullptr );
+                if ( typeofType->expr ) {
+                        Expression * newExpr = resolveInVoidContext( typeofType->expr, indexer );
+                        assert( newExpr->result && ! newExpr->result->isVoid() );
+                        Type * newType = newExpr->result;
+                        newExpr->result = nullptr;
                         delete typeofType;
                         delete newExpr;