Changeset bdd516a for translator/ResolvExpr

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

Location:

translator/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (1 diff)
• Resolver.cc (modified) (4 diffs)

translator/ResolvExpr/AlternativeFinder.cc

@@ -756 +756 @@
             alternatives.push_back( Alternative( sizeofExpr->clone(), env, Cost::zero ) );
         } else {
+            // find all alternatives for the argument to sizeof
             AlternativeFinder finder( indexer, env );
             finder.find( sizeofExpr->get_expr() );
-            if ( finder.alternatives.size() != 1 ) {
+            // find the lowest cost alternative among the alternatives, otherwise ambiguous
+            AltList winners;
+            findMinCost( finder.alternatives.begin(), finder.alternatives.end(), back_inserter( winners ) );
+            if ( winners.size() != 1 ) {
                 throw SemanticError( "Ambiguous expression in sizeof operand: ", sizeofExpr->get_expr() );
             }
-            Alternative &choice = finder.alternatives.front();
+            // return the lowest cost alternative for the argument
+            Alternative &choice = winners.front();
             alternatives.push_back( Alternative( new SizeofExpr( choice.expr->clone() ), choice.env, Cost::zero ) );
         }

translator/ResolvExpr/Resolver.cc

@@ -44 +44 @@
         acceptAll( translationUnit, resolver );
 #if 0
+        resolver.print( cerr );
         for ( std::list< Declaration * >::iterator i = translationUnit.begin(); i != translationUnit.end(); ++i ) {
             (*i)->print( std::cerr );
@@ -241 +242 @@
     void Resolver::visit( SingleInit *singleInit ) {
         if ( singleInit->get_value() ) {
+#if 0
+            if (NameExpr * ne = dynamic_cast<NameExpr*>(singleInit->get_value())) {
+                string n = ne->get_name();
+                if (n == "0") {
+                    initContext = new BasicType(Type::Qualifiers(), 
+                                                BasicType::SignedInt);
+                } else {
+                    DeclarationWithType * decl = lookupId(n);
+                    initContext = decl->get_type();
+                }
+            } else if (ConstantExpr * e = 
+                       dynamic_cast<ConstantExpr*>(singleInit->get_value())) {
+                Constant *c = e->get_constant();
+                initContext = c->get_type();
+            } else {
+                assert(0);
+            }
+#endif
             CastExpr *castExpr = new CastExpr( singleInit->get_value(), initContext->clone() );
             Expression *newExpr = findSingleExpression( castExpr, *this );
@@ -250 +269 @@
 
     void Resolver::visit( ListInit *listInit ) {
+        Visitor::visit(listInit);
+#if 0
         if ( ArrayType *at = dynamic_cast<ArrayType*>(initContext) ) {
-            initContext = at->get_base();
-            Visitor::visit( listInit );
+            std::list<Initializer *>::iterator iter( listInit->begin_initializers() );
+            for ( ; iter != listInit->end_initializers(); ++iter ) {
+                initContext = at->get_base();
+                (*iter)->accept( *this );
+            } // for
         } else if ( StructInstType *st = dynamic_cast<StructInstType*>(initContext) ) {
             StructDecl *baseStruct = st->get_baseStruct();
@@ -295 +319 @@
             (*listInit->begin_initializers())->accept( *this );
         } // if
+#endif
     }
 } // namespace ResolvExpr