Changeset 4018

Timestamp:

Oct 31, 2008, 7:08:08 PM (12 years ago)

Author:

yura

Message:

• QSortBy, QSortAndNumBy.

File:

• to-imperative/trunk/java/refal/refal/plus/List2.rf (modified) (1 diff)

to-imperative/trunk/java/refal/refal/plus/List2.rf

@@ -245 +245 @@
 //  e.list;
 
-$func QSort_Split t.num e.list = (e.list) (e.list);
-QSort_Split t.num e.list,
-  () () e.list $iter {
-    e.list : t.head e.tail, {
-      <Le (t.head) (t.num)> = (e.smaller t.head) (e.greater) e.tail;
-      = (e.smaller) (e.greater t.head) e.tail;
-    };
-  } :: (e.smaller) (e.greater) e.list, e.list : /*empty*/ =
-  (e.smaller) (e.greater);
-
-$public $func QSort e.list = e.list;
-QSort {
-  /* empty */   = /* empty */;
-  t.head e.tail = <QSort_Split t.head e.tail> :: (e.smaller) (e.greater),
-    <QSort e.smaller> t.head <QSort e.greater>;
-};
-
 $public $func CompareTerms t.term t.term = s.cmp;
 CompareTerms t.term1 t.term2 = <Compare (t.term1) (t.term2)>;
+
+$func QSort_Split t.cmpTerm e.list = (e.smaller) (e.equal) (e.greater);
+QSort_Split t.cmpTerm e.list,
+  () () () e.list $iter {
+    e.list : t.head e.tail, 
+      <Apply t.cmpTerm t.head> : {
+        '<' = (e.smaller) (e.equal) (e.greater t.head) e.tail;
+        '=' = (e.smaller) (e.equal t.head) (e.greater) e.tail;
+        '>' = (e.smaller t.head) (e.equal) (e.greater) e.tail;
+    };
+  } :: (e.smaller) (e.equal) (e.greater) e.list, e.list : /*empty*/ =
+  (e.smaller) (e.equal) (e.greater);
+
+$public $func QSortBy t.cmpTerms e.list = e.list;
+QSortBy t.cmpTerms e.list = e.list : {
+  /* empty */   = /* empty */;
+  t.head e.tail = <QSort_Split (t.cmpTerms t.head) e.tail> :: (e.smaller) (e.equal) (e.greater),
+    <QSort e.smaller> t.head e.equal <QSort e.greater>;
+};
+
+$public $func QSort e.list = e.list;
+QSort e.list = <QSortBy &CompareTerms e.list>;
+
+$public $func QSortAndNubBy t.cmpTerms e.list = e.list;
+QSortAndNubBy t.cmpTerms e.list = e.list : {
+  /* empty */   = /* empty */;
+  t.head e.tail = <QSort_Split (t.cmpTerms t.head) e.tail> :: (e.smaller) t (e.greater),
+    <QSort e.smaller> t.head <QSort e.greater>;
+};
+
+$public $func QSortAndNub e.list = e.list;
+QSortAndNub e.list = <QSortAndNubBy &CompareTerms e.list>;
 
 $public $func Sort e.list = e.list;