Changeset b5629d8 for src/ResolvExpr

Timestamp:

Dec 3, 2020, 1:49:01 PM (5 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

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

Children:

62e456f, ab0257b9

Parents:

f0d67e5 (diff), fa11053 (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 plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/ResolvExpr

Files:

• AlternativeFinder.cc (modified) (2 diffs)
• TypeEnvironment.cc (modified) (1 diff)
• TypeEnvironment.h (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc

@@ -132 +132 @@
         void printAlts( const AltList &list, std::ostream &os, unsigned int indentAmt ) {
                 Indenter indent = { indentAmt };
+
+                std::vector<int> idx;
+                idx.reserve(list.size());
+                for(int i = 0; i < list.size(); i++) { idx.push_back(i); }
+
+                std::sort(idx.begin(), idx.end(), [&list](int lhs_idx, int rhs_idx) -> bool {
+                        const auto & lhs = list.at(lhs_idx);
+                        const auto & rhs = list.at(rhs_idx);
+                        if(lhs.expr->location.startsBefore(rhs.expr->location)) return true;
+                        if(rhs.expr->location.startsBefore(lhs.expr->location)) return false;
+
+                        if(lhs.env.size() < rhs.env.size()) return true;
+                        if(lhs.env.size() > rhs.env.size()) return false;
+
+                        if(lhs.openVars.size() < rhs.openVars.size()) return true;
+                        if(lhs.openVars.size() > rhs.openVars.size()) return false;
+
+                        if(lhs.need.size() < rhs.need.size()) return true;
+                        if(lhs.need.size() > rhs.need.size()) return false;
+
+                        return false;
+                });
+
                 for ( AltList::const_iterator i = list.begin(); i != list.end(); ++i ) {
                         i->print( os, indent );
@@ -1718 +1741 @@
                                         std::cerr << std::endl;
                                 )
-                                
+
                                 if ( thisCost != Cost::infinity ) {
                                         // count one safe conversion for each value that is thrown away

src/ResolvExpr/TypeEnvironment.cc

@@ -107 +107 @@
 
         void EqvClass::print( std::ostream &os, Indenter indent ) const {
-                if( !deterministic_output ) {
-                        os << "( ";
-                        std::copy( vars.begin(), vars.end(), std::ostream_iterator< std::string >( os, " " ) );
-                        os << ")";
-                }
+                os << "(";
+                bool first = true;
+                for(const auto & var : vars) {
+                        if(first) first = false;
+                        else os << " ";
+                        if( deterministic_output && isUnboundType(var) ) os << "[unbound]";
+                        else os << var;
+                }
+                os << ")";
                 if ( type ) {
                         os << " -> ";

src/ResolvExpr/TypeEnvironment.h

@@ -149 +149 @@
                 iterator end() const { return env.end(); }
 
+                auto size() const { return env.size(); }
+
           private:
                 ClassList env;