Compare commits
12 commits
60c1f06b19
...
af6e95f703
Author | SHA1 | Date | |
---|---|---|---|
af6e95f703 | |||
341e04819e | |||
41cfc8c768 | |||
4f11bc71f6 | |||
8d3241ecdc | |||
ed6aa02ce4 | |||
cf1d6ff998 | |||
e2a850cfbb | |||
7d319335fe | |||
e023211055 | |||
7fa67bd034 | |||
47c560c03a |
7 changed files with 42 additions and 22 deletions
2
Cargo.lock
generated
2
Cargo.lock
generated
|
@ -4,4 +4,4 @@ version = 3
|
|||
|
||||
[[package]]
|
||||
name = "rash"
|
||||
version = "0.4.0"
|
||||
version = "0.5.0"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "rash"
|
||||
version = "0.4.0"
|
||||
version = "0.5.0"
|
||||
edition = "2021"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
|
|
@ -3,7 +3,7 @@ use crate::{error::print_error, exit_code::ExitCode};
|
|||
use std::env;
|
||||
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>;
|
||||
|
||||
if !args.is_empty() {
|
||||
|
@ -31,3 +31,7 @@ pub fn cd(args: &Vec<String>) -> ExitCode {
|
|||
|
||||
exit_code
|
||||
}
|
||||
|
||||
pub(super) fn colon(_args: &Vec<String>) -> ExitCode {
|
||||
ExitCode::success()
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
use crate::command::Command;
|
||||
use super::Command;
|
||||
use crate::exit_code::ExitCode;
|
||||
|
||||
pub struct CommandSequence {
|
||||
|
|
|
@ -24,8 +24,9 @@ impl Builtin {
|
|||
let mut args = argv.clone();
|
||||
let program = args.remove(0);
|
||||
|
||||
let function = match program.as_str() {
|
||||
let function: Option<BuiltinFunction> = match program.as_str() {
|
||||
"cd" => Some(builtins::cd),
|
||||
":" => Some(builtins::colon),
|
||||
_ => None,
|
||||
};
|
||||
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
use std::env;
|
||||
use std::fmt::{Display, Formatter, Result};
|
||||
use std::path::Path;
|
||||
|
||||
pub fn print_error(message: &str) {
|
||||
|
|
|
@ -1,20 +1,29 @@
|
|||
use crate::command::command_builder::CommandBuilder;
|
||||
use crate::command::command_sequence::CommandSequence;
|
||||
|
||||
fn parse_quote(characters: &mut Vec<char>) -> Result<String, UnmatchedQuoteError> {
|
||||
if characters.is_empty() {
|
||||
Err(UnmatchedQuoteError)
|
||||
} else {
|
||||
let mut quoted_arg = String::default();
|
||||
fn parse_quote(characters: &mut Vec<char>) -> String {
|
||||
let mut quoted = String::default();
|
||||
|
||||
if !characters.is_empty() {
|
||||
let mut current_char = characters.pop().unwrap();
|
||||
|
||||
while !characters.is_empty() && current_char != '\'' {
|
||||
quoted_arg.push(current_char);
|
||||
quoted.push(current_char);
|
||||
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> {
|
||||
|
@ -26,24 +35,31 @@ fn parse_main(characters: &mut Vec<char>, current_arg: &mut String) -> Vec<Strin
|
|||
if current_char.is_whitespace() {
|
||||
if !current_arg.is_empty() {
|
||||
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
|
||||
} else {
|
||||
parse_main(characters, current_arg)
|
||||
}
|
||||
/*
|
||||
} 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)
|
||||
*/
|
||||
} else if current_char == '\'' {
|
||||
let mut argv = vec![parse_quote(characters).unwrap()];
|
||||
argv.append(&mut parse_main(characters, &mut String::default()));
|
||||
current_arg.push_str(parse_quote(characters).as_str());
|
||||
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
|
||||
} else if current_char == ';' {
|
||||
vec![]
|
||||
} else {
|
||||
current_arg.push(current_char);
|
||||
parse_main(characters, current_arg)
|
||||
|
|
Loading…
Reference in a new issue