Merge pull request #136 from radrow/stdlib-extensions

Updated some functions, renamed some stuff, added from_to IN STDLIB

priv/stdlib/List.aes

@@ -32,14 +32,16 @@ namespace List =
     []   => reverse(acc)
     h::t => find_indices_(p, t, n+1, if(p(h)) n::acc else acc)
 
-  function nth(n : int, l : list('a)) : option('a) = switch(l)
-    []   => None
-    h::t => if(n == 0) Some(h) else nth(n-1, t)
+  function nth(n : int, l : list('a)) : option('a) =
+    switch(l)
+      []   => None
+      h::t => if(n == 0) Some(h) else nth(n-1, t)
 
   /* Unsafe version of `nth` */
-  function get(n : int, l : list('a)) : 'a = switch(l)
-    [] => abort("Out of index get")
-    h::t => if(n == 0) h else get(n-1, t)
+  function get(n : int, l : list('a)) : 'a =
+    switch(l)
+      [] => abort(if(n < 0) "Negative index get" else "Out of index get")
+      h::t => if(n == 0) h else get(n-1, t)
 
 
   function length(l : list('a)) : int = length_(l, 0)
@@ -48,6 +50,13 @@ namespace List =
     _::t => length_(t, acc + 1)
 
 
+  function from_to(a : int, b : int) : list(int) = [a..b]
+
+  function from_to_step(a : int, b : int, s : int) : list(int) = from_to_step_(a, b, s, [])
+  private function from_to_step_(a, b, s, acc) =
+    if (a > b) reverse(acc) else from_to_step_(a + s, b, s, a :: acc)
+
+
   /* Unsafe. Replaces `n`th element of `l` with `e`. Crashes on over/underflow */
   function replace_at(n : int, e : 'a, l : list('a)) : list('a) =
     if(n<0) abort("insert_at underflow") else replace_at_(n, e, l, [])
@@ -66,14 +75,17 @@ namespace List =
      []   => abort("insert_at overflow")
      h::t => insert_at_(n-1, e, t, h::acc)
 
-  function insert_by(f : (('a, 'a) => bool), x : 'a, l : list('a)) : list('a) =
+  function insert_by(cmp : (('a, 'a) => bool), x : 'a, l : list('a)) : list('a) =
+    insert_by_(cmp, x, l, [])
+  private function insert_by_(cmp : (('a, 'a) => bool), x : 'a, l : list('a), acc : list('a)) : list('a) =
     switch(l)
-      []        => [x]
-      (e :: l') =>
-        if(f(x, e))
-          e :: insert_by(f, x, l')
+      []   => reverse(x::acc)
+      h::t =>
+        if(cmp(x, h)) // x < h
+          reverse(acc) ++ (x::l)
         else
-          x :: l
+          insert_by_(cmp, x, t, h::acc)
+
 
   function foldr(cons : ('a, 'b) => 'b, nil : 'b, l : list('a)) : 'b = switch(l)
     []   => nil
@@ -83,12 +95,12 @@ namespace List =
     []   => acc
     h::t => foldl(rcons, rcons(acc, h), t)
 
-  function foreach(f : 'a => unit, l : list('a)) : unit =
+  function foreach(l : list('a), f : 'a => unit) : unit =
     switch(l)
-     []   => ()
-     e :: l' =>
+     []    => ()
+     e::l' =>
        f(e)
-       foreach(f, l')
+       foreach(l', f)
 
   function reverse(l : list('a)) : list('a) = foldl((lst, el) => el :: lst, [], l)
 
@@ -144,7 +156,7 @@ namespace List =
     h::t => if(p(h)) partition_(p, t, h::acc_t, acc_f) else partition_(p, t, acc_t, h::acc_f)
 
 
-  function concats(ll : list(list('a))) : list('a) = foldr((l1, l2) => l1 ++ l2, [], ll)
+  function flatten(ll : list(list('a))) : list('a) = foldr((l1, l2) => l1 ++ l2, [], ll)
 
   function all(p : 'a => bool, l : list('a)) : bool = switch(l)
     []   => true

priv/stdlib/Option.aes

@@ -19,7 +19,7 @@ namespace Option =
 
   function force(o : option('a)) : 'a = default(abort("Forced None value"), o)
 
-  function on_elem(f : 'a => unit, o : option('a)) : unit = match((), f, o)
+  function on_elem(o : option('a), f : 'a => unit) : unit = match((), f, o)
 
   function map(f : 'a => 'b, o : option('a)) : option('b) = switch(o)
     None => None