@shd101wyy/yo 0.1.26 → 0.1.27

package/std/fs/metadata.yo

@@ -18,116 +18,96 @@
 //!   printf("is file: %d\n", i32(m.is_file()));
 //! });
 //! ```
-
-{ GlobalAllocator } :: import "../allocator";
+{ GlobalAllocator } :: import("../allocator");
 { malloc, free } :: GlobalAllocator;
-open import "../string";
-{ Path } :: import "../path";
-{ IOError } :: import "../sys/errors";
-{ Error, AnyError, Exception } :: import "../error";
-{ Statx } :: import "../sys/statx";
-IO_file :: import "../sys/file";
-{
-  AT_FDCWD, AT_SYMLINK_NOFOLLOW, AT_STATX_SYNC_AS_STAT,
-  STATX_BASIC_STATS, S_IFMT, S_IFREG, S_IFDIR, S_IFLNK,
-  S_IWUSR, S_IWGRP, S_IWOTH
-} :: import "../sys/constants";
-
+open(import("../string"));
+{ Path } :: import("../path");
+{ IOError } :: import("../sys/errors");
+{ Error, AnyError, Exception } :: import("../error");
+{ Statx } :: import("../sys/statx");
+IO_file :: import("../sys/file");
+{ AT_FDCWD, AT_SYMLINK_NOFOLLOW, AT_STATX_SYNC_AS_STAT, STATX_BASIC_STATS, S_IFMT, S_IFREG, S_IFDIR, S_IFLNK, S_IWUSR, S_IWGRP, S_IWOTH } :: import("../sys/constants");
 /// File metadata wrapper around `Statx`.
 Metadata :: object(
   _statx : Statx,
   _buf_ptr : *(u8)
 );
