Merge pull request #137 from Defelo/push-wtnqukuqukpw

add more builtins

Author: faiface

src/par/builtin/Builtin.par

@@ -1,6 +1,7 @@
 /// Nat
 
 dec Nat.Add   : [Nat, Nat] Nat
+dec Nat.Sub   : [Nat, Int] Nat
 dec Nat.Mul   : [Nat, Nat] Nat
 dec Nat.Div   : [Nat, Nat] Nat
 dec Nat.Mod   : [Nat, Nat] Nat
@@ -307,6 +308,7 @@ dec Os.TraverseDir : [Os.Path] Result<Os.Error, recursive either {
   .dir(Os.Path, self) self,
 }>
 
+dec Os.Env : List<(Bytes) Bytes>
 
 /// Url
 
@@ -366,6 +368,7 @@ type Map<k, v> = iterative choice {
 }
 
 dec Map.String : [type v] [List<(String) box v>] Map<String, v>
+dec Map.Bytes  : [type v] [List<(Bytes) box v>]  Map<Bytes, v>
 dec Map.Int    : [type v] [List<(Int) box v>]    Map<Int, v>
 dec Map.Nat    : [type v] [List<(Nat) box v>]    Map<Nat, v>
 
@@ -382,6 +385,7 @@ type BoxMap<k, v> = iterative box choice {
 }
 
 dec BoxMap.String : [type v] [List<(String) box v>] BoxMap<String, v>
+dec BoxMap.Bytes  : [type v] [List<(Bytes) box v>]  BoxMap<Bytes, v>
 dec BoxMap.Int    : [type v] [List<(Int) box v>]    BoxMap<Int, v>
 dec BoxMap.Nat    : [type v] [List<(Nat) box v>]    BoxMap<Nat, v>
 

src/par/builtin/boxmap.rs

@@ -37,6 +37,22 @@ pub fn external_module() -> Module<Arc<process::Expression<()>>> {
                 ),
                 |handle| Box::pin(boxmap_new(handle, Handle::string, Handle::provide_string)),
             ),
+            // BoxMap.Bytes : [type v] [List<(Bytes) box v>] BoxMap<Bytes, v>
+            Definition::external(
+                "Bytes",
+                Type::forall(
+                    "v",
+                    Type::function(
+                        Type::name(
+                            Some("List"),
+                            "List",
+                            vec![Type::pair(Type::bytes(), Type::box_(Type::var("v")))],
+                        ),
+                        Type::name(None, "BoxMap", vec![Type::bytes(), Type::var("v")]),
+                    ),
+                ),
+                |handle| Box::pin(boxmap_new(handle, Handle::bytes, Handle::provide_bytes)),
+            ),
             // BoxMap.Int : [type v] [List<(Int) box v>] BoxMap<Int, v>
             Definition::external(
                 "Int",

src/par/builtin/map.rs

@@ -34,6 +34,22 @@ pub fn external_module() -> Module<Arc<process::Expression<()>>> {
                 ),
                 |handle| Box::pin(map_new(handle, Handle::string, Handle::provide_string)),
             ),
+            // Map.Bytes : [type v] [List<(Bytes) box v>] Map<Bytes, v>
+            Definition::external(
+                "Bytes",
+                Type::forall(
+                    "v",
+                    Type::function(
+                        Type::name(
+                            Some("List"),
+                            "List",
+                            vec![Type::pair(Type::bytes(), Type::box_(Type::var("v")))],
+                        ),
+                        Type::name(None, "Map", vec![Type::bytes(), Type::var("v")]),
+                    ),
+                ),
+                |handle| Box::pin(map_new(handle, Handle::bytes, Handle::provide_bytes)),
+            ),
             // Map.Int : [type v] [List<(Int) box v>] Map<Int, v>
             Definition::external(
                 "Int",

src/par/builtin/nat.rs

@@ -22,6 +22,11 @@ pub fn external_module() -> Module<Arc<process::Expression<()>>> {
                 Type::function(Type::nat(), Type::function(Type::nat(), Type::nat())),
                 |handle| Box::pin(nat_add(handle)),
             ),
+            Definition::external(
+                "Sub",
+                Type::function(Type::nat(), Type::function(Type::int(), Type::nat())),
+                |handle| Box::pin(nat_sub(handle)),
+            ),
             Definition::external(
                 "Mul",
                 Type::function(Type::nat(), Type::function(Type::nat(), Type::nat())),
@@ -136,6 +141,12 @@ async fn nat_add(mut handle: Handle) {
     handle.provide_nat(x + y);
 }
 
+async fn nat_sub(mut handle: Handle) {
+    let x = handle.receive().nat().await;
+    let y = handle.receive().int().await;
+    handle.provide_nat((x - y).max(0.into()));
+}
+
 async fn nat_mul(mut handle: Handle) {
     let x = handle.receive().nat().await;
     let y = handle.receive().nat().await;

src/par/builtin/os.rs

@@ -156,6 +156,15 @@ pub fn external_module() -> Module<std::sync::Arc<process::Expression<()>>> {
                 ),
                 |handle| Box::pin(os_traverse_dir(handle)),
             ),
+            Definition::external(
+                "Env",
+                Type::name(
+                    Some("List"),
+                    "List",
+                    vec![Type::pair(Type::bytes(), Type::bytes())],
+                ),
+                |handle| Box::pin(os_env(handle)),
+            ),
         ],
     }
 }
@@ -565,6 +574,17 @@ async fn os_traverse_dir(mut handle: Handle) {
     }
 }
 
+async fn os_env(mut handle: Handle) {
+    for (name, value) in std::env::vars_os() {
+        handle.signal(literal!("item"));
+        let mut pair = handle.send();
+        pair.send().provide_bytes(os_to_bytes(&name));
+        pair.provide_bytes(os_to_bytes(&value));
+    }
+    handle.signal(literal!("end"));
+    handle.break_();
+}
+
 async fn pathbuf_from_os_path(mut handle: Handle) -> PathBuf {
     handle.signal(literal!("absolute"));
     let path_bytes = handle.bytes().await;