Compare commits

...

12 commits

7 changed files with 42 additions and 22 deletions

2
Cargo.lock generated
View file

@ -4,4 +4,4 @@ version = 3
[[package]] [[package]]
name = "rash" name = "rash"
version = "0.4.0" version = "0.5.0"

View file

@ -1,6 +1,6 @@
[package] [package]
name = "rash" name = "rash"
version = "0.4.0" version = "0.5.0"
edition = "2021" edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View file

@ -3,7 +3,7 @@ use crate::{error::print_error, exit_code::ExitCode};
use std::env; use std::env;
use std::{env::set_current_dir, path::PathBuf}; use std::{env::set_current_dir, path::PathBuf};
pub fn cd(args: &Vec<String>) -> ExitCode { pub(super) fn cd(args: &Vec<String>) -> ExitCode {
let path: Option<PathBuf>; let path: Option<PathBuf>;
if !args.is_empty() { if !args.is_empty() {
@ -31,3 +31,7 @@ pub fn cd(args: &Vec<String>) -> ExitCode {
exit_code exit_code
} }
pub(super) fn colon(_args: &Vec<String>) -> ExitCode {
ExitCode::success()
}

View file

@ -1,4 +1,4 @@
use crate::command::Command; use super::Command;
use crate::exit_code::ExitCode; use crate::exit_code::ExitCode;
pub struct CommandSequence { pub struct CommandSequence {

View file

@ -24,8 +24,9 @@ impl Builtin {
let mut args = argv.clone(); let mut args = argv.clone();
let program = args.remove(0); let program = args.remove(0);
let function = match program.as_str() { let function: Option<BuiltinFunction> = match program.as_str() {
"cd" => Some(builtins::cd), "cd" => Some(builtins::cd),
":" => Some(builtins::colon),
_ => None, _ => None,
}; };

View file

@ -1,5 +1,4 @@
use std::env; use std::env;
use std::fmt::{Display, Formatter, Result};
use std::path::Path; use std::path::Path;
pub fn print_error(message: &str) { pub fn print_error(message: &str) {

View file

@ -1,20 +1,29 @@
use crate::command::command_builder::CommandBuilder; use crate::command::command_builder::CommandBuilder;
use crate::command::command_sequence::CommandSequence; use crate::command::command_sequence::CommandSequence;
fn parse_quote(characters: &mut Vec<char>) -> Result<String, UnmatchedQuoteError> { fn parse_quote(characters: &mut Vec<char>) -> String {
if characters.is_empty() { let mut quoted = String::default();
Err(UnmatchedQuoteError)
} else { if !characters.is_empty() {
let mut quoted_arg = String::default();
let mut current_char = characters.pop().unwrap(); let mut current_char = characters.pop().unwrap();
while !characters.is_empty() && current_char != '\'' { while !characters.is_empty() && current_char != '\'' {
quoted_arg.push(current_char); quoted.push(current_char);
current_char = characters.pop().unwrap(); current_char = characters.pop().unwrap();
} }
Ok(quoted_arg)
} }
quoted
}
fn parse_backslash(characters: &mut Vec<char>) -> Option<char> {
let mut escaped_char: Option<char> = None;
if !characters.is_empty() {
escaped_char = Some(characters.pop().unwrap());
}
escaped_char
} }
fn parse_main(characters: &mut Vec<char>, current_arg: &mut String) -> Vec<String> { fn parse_main(characters: &mut Vec<char>, current_arg: &mut String) -> Vec<String> {
@ -26,24 +35,31 @@ fn parse_main(characters: &mut Vec<char>, current_arg: &mut String) -> Vec<Strin
if current_char.is_whitespace() { if current_char.is_whitespace() {
if !current_arg.is_empty() { if !current_arg.is_empty() {
let mut argv: Vec<String> = vec![current_arg.clone()]; let mut argv: Vec<String> = vec![current_arg.clone()];
argv.append(&mut parse_main(characters, &mut String::from(""))); argv.append(&mut parse_main(characters, &mut String::default()));
argv argv
} else { } else {
parse_main(characters, current_arg) parse_main(characters, current_arg)
} }
/*
} else if current_char == '\\' { } else if current_char == '\\' {
current_arg.push(characters.pop().unwrap()); let escaped_char = parse_backslash(characters);
if escaped_char.is_some() {
current_arg.push(escaped_char.unwrap());
}
parse_main(characters, current_arg) parse_main(characters, current_arg)
*/
} else if current_char == '\'' { } else if current_char == '\'' {
let mut argv = vec![parse_quote(characters).unwrap()]; current_arg.push_str(parse_quote(characters).as_str());
argv.append(&mut parse_main(characters, &mut String::default())); parse_main(characters, current_arg)
} else if current_char == ';' {
let mut argv: Vec<String> = vec![];
if !current_arg.is_empty() {
argv.push(current_arg.clone());
}
argv argv
} else if current_char == ';' {
vec![]
} else { } else {
current_arg.push(current_char); current_arg.push(current_char);
parse_main(characters, current_arg) parse_main(characters, current_arg)