Changeset 4023

Timestamp:

Nov 1, 2008, 2:48:03 PM (12 years ago)

Author:

yura

Message:

• Updated version: number first.

File:

• to-imperative/trunk/java/refal/refal/plus/List2.rf (modified) (3 diffs)

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

@@ -280 +280 @@
   e.new_list;
 
+$func FrequenciesHelp (e.expr) (s.num) = s.num e.expr;
+FrequenciesHelp (e.expr) (s.num) = s.num e.expr;
+  
 $public $func Frequencies e.list = e.list;
 Frequencies e.list =
@@ -288 +291 @@
       <Bind s.table (t.term) (<Add s.num 1>)>,
       $fail;
-    <MapIn &Concat <Entries s.table>>;
+    <Sort <MapIn &FrequenciesHelp <Entries s.table>>>;
   };
 
@@ -295 +298 @@
   <Table> :: s.table,
   {
-    e.list : e (e.expr s.n) e,
+    e.list : e (s.n e.expr) e,
       { <Lookup s.table e.expr>; 0; } : s.num,
       <Bind s.table (e.expr) (<Add s.num s.n>)>,
       $fail;
-    <MapIn &Concat <Entries s.table>>;
+    <Sort <MapIn &FrequenciesHelp <Entries s.table>>>;
   };