-
-impl(Metadata,
+impl(
+  Metadata,
   // File size in bytes.
-  size : (fn(self: Self) -> i64)(
+  size : (fn(self : Self) -> i64)(
     self._statx.size()
   ),
-
   // Raw permission mode bits.
-  mode : (fn(self: Self) -> u32)(
+  mode : (fn(self : Self) -> u32)(
     self._statx.mode()
   ),
-
   // True if this is a regular file.
-  is_file : (fn(self: Self) -> bool)(
+  is_file : (fn(self : Self) -> bool)(
     self._statx.is_file()
   ),
-
   // True if this is a directory.
-  is_dir : (fn(self: Self) -> bool)(
+  is_dir : (fn(self : Self) -> bool)(
     self._statx.is_directory()
   ),
-
   // True if this is a symbolic link.
-  is_symlink : (fn(self: Self) -> bool)(
+  is_symlink : (fn(self : Self) -> bool)(
     self._statx.is_symlink()
   ),
-
   // Last modification time (seconds since epoch).
-  modified_time : (fn(self: Self) -> i64)(
+  modified_time : (fn(self : Self) -> i64)(
     self._statx.mtime_sec()
   ),
-
   // Last access time (seconds since epoch).
-  accessed_time : (fn(self: Self) -> i64)(
+  accessed_time : (fn(self : Self) -> i64)(
     self._statx.atime_sec()
   ),
-
   // Status change time (seconds since epoch).
-  created_time : (fn(self: Self) -> i64)(
+  created_time : (fn(self : Self) -> i64)(
     self._statx.ctime_sec()
   ),
-
   // True if the file is read-only (no write permission for anyone).
-  is_readonly : (fn(self: Self) -> bool)({
+  is_readonly : (fn(self : Self) -> bool)({
     m := self._statx.mode();
-    ((m & ((S_IWUSR | S_IWGRP) | S_IWOTH)) == u32(0))
+    (m & ((S_IWUSR | S_IWGRP) | S_IWOTH)) == u32(0)
   }),
-
   // Owner user ID.
-  uid : (fn(self: Self) -> u32)(
+  uid : (fn(self : Self) -> u32)(
     self._statx.uid()
   ),
-
   // Owner group ID.
-  gid : (fn(self: Self) -> u32)(
+  gid : (fn(self : Self) -> u32)(
     self._statx.gid()
   ),
-
   // Inode number.
-  ino : (fn(self: Self) -> u64)(
+  ino : (fn(self : Self) -> u64)(
     self._statx.ino()
   ),
-
   // Number of hard links.
-  nlink : (fn(self: Self) -> u64)(
+  nlink : (fn(self : Self) -> u64)(
     self._statx.nlink()
   )
 );
-
-impl(Metadata, Dispose(
-  dispose : (fn(self: Self) -> unit)({
-    free(.Some(*(void)(self._buf_ptr)));
-  })
-));
-
-export Metadata;
-
+impl(
+  Metadata,
+  Dispose(
+    dispose : (fn(self : Self) -> unit)({
+      free(.Some(*(void)(self._buf_ptr)));
+    })
+  )
+);
+export(Metadata);
 // ============================================================================
 // Statx buffer size extern
 // ============================================================================
-
-extern "Yo",
+extern(
+  "Yo",
   __yo_statx_buf_size : (fn() -> usize)
-;
-
+);
 // ============================================================================
 // Internal helper to stat a path
 // ============================================================================
-
-_stat_path :: (fn(path: Path, flags: i32, using(io : IO)) -> Impl(Future(Metadata, IO, Exception)))(
+_stat_path :: (fn(path : Path, flags : i32, using(io : IO)) -> Impl(Future(Metadata, IO, Exception)))(
   io.async((using(io, exn)) => {
     cstr_bytes := path.to_string().to_cstr();
     cstr := cstr_bytes.ptr().unwrap();
@@ -137,34 +117,21 @@ _stat_path :: (fn(path: Path, flags: i32, using(io : IO)) -> Impl(Future(Metadat
     cond(
       (result < i32(0)) => {
         free(.Some(*(void)(buf)));
-        exn.throw(dyn IOError.from_errno((i32(0) - result)))
+        exn.throw(dyn(IOError.from_errno(i32(0) - result)))
       },
       true => {
-        sx := Statx(_buf_ptr: buf, _buf_size: buf_size);
-        Metadata(_statx: sx, _buf_ptr: buf)
+        sx := Statx(_buf_ptr : buf, _buf_size : buf_size);
+        Metadata(_statx : sx, _buf_ptr : buf)
       }
     )
   })
 );
-
 /// Get metadata for a path (follows symlinks).
-metadata :: (fn(path: Path, using(io : IO)) -> Impl(Future(Metadata, IO, Exception)))
-  _stat_path(path, AT_STATX_SYNC_AS_STAT)
-;
-
+metadata :: (fn(path : Path, using(io : IO)) -> Impl(Future(Metadata, IO, Exception)))(_stat_path(path, AT_STATX_SYNC_AS_STAT));
 /// Get metadata for a path given as a raw string (follows symlinks).
-metadata_str :: (fn(path: str, using(io : IO)) -> Impl(Future(Metadata, IO, Exception)))
-  metadata(Path.new(String.from(path)))
-;
-
+metadata_str :: (fn(path : str, using(io : IO)) -> Impl(Future(Metadata, IO, Exception)))(metadata(Path.new(String.from(path))));
 /// Get metadata for a path (does NOT follow symlinks).
-symlink_metadata :: (fn(path: Path, using(io : IO)) -> Impl(Future(Metadata, IO, Exception)))
-  _stat_path(path, (AT_SYMLINK_NOFOLLOW | AT_STATX_SYNC_AS_STAT))
-;
-
+symlink_metadata :: (fn(path : Path, using(io : IO)) -> Impl(Future(Metadata, IO, Exception)))(_stat_path(path, AT_SYMLINK_NOFOLLOW | AT_STATX_SYNC_AS_STAT));
 /// Get metadata for a path given as a raw string (does NOT follow symlinks).
-symlink_metadata_str :: (fn(path: str, using(io : IO)) -> Impl(Future(Metadata, IO, Exception)))
-  symlink_metadata(Path.new(String.from(path)))
-;
-
-export metadata, metadata_str, symlink_metadata, symlink_metadata_str;
+symlink_metadata_str :: (fn(path : str, using(io : IO)) -> Impl(Future(Metadata, IO, Exception)))(symlink_metadata(Path.new(String.from(path))));
+export(metadata, metadata_str, symlink_metadata, symlink_metadata_str);

package/std/fs/temp.yo

@@ -17,31 +17,31 @@
 //!   io.await(dir.remove());
 //! });
 //! ```
-
-{ GlobalAllocator } :: import "../allocator";
+{ GlobalAllocator } :: import("../allocator");
 { malloc, free } :: GlobalAllocator;
-open import "../string";
-open import "../fmt";
-{ Path } :: import "../path";
-{ IOError } :: import "../sys/errors";
-{ Error, AnyError, Exception } :: import "../error";
-_file_mod :: import "./file";
-_dir_mod :: import "./dir";
-IO_temp :: import "../sys/temp";
-IO_file :: import "../sys/file";
-{ memcpy } :: import "../libc/string";
-{ platform, Platform } :: import "../process";
-{ env } :: import "../env";
-
+open(import("../string"));
+open(import("../fmt"));
+{ Path } :: import("../path");
+{ IOError } :: import("../sys/errors");
+{ Error, AnyError, Exception } :: import("../error");
+_file_mod :: import("./file");
+_dir_mod :: import("./dir");
+IO_temp :: import("../sys/temp");
+IO_file :: import("../sys/file");
+{ memcpy } :: import("../libc/string");
+{ platform, Platform } :: import("../process");
+{ env } :: import("../env");
 _default_tmp_dir :: (fn() -> String)(
   cond(
     (platform == Platform.Windows) => {
       temp := env.get(`TEMP`);
-      match(temp,
+      match(
+        temp,
         .Some(v) => v,
         .None => {
           tmp := env.get(`TMP`);
-          match(tmp,
+          match(
+            tmp,
             .Some(v2) => v2,
             .None => `C:\\Temp`
           )
@@ -51,17 +51,15 @@ _default_tmp_dir :: (fn() -> String)(
     true => `/tmp`
   )
 );
-
-
 /// Temporary directory that can be cleaned up with `remove`.
 TempDir :: object(
-  _path    : Path,
+  _path : Path,
   _removed : bool
 );
-
-impl(TempDir,
+impl(
+  TempDir,
   // Create a temporary directory in the given parent directory.
-  new_in : (fn(parent: Path, using(io : IO)) -> Impl(Future(TempDir, IO, Exception)))(
+  new_in : (fn(parent : Path, using(io : IO)) -> Impl(Future(TempDir, IO, Exception)))(
     io.async((using(io, exn)) => {
       // Build template: parent/yo_tmp_XXXXXX
       template_path := parent.join(Path.new(`yo_tmp_XXXXXX`));
@@ -76,53 +74,49 @@ impl(TempDir,
       cond(
         (result < i32(0)) => {
           free(.Some(*(void)(buf)));
-          exn.throw(dyn IOError.from_errno((i32(0) - result)));
+          exn.throw(dyn(IOError.from_errno(i32(0) - result)));
         },
         true => ()
       );
       path_str := String.from_cstr(buf).unwrap();
       free(.Some(*(void)(buf)));
-      TempDir(_path: Path.new(path_str), _removed: false)
+      TempDir(_path : Path.new(path_str), _removed : false)
     })
   ),
-
   // Create a temporary directory in the system temp dir.
   new : (fn(using(io : IO)) -> Impl(Future(TempDir, IO, Exception)))(
     TempDir.new_in(Path.new(_default_tmp_dir()))
   ),
-
   // Get the path of the temporary directory.
-  path : (fn(self: Self) -> Path)(
+  path : (fn(self : Self) -> Path)(
     self._path
   ),
-
   // Remove the temporary directory.
-  remove : (fn(self: Self, using(io : IO)) -> Impl(Future(unit, IO, Exception)))({
+  remove : (fn(self : Self, using(io : IO)) -> Impl(Future(unit, IO, Exception)))({
     self_path := self._path;
-    io.async((using(io, exn)) => 
-      cond(
-        self._removed => (),
-        true => {
-          io.await(_dir_mod.remove_dir(self_path));
-          self._removed = true;
-        }
-      )
+    io.async(
+      (using(io, exn)) =>
+        cond(
+          self._removed => (),
+          true => {
+            io.await(_dir_mod.remove_dir(self_path));
+            self._removed = true;
+          }
+        )
     )
   })
 );
-
-export TempDir;
-
+export(TempDir);
 /// Temporary file backed by a `File` handle.
 TempFile :: object(
   _file : _file_mod.File,
   _path : Path,
   _removed : bool
 );
-
-impl(TempFile,
+impl(
+  TempFile,
   // Create a temporary file in the given parent directory.
-  new_in : (fn(parent: Path, using(io : IO)) -> Impl(Future(TempFile, IO, Exception)))(
+  new_in : (fn(parent : Path, using(io : IO)) -> Impl(Future(TempFile, IO, Exception)))(
     io.async((using(io, exn)) => {
       // Build template: parent/yo_tmp_XXXXXX
       template_path := parent.join(Path.new(`yo_tmp_XXXXXX`));
@@ -136,48 +130,44 @@ impl(TempFile,
       cond(
         (fd < i32(0)) => {
           free(.Some(*(void)(buf)));
-          exn.throw(dyn IOError.from_errno((i32(0) - fd)));
+          exn.throw(dyn(IOError.from_errno(i32(0) - fd)));
         },
         true => ()
       );
       path_str := String.from_cstr(buf).unwrap();
       free(.Some(*(void)(buf)));
       path := Path.new(path_str);
-      file := _file_mod.File(_fd: fd, _path: path, _is_closed: false);
-      TempFile(_file: file, _path: path, _removed: false)
+      file := _file_mod.File(_fd : fd, _path : path, _is_closed : false);
+      TempFile(_file : file, _path : path, _removed : false)
     })
   ),
-
   // Create a temporary file in the system temp dir.
   new : (fn(using(io : IO)) -> Impl(Future(TempFile, IO, Exception)))(
     TempFile.new_in(Path.new(_default_tmp_dir()))
   ),
-
   // Get the underlying File object.
-  file : (fn(self: Self) -> _file_mod.File)(
+  file : (fn(self : Self) -> _file_mod.File)(
     self._file
   ),
-
   // Get the path of the temporary file.
-  path : (fn(self: Self) -> Path)(
+  path : (fn(self : Self) -> Path)(
     self._path
   ),
-
   // Remove the temporary file.
-  remove : (fn(self: Self, using(io : IO)) -> Impl(Future(unit, IO, Exception)))({
+  remove : (fn(self : Self, using(io : IO)) -> Impl(Future(unit, IO, Exception)))({
     self_file := self._file;
     self_path := self._path;
-    io.async((using(io, exn)) =>
-      cond(
-        self._removed => (),
-        true => {
-          io.await(self_file.close());
-          io.await(_dir_mod.remove_file(self_path));
-          self._removed = true;
-        }
-      )
+    io.async(
+      (using(io, exn)) =>
+        cond(
+          self._removed => (),
+          true => {
+            io.await(self_file.close());
+            io.await(_dir_mod.remove_file(self_path));
+            self._removed = true;
+          }
+        )
     )
   })
 );
-
-export TempFile;
+export(TempFile);

package/std/fs/types.yo

@@ -1,10 +1,5 @@
 //! File system types for open modes, permissions, and seek positions.
-
-{
-  O_RDONLY, O_WRONLY, O_RDWR, O_CREAT, O_TRUNC, O_APPEND,
-  O_EXCL, O_CLOEXEC, DEFAULT_FILE_MODE
-} :: import "../sys/constants";
-
+{ O_RDONLY, O_WRONLY, O_RDWR, O_CREAT, O_TRUNC, O_APPEND, O_EXCL, O_CLOEXEC, DEFAULT_FILE_MODE } :: import("../sys/constants");
 /// Determines how a file is opened.
 OpenMode :: enum(
   /// Read an existing file (O_RDONLY).
@@ -18,62 +13,55 @@ OpenMode :: enum(
   /// Create a new file, fail if it already exists (O_WRONLY | O_CREAT | O_EXCL).
   CreateNew
 );
-
 // Convert OpenMode to POSIX open flags.
-_open_mode_to_flags :: (fn(mode: OpenMode) -> i32)(
-  match(mode,
-    .Read      => (O_RDONLY | O_CLOEXEC),
-    .Write     => (((O_WRONLY | O_CREAT) | O_TRUNC) | O_CLOEXEC),
-    .Append    => (((O_WRONLY | O_CREAT) | O_APPEND) | O_CLOEXEC),
+_open_mode_to_flags :: (fn(mode : OpenMode) -> i32)(
+  match(
+    mode,
+    .Read => (O_RDONLY | O_CLOEXEC),
+    .Write => (((O_WRONLY | O_CREAT) | O_TRUNC) | O_CLOEXEC),
+    .Append => (((O_WRONLY | O_CREAT) | O_APPEND) | O_CLOEXEC),
     .ReadWrite => (O_RDWR | O_CLOEXEC),
     .CreateNew => (((O_WRONLY | O_CREAT) | O_EXCL) | O_CLOEXEC)
   )
 );
-
 // Returns the POSIX mode for an OpenMode.
 // Read/ReadWrite don't create files, so mode is 0.
 // Write/Append/CreateNew create files, so use the given permission.
-_open_mode_needs_perm :: (fn(mode: OpenMode) -> bool)(
-  match(mode,
-    .Read      => false,
-    .Write     => true,
-    .Append    => true,
+_open_mode_needs_perm :: (fn(mode : OpenMode) -> bool)(
+  match(
+    mode,
+    .Read => false,
+    .Write => true,
+    .Append => true,
     .ReadWrite => false,
     .CreateNew => true
   )
 );
-
-export OpenMode, _open_mode_to_flags, _open_mode_needs_perm;
-
+export(OpenMode, _open_mode_to_flags, _open_mode_needs_perm);
 /// POSIX file permission bits.
 FilePermission :: newtype(
   mode : u32
 );
-
-impl(FilePermission,
+impl(
+  FilePermission,
   // Default file permissions: rw-r--r-- (0o644)
   default : (fn() -> Self)(
-    Self(mode: u32(0o644))
+    Self(mode : u32(0o644))
   ),
-
   // Executable permissions: rwxr-xr-x (0o755)
   executable : (fn() -> Self)(
-    Self(mode: u32(0o755))
+    Self(mode : u32(0o755))
   ),
-
   // Read-only permissions: r--r--r-- (0o444)
   readonly : (fn() -> Self)(
-    Self(mode: u32(0o444))
+    Self(mode : u32(0o444))
   ),
-
   // Private permissions: rw------- (0o600)
   private : (fn() -> Self)(
-    Self(mode: u32(0o600))
+    Self(mode : u32(0o600))
   )
 );
-
-export FilePermission;
-
+export(FilePermission);
 /// Reference point for file seek operations.
 SeekFrom :: enum(
   /// Seek from the beginning of the file.
@@ -83,14 +71,13 @@ SeekFrom :: enum(
   /// Seek relative to the end of the file.
   End
 );
-
 // Convert SeekFrom to POSIX whence constant (i32).
-_seek_from_to_whence :: (fn(from: SeekFrom) -> i32)(
-  match(from,
-    .Start   => i32(0),
+_seek_from_to_whence :: (fn(from : SeekFrom) -> i32)(
+  match(
+    from,
+    .Start => i32(0),
     .Current => i32(1),
-    .End     => i32(2)
+    .End => i32(2)
   )
 );
-
-export SeekFrom, _seek_from_to_whence;
+export(SeekFrom, _seek_from_to_whence);