Changeset d9a0e76 for translator/ResolvExpr/ResolveTypeof.cc

Timestamp:

Dec 16, 2014, 9:41:50 PM (10 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

17cd4eb

Parents:

3848e0e

Message:

remove Parser.old, add -XCFA to driver, copy ptrdiff_t from stddef.h in preclude, remove casts from initialization constants, adjust formatting

File:

• translator/ResolvExpr/ResolveTypeof.cc (modified) (2 diffs)

translator/ResolvExpr/ResolveTypeof.cc

@@ -1 @@
-/*
- * This file is part of the Cforall project
- *
- * $Id: ResolveTypeof.cc,v 1.2 2005/08/29 20:14:16 rcbilson Exp $
- *
- */
-
 #include "ResolveTypeof.h"
 #include "Alternative.h"
@@ -15 +8 @@
 
 namespace ResolvExpr {
+    namespace {
+#if 0
+        void
+        printAlts( const AltList &list, std::ostream &os, int indent = 0 )
+        {
+            for( AltList::const_iterator i = list.begin(); i != list.end(); ++i ) {
+                i->print( os, indent );
+                os << std::endl;
+            }
+        }
+#endif
+    }
 
-namespace {
+    class ResolveTypeof : public Mutator {
+      public:
+        ResolveTypeof( const SymTab::Indexer &indexer ) : indexer( indexer ) {}
+        Type *mutate( TypeofType *typeofType );
+
+      private:
+        const SymTab::Indexer &indexer;
+    };
+
+    Type *resolveTypeof( Type *type, const SymTab::Indexer &indexer ) {
+        ResolveTypeof mutator( indexer );
+        return type->acceptMutator( mutator );
+    }
+
+    Type *ResolveTypeof::mutate( TypeofType *typeofType ) {
 #if 0
-  void
-  printAlts( const AltList &list, std::ostream &os, int indent = 0 )
-  {
-    for( AltList::const_iterator i = list.begin(); i != list.end(); ++i ) {
-      i->print( os, indent );
-      os << std::endl;
+        std::cout << "resolving typeof: ";
+        typeofType->print( std::cout );
+        std::cout << std::endl;
+#endif
+        if ( typeofType->get_expr() ) {
+            Expression *newExpr = resolveInVoidContext( typeofType->get_expr(), indexer );
+            assert( newExpr->get_results().size() > 0 );
+            Type *newType;
+            if ( newExpr->get_results().size() > 1 ) {
+                TupleType *tupleType = new TupleType( Type::Qualifiers() );
+                cloneAll( newExpr->get_results(), tupleType->get_types() );
+                newType = tupleType;
+            } else {
+                newType = newExpr->get_results().front()->clone();
+            }
+            delete typeofType;
+            return newType;
+        }
+        return typeofType;
     }
-  }
-#endif
-}
-
-class ResolveTypeof : public Mutator
-{
-public:
-  ResolveTypeof( const SymTab::Indexer &indexer ) : indexer( indexer ) {}
-  Type *mutate( TypeofType *typeofType );
-
-private:
-  const SymTab::Indexer &indexer;
-};
-
-Type *
-resolveTypeof( Type *type, const SymTab::Indexer &indexer )
-{
-  ResolveTypeof mutator( indexer );
-  return type->acceptMutator( mutator );
-}
-
-Type *
-ResolveTypeof::mutate( TypeofType *typeofType )
-{
-///   std::cout << "resolving typeof: ";
-///   typeofType->print( std::cout );
-///   std::cout << std::endl;
-  if( typeofType->get_expr() ) {
-    Expression *newExpr = resolveInVoidContext( typeofType->get_expr(), indexer );
-    assert( newExpr->get_results().size() > 0 );
-    Type *newType;
-    if( newExpr->get_results().size() > 1 ) {
-      TupleType *tupleType = new TupleType( Type::Qualifiers() );
-      cloneAll( newExpr->get_results(), tupleType->get_types() );
-      newType = tupleType;
-    } else {
-      newType = newExpr->get_results().front()->clone();
-    }
-    delete typeofType;
-    return newType;
-  }
-  return typeofType;
-}
 
 } // namespace ResolvExpr