added: os.args to get CLI arguments

Author: brendanfh

core/module.onyx

@@ -85,6 +85,7 @@ use runtime
 
 #if runtime.platform.Supports_Os {
     #load "./os/os"
+    #load "./os/args"
 }
 
 #if runtime.platform.Supports_Processes {

core/os/args.onyx

@@ -0,0 +1,16 @@
+package core.os
+
+use runtime
+use core.iter
+
+args :: (allocator := context.allocator) -> (result: [] str) {
+    args := runtime.platform.__args(allocator)
+
+    result = make([] str, args.count, allocator)
+    for a, i in args {
+        result[i] = args[i] |> str.as_str()
+    }
+
+    return
+}
+

core/runtime/platform/onyx/platform.onyx

@@ -107,6 +107,18 @@ ProcessData :: #distinct u64
     __random_get        :: (buf: [] u8) -> void ---
 }
 
+__args :: (allocator: Allocator) -> [] cstr {
+    args : [] cstr;
+    argv_buf_size : i32;
+    __args_sizes_get(&args.count, &argv_buf_size);
+
+    args = make([] cstr, args.count, allocator);
+    argv_buf := cast([&] u8) allocator->alloc(argv_buf_size);
+    __args_get(args.data, argv_buf);
+
+    return args;
+}
+
 #if !#defined(runtime.vars.no_entrypoint) {
     use main
     #local MAIN_FUNCTION :: main.main
@@ -147,14 +159,7 @@ __start :: () {
         MAIN_FUNCTION();
 
     } else {
-        args : [] cstr;
-        argv_buf_size : i32;
-        __args_sizes_get(&args.count, &argv_buf_size);
-
-        args = memory.make_slice(cstr, args.count);
-        argv_buf := cast(cstr) calloc(argv_buf_size);
-        __args_get(args.data, argv_buf);
-
+        args := __args(context.allocator);
         MAIN_FUNCTION(args);
     }
 

core/runtime/platform/wasi/platform.onyx

@@ -210,6 +210,32 @@ __poll :: (fds: [] PollDescription, timeout: i32) -> void {
     }
 }
 
+__args :: (allocator: Allocator) -> [] cstr {
+    args : [] cstr;
+    argv_buf_size : i32;
+    args_sizes_get(&args.count, &argv_buf_size);
+
+    args = make(cstr, args.count, allocator);
+    argv_buf := cast([&] u8) allocator->alloc(argv_buf_size);
+    args_get(args.data, argv_buf);
+
+    // This post processing of the argv array needs to happen if the target is using
+    // 32-bit pointers, instead of 64-bits. Right now, Onyx pointers take up 64-bits,
+    // but in most circumstances, only the lower 32-bits are used. When webassembly
+    // standardizes the 64-bit address space, it will be an easy conversion over.
+    // But for right now, WASI will give the argv array 32-bit pointers, instead of
+    // 64-bit pointers. This loops expands the 32-bit pointers into 64-bit pointers
+    // while not clobbering any of them.
+    // while i := cast(i32) (args.count - 1); i >= 0 {
+    //     defer i -= 1;
+
+    //     args[i] = cast(cstr) (cast([&] u32) args.data)[i];
+    // }
+
+    return args;
+}
+
+
 
 // Sets up everything needed for execution.
 __start :: () {
@@ -220,28 +246,7 @@ __start :: () {
         MAIN_PKG.main();
 
     } else {
-        args : [] cstr;
-        argv_buf_size : Size;
-        args_sizes_get(&args.count, &argv_buf_size);
-
-        args = core.memory.make_slice(cstr, args.count);
-        argv_buf := cast(cstr) calloc(argv_buf_size);
-        args_get(args.data, argv_buf);
-
-
-        // This post processing of the argv array needs to happen if the target is using
-        // 32-bit pointers, instead of 64-bits. Right now, Onyx pointers take up 64-bits,
-        // but in most circumstances, only the lower 32-bits are used. When webassembly
-        // standardizes the 64-bit address space, it will be an easy conversion over.
-        // But for right now, WASI will give the argv array 32-bit pointers, instead of
-        // 64-bit pointers. This loops expands the 32-bit pointers into 64-bit pointers
-        // while not clobbering any of them.
-        while i := cast(i32) (args.count - 1); i >= 0 {
-            defer i -= 1;
-
-            args[i] = cast(cstr) (cast([&] u32) args.data)[i];
-        }
-
+        args := __args(context.allocator);
         MAIN_PKG.main(args);
     }
 

docs/ideas/platform_layer.md

@@ -90,6 +90,7 @@ this document will serve as that "header file"
 ### Procedures
 - `__exit(code: i32) -> void`
 - `__sleep(milliseconds: i32) -> void`
+- `__args(allocator: Allocator) -> [] cstr`
 
 ### Values
 

scripts/run_tests.onyx

@@ -18,7 +18,7 @@ print_color :: (color: Color, format: str, args: ..any) {
     buffer: [2048] u8;
     output := conv.str_format_va(buffer, format, args);
 
-    if runtime.compiler_os == .Linux && !settings.no_color {
+    if (runtime.compiler_os == .Linux || runtime.compiler_os == .MacOS) && !settings.no_color {
         color_code: str;
         switch color {
             case .Red do color_code = "\x1b[91m";

tests/stdlib/os_args

@@ -0,0 +1,2 @@
+New Args: [  ]
+Old Args: [  ]

tests/stdlib/os_args.onyx

@@ -0,0 +1,6 @@
+use core {*}
+
+main :: (args: [] cstr) {
+    os.args() |> printf("New Args: {}\n", _)
+         args |> printf("Old Args: {}\n", _)
+}