Cli: better interactive mode check

Ernest1338 · Feb 1, 2025 · c1a4a70 · c1a4a70
1 parent 16980af
commit c1a4a70
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 10 deletions.
diff --git a/src/args.rs b/src/args.rs
@@ -31,7 +31,7 @@ pub struct AppArgs {
     pub output: PathBuf,
 }
 
-pub fn get_args(args: Vec<String>) -> AppArgs {
+pub fn get_args(args: &Vec<String>) -> AppArgs {
     let mut args = args.iter().skip(1); // Skip the program name
 
     let mut input = None;

diff --git a/src/black.rs b/src/black.rs
@@ -10,8 +10,6 @@ use std::{
 };
 
 // TODO:
-// - more test cases for error returns (eg var access when doesnt exist in interpreter)
-// - restructurize so the copiler and interpreter are libraries and cli is a bin
 // - if, else expr
 // - fn expr
 // - type checker
@@ -20,7 +18,6 @@ use std::{
 // - formatter (another bin)
 // - build system (toml? github repos as packages. line eg. Ernest1338/package = "0.1")
 // - more test cases
-// - build for arm64 in actions, upload artifacts
 
 mod args;
 use args::get_args;
@@ -48,9 +45,10 @@ const INTERACTIVE_BANNER: &str = "\
 
 /// Entry point of the language CLI
 fn main() {
-    let args = get_args(std::env::args().collect());
+    let env_args = std::env::args().collect();
+    let args = get_args(&env_args);
 
-    if args.input.is_none() {
+    if env_args.len() == 1 {
         // ----------------
         // Interactive mode
         // ----------------

diff --git a/src/tests.rs b/src/tests.rs
@@ -387,7 +387,7 @@ fn cli_interpreter() {
 
 #[test]
 fn args_interpreter() {
-    let app_args = get_args(args(&["binary", "-i", "input"]));
+    let app_args = get_args(&args(&["binary", "-i", "input"]));
     assert!(
         app_args
             == AppArgs {
@@ -402,7 +402,7 @@ fn args_interpreter() {
 
 #[test]
 fn args_compiler_out() {
-    let app_args = get_args(args(&["binary", "-o", "outfile"]));
+    let app_args = get_args(&args(&["binary", "-o", "outfile"]));
     assert!(
         app_args
             == AppArgs {
@@ -417,7 +417,7 @@ fn args_compiler_out() {
 
 #[test]
 fn args_build_and_run_out() {
-    let app_args = get_args(args(&["binary", "-r", "-o", "outfile"]));
+    let app_args = get_args(&args(&["binary", "-r", "-o", "outfile"]));
     assert!(
         app_args
             == AppArgs {
@@ -428,7 +428,7 @@ fn args_build_and_run_out() {
                 output: PathBuf::from("outfile")
             }
     );
-    let app_args = get_args(args(&["binary", "-o", "outfile", "-r"]));
+    let app_args = get_args(&args(&["binary", "-o", "outfile", "-r"]));
     assert!(
         app_args
             == AppArgs {