Changeset bdd516a for translator/GenPoly/ScrubTyVars.cc

Timestamp:

Apr 28, 2015, 4:21:36 PM (9 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:

42e2ad7

Parents:

ad17ba6a

Message:

fixed sizeof type variable, find lowest cost alternative for sizeof expression, removed unused classes, added compiler flag, remove temporary file for -CFA, formatting

File:

• translator/GenPoly/ScrubTyVars.cc (modified) (1 diff)

translator/GenPoly/ScrubTyVars.cc

@@ -4 +4 @@
 #include "SynTree/Mutator.h"
 #include "SynTree/Type.h"
+#include "SynTree/Expression.h"
 
 
 namespace GenPoly {
+    Type * ScrubTyVars::mutate( TypeInstType *typeInst ) {
+        TyVarMap::const_iterator tyVar = tyVars.find( typeInst->get_name() );
+        if ( doAll || tyVar != tyVars.end() ) {
+            switch( tyVar->second ) {
+              case TypeDecl::Any:
+              case TypeDecl::Dtype:
+                {
+                    PointerType *ret = new PointerType( Type::Qualifiers(), new VoidType( typeInst->get_qualifiers() ) );
+                    delete typeInst;
+                    return ret;
+                }
+              case TypeDecl::Ftype:
+                delete typeInst;
+                return new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) );
+            }
+        }
+        return typeInst;
+    }
 
-Type* 
-ScrubTyVars::mutate( TypeInstType *typeInst )
-{
-  TyVarMap::const_iterator tyVar = tyVars.find( typeInst->get_name() );
-  if( doAll || tyVar != tyVars.end() ) {
-    switch( tyVar->second ) {
-    case TypeDecl::Any:
-    case TypeDecl::Dtype:
-    {
-      PointerType *ret = new PointerType( Type::Qualifiers(), new VoidType( typeInst->get_qualifiers() ) );
-      delete typeInst;
-      return ret;
+    Expression * ScrubTyVars::mutate( SizeofExpr *szeof ) {
+        // sizeof( T ) => T parameter, which is the size of T
+        if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( szeof->get_type() ) ) {
+            Expression *expr = new NameExpr( typeInst->get_name() );
+            return expr;
+        } else {
+            return Mutator::mutate( szeof );
+        }
     }
-      
-    case TypeDecl::Ftype:
-      delete typeInst;
-      return new PointerType( Type::Qualifiers(), new FunctionType( Type::Qualifiers(), true ) );
+
+    Type * ScrubTyVars::mutate( PointerType *pointer ) {
+        if ( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( pointer->get_base() ) ) {
+            if ( doAll || tyVars.find( typeInst->get_name() ) != tyVars.end() ) {
+                Type *ret = mutate( typeInst );
+                ret->get_qualifiers() += pointer->get_qualifiers();
+                pointer->set_base( 0 );
+                delete pointer;
+                return ret;
+            }
+        }
+        return Mutator::mutate( pointer );
     }
-  }
-  return typeInst;
-}
-
-Type* 
-ScrubTyVars::mutate( PointerType *pointer )
-{
-  if( TypeInstType *typeInst = dynamic_cast< TypeInstType * >( pointer->get_base() ) ) {
-    if( doAll || tyVars.find( typeInst->get_name() ) != tyVars.end() ) {
-      Type *ret = mutate( typeInst );
-///       std::cout << "pointer is ";
-///       pointer->print( std::cout );
-///       std::cout << std::endl << "ret is ";
-///       ret->print( std::cout );
-///       std::cout << std::endl;
-      ret->get_qualifiers() += pointer->get_qualifiers();
-      pointer->set_base( 0 );
-      delete pointer;
-      return ret;
-    }
-  }
-  return Mutator::mutate( pointer );
-}
-
 } // namespace GenPoly