Changes in src/ResolvExpr/AlternativeFinder.cc [3233b91:1db306a]

File:

• src/ResolvExpr/AlternativeFinder.cc (modified) (1 diff)

src/ResolvExpr/AlternativeFinder.cc

@@ -131 +131 @@
 
         void printAlts( const AltList &list, std::ostream &os, unsigned int indentAmt ) {
-                std::vector<std::string> sorted;
-                sorted.reserve(list.size());
-                for(const auto & c : list) {
-                        std::stringstream ss;
-                        c.print( ss, indentAmt );
-                        sorted.push_back(ss.str());
-                }
-
-                std::sort(sorted.begin(), sorted.end());
-
-                for ( const auto & s : sorted ) {
-                        os << s << std::endl;
+                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 );
+                        os << std::endl;
                 }
         }