builtin: os: move file/dir creation/reading functions from Os.Path to separate functions

Author: faiface

examples/AdventOfCode/2019/Day1/Day1.par

@@ -3,7 +3,7 @@
 dec FileRead : [String] Result<!, String>
 def FileRead = [path]
   catch _ => .err! in
-  let try reader = Os.Path(path).openFile in
+  let try reader = path->Os.Path->Os.OpenFile in
   let parser = String.ParserFromReader(type Os.Error)(reader) in
   let try contents = parser.remainder in
   .ok contents

examples/CopyFile.par

@@ -12,10 +12,10 @@ def Main: ! = chan exit {
     exit!
   }
 
-  let try reader = Os.Path(src).openFile
+  let try reader = src->Os.Path->Os.OpenFile
   catch@w e => { reader.close; throw e }
 
-  let try@w writer = Os.Path(dst).createOrReplaceFile
+  let try@w writer = dst->Os.Path->Os.CreateOrReplaceFile
   catch@r e => { writer.close; throw e }
 
   [email protected] {

examples/Downloader.par

@@ -7,15 +7,15 @@ type Event = (Os.Path) either {  // destination
 
 def Main =
   let rootPath = Os.Path(".").append("Downloads") in
-  YieldDownloadRequests("127.0.0.1:3000", rootPath)  // : List<(Url) Os.Path>
+  YieldDownloadRequests("127.0.0.1:3000", rootPath)  // : List<(Url, Os.Path)!>
     ->Map1(box DownloadFile)                         // : List<List<Event>>
     ->FanIn1                                         // : List<Event>
     ->ShowDownloadProgress(rootPath)                 // : !
 
-def Map1 = Map(type (Url) Os.Path, List<Event>)
+def Map1 = Map(type (Url, Os.Path)!, List<Event>)
 def FanIn1 = FanIn(type Event)
 
-dec YieldDownloadRequests : [String, Os.Path] List<(Url) Os.Path>
+dec YieldDownloadRequests : [String, Os.Path] List<(Url, Os.Path)!>
 def YieldDownloadRequests = [listenUrl, rootPath] chan yield {
   Debug.Log(Concat(*("Listening on ", listenUrl, "...")))
   catch e => {
@@ -44,7 +44,7 @@ def YieldDownloadRequests = [listenUrl, rootPath] chan yield {
               ->Url.FromString
 
           let destination = rootPath.append(url.path->TrimStart("/"))
-          yield.item((sourceUrl) destination)
+          yield.item((sourceUrl, destination)!)
           respond((200, *()) Bytes.EmptyReader)
           next.loop
         }
@@ -57,8 +57,8 @@ def YieldDownloadRequests = [listenUrl, rootPath] chan yield {
   }
 }
 
-dec DownloadFile : [(Url) Os.Path] List<Event>
-def DownloadFile = [(sourceUrl) dest] chan yield {
+dec DownloadFile : [(Url, Os.Path)!] List<Event>
+def DownloadFile = [(sourceUrl, dest)!] chan yield {
   catch err => {
     yield.item((dest) .failed err)
     yield.end!
@@ -73,7 +73,7 @@ def DownloadFile = [(sourceUrl) dest] chan yield {
     .true! => {}
   }
 
-  let try@clearResp file = dest.createNewFile
+  let try@clearResp file = Os.CreateNewFile(dest)
   catch@clearFile err => { file.close; throw err }
 
   let default(0) totalSize = catch ! => .err! in

examples/MiniGrep.par

@@ -17,7 +17,7 @@ def Program: ! = chan exit {
     exit!
   }
 
-  let try paths: List<Os.Path> = TraverseDirectory(Os.Path(path))
+  let try paths: List<Os.Path> = path->Os.Path->TraverseDirectory
   paths.begin.case {
     .end! => {}
     .item(path) => {
@@ -26,7 +26,7 @@ def Program: ! = chan exit {
         console.print(e)
         paths.loop
       }
-      let try reader = path.openFile
+      let try reader = path->Os.OpenFile
       let lines = GrepFile(needle, reader)
       [email protected] {
         .end try! => {}
@@ -52,7 +52,7 @@ def Program: ! = chan exit {
 dec TraverseDirectory : [Os.Path] Result<Os.Error, List<Os.Path>>
 def TraverseDirectory = [dirPath]
   catch e => .err e in
-  let try tree = dirPath.traverseDir in
+  let try tree = Os.TraverseDir(dirPath) in
   .ok tree.begin.case {
     .end! => .end!,
     .file(path) rest => .item(path) rest.loop,

examples/WebServer.par

@@ -31,7 +31,7 @@ def Main: ! = chan exit {
 }
 
 dec ServePath : [Os.Path, String, [Http.Response] Result<Http.Error, !>] !
-def ServePath = [root, path, respond] Os.Path(path).listDir.case {
+def ServePath = [root, path, respond] path->Os.Path->Os.ListDir.case {
   .err _ => ServeFile(path, respond),
   .ok paths => ServeDir(root, paths, respond),
 }
@@ -44,7 +44,7 @@ def ServeFile = [path, respond] chan finish {
     finish!
   }
 
-  let try file = Os.Path(path).openFile
+  let try file = path->Os.Path->Os.OpenFile
   respond((200, *(("Content-Type") "text/plain")) file)
 
   finish!

src/par/builtin/Builtin.par

@@ -285,26 +285,27 @@ type Os.Path = iterative@append recursive@parent box choice {
 
   .parent => Option<self@parent>,
   .append(Bytes) => self@append,
-
-  .openFile => Result<Os.Error, Os.Reader>,
-  .createOrReplaceFile => Result<Os.Error, Os.Writer>,
-  .createNewFile => Result<Os.Error, Os.Writer>,
-  .appendToFile => Result<Os.Error, Os.Writer>,
-  .createOrAppendToFile => Result<Os.Error, Os.Writer>,
-
-  .listDir => Result<Os.Error, List<self@append>>,
-  .traverseDir => Result<Os.Error, recursive@tree either {
-    .end!,
-    .file(self@append) self@tree,
-    .dir(self@append, self@tree) self@tree,
-  }>,
-  .createDir => Result<Os.Error, !>,
 }
 
 dec Os.Path : [Bytes] Os.Path
 
 dec Os.Stdin  : Os.Reader
 dec Os.Stdout : Os.Writer
+dec Os.Stderr : Os.Writer
+
+dec Os.OpenFile             : [Os.Path] Result<Os.Error, Os.Reader>
+dec Os.CreateOrReplaceFile  : [Os.Path] Result<Os.Error, Os.Writer>
+dec Os.CreateNewFile        : [Os.Path] Result<Os.Error, Os.Writer>
+dec Os.AppendToFile         : [Os.Path] Result<Os.Error, Os.Writer>
+dec Os.CreateOrAppendToFile : [Os.Path] Result<Os.Error, Os.Writer>
+
+dec Os.CreateDir   : [Os.Path] Result<Os.Error, !>
+dec Os.ListDir     : [Os.Path] Result<Os.Error, List<Os.Path>>
+dec Os.TraverseDir : [Os.Path] Result<Os.Error, recursive either {
+  .end!,
+  .file(Os.Path) self,
+  .dir(Os.Path, self) self,
+}>
 
 
 /// Url
@@ -346,6 +347,12 @@ dec Http.Listen : [String] recursive either {
   .incoming(Http.Request, [Http.Response] Result<Http.Error, !>) self,
 }
 
+
+/// Time
+
+dec Time.Now : [!] Nat
+
+
 /// Map
 
 type Map<k, v> = iterative choice {
@@ -395,8 +402,3 @@ dec Cell.Share : [type a] [a, dual Cell<a>] a
 /// Debug
 
 dec Debug.Log : [String] !
-
-
-/// Time
-
-dec Time.Now : [!] Nat