Changeset 2595df1

Timestamp:

Dec 3, 2020, 1:41:11 PM (4 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

Children:

3233b91

Parents:

cc5cc27

Message:

Now using string print to sort alternatives

Files:

• src/ResolvExpr/AlternativeFinder.cc (modified) (1 diff)
• src/ResolvExpr/Candidate.cpp (modified) (1 diff)
• tests/.expect/castError.nast.txt (modified) (2 diffs)
• tests/errors/.expect/completeType.nast.x64.txt (modified) (2 diffs)
• tests/meta/.expect/archVast.nast.x64.txt (modified) (2 diffs)

src/ResolvExpr/AlternativeFinder.cc

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

src/ResolvExpr/Candidate.cpp

@@ -41 +41 @@
 
 void print( std::ostream & os, const CandidateList & cands, Indenter indent ) {
-        for ( const CandidateRef & cand : cands ) {
-                print( os, *cand, indent );
-                os << std::endl;
+        std::vector<std::string> sorted;
+        sorted.reserve(cands.size());
+        for(const auto & c : cands) {
+                std::stringstream ss;
+                print( ss, *c, indent );
+                sorted.push_back(ss.str());
+        }
+
+        std::sort(sorted.begin(), sorted.end());
+
+        for ( const auto & s : sorted ) {
+                os << s << std::endl;
         }
 }

tests/.expect/castError.nast.txt

@@ -7 +7 @@
   char Alternatives are:
 Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: f: signed int
+      Variable Expression: f: double
       ... with resolved type:
-        signed int
+        double
     ... to:
       char
@@ -39 +39 @@
 
 Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: f: double
+      Variable Expression: f: signed int
       ... with resolved type:
-        double
+        signed int
     ... to:
       char

tests/errors/.expect/completeType.nast.x64.txt

@@ -9 +9 @@
 ... with resolved type:
   void Alternatives are:
+Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
+      Application of
+        Variable Expression: *?: forall
+          DT: data type
+          function
+        ... with parameters
+          pointer to instance of type DT (not function type)
+        ... returning
+          reference to instance of type DT (not function type)
+
+        ... with resolved type:
+          pointer to forall
+            [unbound]:data type
+            function
+          ... with parameters
+            pointer to instance of type [unbound] (not function type)
+          ... returning
+            reference to instance of type [unbound] (not function type)
+
+        ... to arguments
+        Variable Expression: x: pointer to instance of struct A without body
+        ... with resolved type:
+          pointer to instance of struct A without body
+
+      ... with resolved type:
+        reference to instance of struct A without body
+    ... to: nothing
+    ... with resolved type:
+      void
+  (types:
+    void
+  )
+  Environment:([unbound]) -> instance of struct A without body (no widening)
+
+
 Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
       Application of
@@ -42 +77 @@
   )
   Environment:([unbound]) -> instance of struct B with body (no widening)
-
-
-Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
-      Application of
-        Variable Expression: *?: forall
-          DT: data type
-          function
-        ... with parameters
-          pointer to instance of type DT (not function type)
-        ... returning
-          reference to instance of type DT (not function type)
-
-        ... with resolved type:
-          pointer to forall
-            [unbound]:data type
-            function
-          ... with parameters
-            pointer to instance of type [unbound] (not function type)
-          ... returning
-            reference to instance of type [unbound] (not function type)
-
-        ... to arguments
-        Variable Expression: x: pointer to instance of struct A without body
-        ... with resolved type:
-          pointer to instance of struct A without body
-
-      ... with resolved type:
-        reference to instance of struct A without body
-    ... to: nothing
-    ... with resolved type:
-      void
-  (types:
-    void
-  )
-  Environment:([unbound]) -> instance of struct A without body (no widening)
 
 

tests/meta/.expect/archVast.nast.x64.txt

@@ -7 +7 @@
   char Alternatives are:
 Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FX64: signed int
+      Variable Expression: FX64: double
       ... with resolved type:
-        signed int
+        double
     ... to:
       char
@@ -39 +39 @@
 
 Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
-      Variable Expression: FX64: double
+      Variable Expression: FX64: signed int
       ... with resolved type:
-        double
+        signed int
     ... to:
       char