@shd101wyy/yo 0.1.25 → 0.1.27

package/std/os/env.yo

@@ -10,32 +10,31 @@
 //! home := home_dir();
 //! tmp  := temp_dir();
 //! ```
-
-open import "../string";
-{ platform, Platform } :: import "../process";
-{ env } :: import "../env";
-
+open(import("../string"));
+{ platform, Platform } :: import("../process");
+{ env } :: import("../env");
 // ============================================================================
 // Directory helpers
 // ============================================================================
-
 /// Return the current user's home directory, or `.None` if unavailable.
 home_dir :: (fn() -> Option(String))(
   cond(
-    (platform == Platform.Windows) => match(env.get(`USERPROFILE`),
-      .Some(p) => .Some(p),
-      .None    => match(env.get(`HOMEDRIVE`),
-        .None => .None,
-        .Some(drive) => match(env.get(`HOMEPATH`),
-          .None => .None,
-          .Some(path) => .Some(drive.concat(path))
+    (platform == Platform.Windows) => match(
+      env.get(`USERPROFILE`),
+      .Some(p) =>.Some(p),
+      .None => match(
+        env.get(`HOMEDRIVE`),
+        .None =>.None,
+        .Some(drive) => match(
+          env.get(`HOMEPATH`),
+          .None =>.None,
+          .Some(path) =>.Some(drive.concat(path))
         )
       )
     ),
     true => env.get(`HOME`)
   )
 );
-
 /// Return the user-specific configuration directory.
 ///
 /// - Linux/macOS: `$XDG_CONFIG_HOME` or `$HOME/.config`
@@ -43,16 +42,17 @@ home_dir :: (fn() -> Option(String))(
 config_dir :: (fn() -> Option(String))(
   cond(
     (platform == Platform.Windows) => env.get(`APPDATA`),
-    true => match(env.get(`XDG_CONFIG_HOME`),
-      .Some(d) => .Some(d),
-      .None => match(home_dir(),
-        .None => .None,
-        .Some(h) => .Some(h.concat(`/.config`))
+    true => match(
+      env.get(`XDG_CONFIG_HOME`),
+      .Some(d) =>.Some(d),
+      .None => match(
+        home_dir(),
+        .None =>.None,
+        .Some(h) =>.Some(h.concat(`/.config`))
       )
     )
   )
 );
-
 /// Return the user-specific cache directory.
 ///
 /// - Linux: `$XDG_CACHE_HOME` or `$HOME/.cache`
@@ -61,29 +61,31 @@ config_dir :: (fn() -> Option(String))(
 cache_dir :: (fn() -> Option(String))(
   cond(
     (platform == Platform.Windows) => env.get(`LOCALAPPDATA`),
-    (platform == Platform.Macos) => match(home_dir(),
-      .None => .None,
-      .Some(h) => .Some(h.concat(`/Library/Caches`))
+    (platform == Platform.Macos) => match(
+      home_dir(),
+      .None =>.None,
+      .Some(h) =>.Some(h.concat(`/Library/Caches`))
     ),
-    true => match(env.get(`XDG_CACHE_HOME`),
-      .Some(d) => .Some(d),
-      .None => match(home_dir(),
-        .None => .None,
-        .Some(h) => .Some(h.concat(`/.cache`))
+    true => match(
+      env.get(`XDG_CACHE_HOME`),
+      .Some(d) =>.Some(d),
+      .None => match(
+        home_dir(),
+        .None =>.None,
+        .Some(h) =>.Some(h.concat(`/.cache`))
       )
     )
   )
 );
-
 /// Return the system temporary directory.
 temp_dir :: (fn() -> String)(
   cond(
-    (platform == Platform.Windows) => match(env.get(`TEMP`),
+    (platform == Platform.Windows) => match(
+      env.get(`TEMP`),
       .Some(t) => t,
-      .None    => `C:\Temp`
+      .None => `C:\Temp`
     ),
     true => `/tmp`
   )
 );
-
-export home_dir, config_dir, cache_dir, temp_dir;
+export(home_dir, config_dir, cache_dir, temp_dir);

package/std/os/signal.yo

@@ -10,18 +10,13 @@
 //! handler :: (fn(data: *(u8)) -> unit)({ println("Caught SIGINT"); });
 //! on_signal(.Interrupt, handler);
 //! ```
-
-{ IOError } :: import "../sys/errors";
-{
-  on_signal : _on_signal, off_signal : _off_signal, SignalHandler
-} :: import "../sys/signal";
-{ platform, Platform } :: import "../process";
-{ Error, AnyError, Exception } :: import "../error";
-
+{ IOError } :: import("../sys/errors");
+{ on_signal : _on_signal, off_signal : _off_signal, SignalHandler } :: import("../sys/signal");
+{ platform, Platform } :: import("../process");
+{ Error, AnyError, Exception } :: import("../error");
 // ============================================================================
 // Signal enum
 // ============================================================================
-
 /// Portable signal identifiers.
 Signal :: enum(
   /// SIGINT — interrupt from keyboard (Ctrl-C).
@@ -41,11 +36,10 @@ Signal :: enum(
   /// SIGCHLD — child process status change.
   Child
 );
-
-export Signal;
-
-_signal_num :: (fn(sig: Signal) -> i32)(
-  match(sig,
+export(Signal);
+_signal_num :: (fn(sig : Signal) -> i32)(
+  match(
+    sig,
     .Interrupt => cond(
       (platform == Platform.Macos) => i32(2),
       true => i32(2)
@@ -80,33 +74,29 @@ _signal_num :: (fn(sig: Signal) -> i32)(
     )
   )
 );
-
 // ============================================================================
 // on_signal / off_signal
 // ============================================================================
-
 /// Register a handler for the given signal.
-on_signal :: (fn(sig: Signal, handler: SignalHandler, using(exn : Exception)) -> unit)({
+on_signal :: (fn(sig : Signal, handler : SignalHandler, using(exn : Exception)) -> unit)({
   num := _signal_num(sig);
-  r   := _on_signal(num, handler);
+  r := _on_signal(num, handler);
   cond(
     (r < i32(0)) => {
-      exn.throw(dyn IOError.from_errno((i32(0) - r)));
+      exn.throw(dyn(IOError.from_errno(i32(0) - r)));
     },
     true => ()
   );
 });
-
 /// Remove the handler for the given signal.
-off_signal :: (fn(sig: Signal, using(exn : Exception)) -> unit)({
+off_signal :: (fn(sig : Signal, using(exn : Exception)) -> unit)({
   num := _signal_num(sig);
-  r   := _off_signal(num);
+  r := _off_signal(num);
   cond(
     (r < i32(0)) => {
-      exn.throw(dyn IOError.from_errno((i32(0) - r)));
+      exn.throw(dyn(IOError.from_errno(i32(0) - r)));
     },
     true => ()
   );
 });
-
-export SignalHandler, on_signal, off_signal;
+export(SignalHandler, on_signal, off_signal);