maj lib

HerrmannM
1 parent 5265d902
Showing 3 changed files with 40 additions and 3 deletions Show diff stats
anubis_dev/library/tools/2-4tree.anubis
anubis_dev/library/tools/finger_trees.anubis
anubis_dev/library/tools/iterators.anubis
   Author       : Matthieu Herrmann
   Creation     : 2014/04/14
-  Last update  : 2014/10/02 13:56 by matthieu@embryo (inserted by vim).
+  Last update  : 2015/02/26 11:30 by matthieu@Embryo (inserted by vim).
   ======================================================================================================================
   Library import:
 read tools/basis.anubis
@@ -125,6 +125,16 @@ public define Tree($Entry) insert(
     Tree($Entry)      tr
   ).
+
+    *** (2.4) Operators
+        ================================================================================================================
+
+public define inline Tree($Entry) Tree($Entry) l + Tree($Entry) r.
+
+public define inline Tree($Entry) Tree($Entry) l - Tree($Entry) r.
+
+public define inline Tree($Entry) Tree($Entry) l - $Entry r.
+
   *** (3) Searching
       ==================================================================================================================
@@ -1967,6 +1977,23 @@ public define Tree($Entry) insert(
     Tree($Entry)      tr
   ) = insert(take_left(l), tr).
+
+  *** [10] Operators
+      ==================================================================================================================
+
+public define inline Tree($Entry) Tree($Entry) l + Tree($Entry) r = union(l, r).
+
+public define inline Tree($Entry) Tree($Entry) l - $Entry r = remove(r, l).
+
+public define inline Tree($Entry) Tree($Entry) l - Tree($Entry) r =
+  fold_left(take_left(r), l, (Tree($Entry) t, $Entry e)|-> t - e).
+
+
+
+
+
+
+
   ======================================================================================================================
   = Testing part =======================================================================================================
   ======================================================================================================================
   Author       : Matthieu Herrmann
   Creation     : 2014/02/10
-  Last update  : 2014/04/15 14:19 by matthieu@embryo (inserted by vim).
+  Last update  : 2015/01/29 18:44 by matthieu@Embryo (inserted by vim).
   ======================================================================================================================
   Library import:
 read tools/basis.anubis
   Author       : Matthieu Herrmann
   Creation     : 2014/02/10
-  Last update  : 2014/09/22 16:39 by matthieu@embryo (inserted by vim).
+  Last update  : 2015/03/09 11:33 by matthieu@Embryo (inserted by vim).
   ======================================================================================================================
   ======================================================================================================================
@@ -181,6 +181,10 @@ public define Iterator(($A,$B)) zip(Iterator($A) it1, Iterator($B) it2).
   *** (6) Iterator printing
       ==================================================================================================================
+    Create a sequential string representation of the iterator with a custom separator and enclosing string only puts
+  if the iterator is non-empty.
+public define String to_string(Iterator($A) it, $A->String op, String first, String sep, String last).
+
     Create a sequential string representation of the iterator with a custom separator.
 public define String to_string(Iterator($A) it, $A->String op, String sep).
@@ -488,6 +492,7 @@ public define Int length(Iterator($A) ita) = length(ita, 0).
     *** [7.1] Internal printing definitions
         ================================================================================================================
+    Put the Separators on the following prints
 define String to_string2(Iterator($A) it, $A->String op, String sep, String str) =
   if get(it) is
   {
@@ -495,6 +500,7 @@ define String to_string2(Iterator($A) it, $A-&gt;String op, String sep, String str)
     success(s)  then to_string2( next(it), op, sep, str + sep + op(s))
   }.
+    Do not put the separator on the 'first' print
 define String to_string(Iterator($A) it, $A->String op, String sep, String str) =
   if get(it) is
   {
@@ -502,9 +508,13 @@ define String to_string(Iterator($A) it, $A-&gt;String op, String sep, String str) 
     success(s)  then to_string2( next(it), op, sep, str + op(s))
   }.
+
     *** [7.2] Public printing interface.
         ================================================================================================================
+public define String to_string(Iterator($A) it, $A->String op, String first, String sep, String last) =
+  if it is nil then "" else to_string(it, op, sep, first) + last.
+
 public define String to_string(Iterator($A) it, $A->String op, String sep) = to_string(it, op, sep, "").
 public define String to_string(Iterator($A) it, $A->String op) = to_string(it, op, ", ").