Changeset f53acdf8 for src/ResolvExpr/ResolveAssertions.cc

Timestamp:

Jul 19, 2019, 2:16:01 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

4eb43fa

Parents:

1f1c102 (diff), 8ac3b0e (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 new-ast

File:

• src/ResolvExpr/ResolveAssertions.cc (modified) (11 diffs)

src/ResolvExpr/ResolveAssertions.cc

@@ -9 +9 @@
 // Author           : Aaron B. Moss
 // Created On       : Fri Oct 05 13:46:00 2018
-// Last Modified By : Aaron B. Moss
-// Last Modified On : Fri Oct 05 13:46:00 2018
-// Update Count     : 1
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Jul 10 16:10:37 2019
+// Update Count     : 2
 //
 
@@ -197 +197 @@
                         }
                         if ( i == b.size() /* && i < a.size() */ ) return 1;
-                        
+
                         int c = a[i].compare( b[i] );
                         if ( c != 0 ) return c;
@@ -220 +220 @@
 
                 /// Initial resolution state for an alternative
-                ResnState( Alternative& a, SymTab::Indexer& indexer )
+                ResnState( Alternative & a, SymTab::Indexer & indexer )
                 : alt(a), need(), newNeed(), deferred(), inferred(), costs{ Cost::zero }, indexer(indexer) {
                         need.swap( a.need );
@@ -226 +226 @@
 
                 /// Updated resolution state with new need-list
-                ResnState( ResnState&& o, IterateFlag )
+                ResnState( ResnState && o, IterateFlag )
                 : alt(std::move(o.alt)), need(o.newNeed.begin(), o.newNeed.end()), newNeed(), deferred(),
                   inferred(std::move(o.inferred)), costs(o.costs), indexer(o.indexer) {
@@ -234 +234 @@
 
         /// Binds a single assertion, updating resolution state
-        void bindAssertion( const DeclarationWithType* decl, AssertionSetValue info, Alternative& alt,
-                        AssnCandidate& match, InferCache& inferred ) {
-
-                DeclarationWithType* candidate = match.cdata.id;
-                assertf( candidate->get_uniqueId(), "Assertion candidate does not have a unique ID: %s", toString( candidate ).c_str() );
-
-                Expression* varExpr = match.cdata.combine( alt.cvtCost );
+        void bindAssertion( const DeclarationWithType * decl, AssertionSetValue info, Alternative & alt,
+                        AssnCandidate & match, InferCache & inferred ) {
+
+                const DeclarationWithType * candidate = match.cdata.id;
+                assertf( candidate->uniqueId, "Assertion candidate does not have a unique ID: %s", toString( candidate ).c_str() );
+
+                Expression * varExpr = match.cdata.combine( alt.cvtCost );
                 delete varExpr->result;
                 varExpr->result = match.adjType->clone();
@@ -247 +247 @@
                 // place newly-inferred assertion in proper place in cache
                 inferred[ info.resnSlot ][ decl->get_uniqueId() ] = ParamEntry{
-                                candidate->get_uniqueId(), candidate->clone(), match.adjType->clone(), decl->get_type()->clone(),
+                                candidate->uniqueId, candidate->clone(), match.adjType->clone(), decl->get_type()->clone(),
                                 varExpr };
         }
 
         /// Adds a captured assertion to the symbol table
-        void addToIndexer( AssertionSet &assertSet, SymTab::Indexer &indexer ) {
+        void addToIndexer( AssertionSet & assertSet, SymTab::Indexer & indexer ) {
                 for ( auto&  i : assertSet ) {
                         if ( i.second.isUsed ) {
@@ -264 +264 @@
 
         /// Resolve a single assertion, in context
-        bool resolveAssertion( AssertionItem& assn, ResnState& resn ) {
+        bool resolveAssertion( AssertionItem & assn, ResnState & resn ) {
                 // skip unused assertions
                 if ( ! assn.info.isUsed ) return true;
@@ -274 +274 @@
                 // find the candidates that unify with the desired type
                 CandidateList matches;
-                for ( const auto& cdata : candidates ) {
-                        DeclarationWithType* candidate = cdata.id;
+                for ( const auto & cdata : candidates ) {
+                        const DeclarationWithType * candidate = cdata.id;
 
                         // build independent unification context for candidate
@@ -281 +281 @@
                         TypeEnvironment newEnv{ resn.alt.env };
                         OpenVarSet newOpenVars{ resn.alt.openVars };
-                        Type* adjType = candidate->get_type()->clone();
+                        Type * adjType = candidate->get_type()->clone();
                         adjustExprType( adjType, newEnv, resn.indexer );
                         renameTyVars( adjType );
@@ -368 +368 @@
                 std::string resKey = SymTab::Mangler::mangleType( resType );
                 delete resType;
-                return std::move( resKey );
-        }
-        
-        /// Replace resnSlots with inferParams and add alternative to output list, if meets pruning 
+                return resKey;
+        }
+
+        /// Replace resnSlots with inferParams and add alternative to output list, if meets pruning
         /// threshold.
         void finalizeAssertions( ResnState& resn, PruneMap & pruneThresholds, AltList& out ) {
@@ -406 +406 @@
                 ResnList resns{ ResnState{ alt, root_indexer } };
                 ResnList new_resns{};
-                
+
                 // Pruning thresholds by result type of the output alternatives.
                 // Alternatives *should* be generated in sorted order, so no need to retroactively prune