Almost Alpha

Massive improvements across the board.

One day I'll adopt incremental commits.

examples/file-browser/main.orc

@@ -1,46 +1,35 @@
 import system::(io, fs, async)
-import std::(to_string, to_uint, inspect)
+import std::(conv::(to_string, to_uint), inspect)
 
---[
-const folder_view_old := \path. do{
-  cps println $ "Contents of " ++ fs::os_print path;
+const folder_view := \path. do cps {
+  cps println $ "Contents of ${path}";
   cps entries = async::block_on $ fs::read_dir path;
   cps list::enumerate entries
     |> list::map ((t[id, t[name, is_dir]]) =>
-      println $ to_string id ++ ": " ++ fs::os_print name ++ if is_dir then "/" else ""
+      println $ "${id}: ${name}" ++ if is_dir then "/" else ""
     )
     |> list::chain;
-  cps print "select an entry, or .. to move up: ";
-  cps choice = readln;
-  if (choice == "..") then do {
-    let parent_path = fs::pop_path path
-      |> option::assume
-      |> tuple::pick 0 2;
-    next parent_path
-  } else do {
+  cps choice = prompt "select an entry, or .. to move up: ";
+  cps new_path = if choice == ".." then do cps {
+    let t[parent_path, _] = fs::pop_path path
+      |> option::assume;
+    cps pass parent_path;
+  } else do cps {
     let t[subname, is_dir] = to_uint choice
       |> (list::get entries)
       |> option::assume;
     let subpath = fs::join_paths path subname;
-    if is_dir then next subpath
-    else do {
+    cps if is_dir then pass subpath else do cps {
       cps file = async::block_on $ fs::read_file subpath;
       cps contents = async::block_on $ io::read_string file;
       cps println contents;
-      next path
-    }
-  }
-}
-]--
-
-const folder_view := \path. do cps {
-  cps println $ "Contents of " ++ fs::os_print path;
-  cps entries = async::block_on $ fs::read_dir path;
-  let t[name, is_dir] = option::assume $ list::get entries 0;
-  cps println $ to_string name ++ " " ++ fs::os_print is_dir
+      cps _ = prompt "Hit Enter to return to the parent directory: ";
+      cps pass path;
+    };
+  };
+  cps pass new_path;
 }
 
 const main := loop_over (path = fs::cwd) {
-  cps folder_view path;
+  cps path = folder_view path;
 }
-