Changeset 093f1a0

Timestamp:

Jul 30, 2015, 3:56:42 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:

f678663e

Parents:

7f5566b (diff), b29f8f3 (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' of plg2:software/cfa/cfa-cc

Location:

src

Files:

• ResolvExpr/AlternativeFinder.cc (modified) (1 diff)
• SymTab/Validate.cc (modified) (4 diffs)

src/ResolvExpr/AlternativeFinder.cc

@@ -697 +697 @@
                         std::list< Type* >::iterator candidate_end = (*i).expr->get_results().begin();
                         std::advance( candidate_end, castExpr->get_results().size() );
-                        if ( ! unifyList( (*i).expr->get_results().begin(), candidate_end,
-                                                         castExpr->get_results().begin(), castExpr->get_results().end(), i->env, needAssertions, haveAssertions, openVars, indexer ) ) continue;
                         Cost thisCost = castCostList( (*i).expr->get_results().begin(), candidate_end,
                                                                                   castExpr->get_results().begin(), castExpr->get_results().end(), indexer, i->env );

src/SymTab/Validate.cc

@@ -162 +162 @@
         class EliminateTypedef : public Mutator {
           public:
-                EliminateTypedef() : scopeLevel( 0 ) {}
+          EliminateTypedef() : scopeLevel( 0 ) {}
+            /// Replaces typedefs by forward declarations
                 static void eliminateTypedef( std::list< Declaration * > &translationUnit );
           private:
@@ -542 +543 @@
                 std::list<Statement *> initList;
                 initList.push_back( initStmt );
-
+  
                 UntypedExpr *cond = new UntypedExpr( new NameExpr( "?<?" ) );
                 cond->get_args().push_back( new VariableExpr( index ) );
@@ -617 +618 @@
 
                 // need to remove the prototypes, since this may be nested in a routine
-                for ( int start = 0, end = assigns.size() / 2; start < end; start++ ) {
+                for (int start = 0, end = assigns.size()/2; start < end; start++) {
                         delete assigns.front();
                         assigns.pop_front();
@@ -960 +961 @@
         }
 
-        Declaration *EliminateTypedef::mutate( ContextDecl * contextDecl ) {
+                Declaration *EliminateTypedef::mutate( ContextDecl * contextDecl ) {
                 Mutator::mutate( contextDecl );
                 return handleAggregate( contextDecl );