Compare commits
4 commits
eaa9622446
...
a50bea4c60
Author | SHA1 | Date | |
---|---|---|---|
a50bea4c60 | |||
9d53bdba0c | |||
a441fc9cb3 | |||
fa9033beea |
5 changed files with 113 additions and 22 deletions
|
@ -2,6 +2,7 @@ use crate::command::Command;
|
|||
use crate::exit_code::ExitCode;
|
||||
use crate::interface::get_user_input;
|
||||
use crate::parser::parse;
|
||||
use crate::variables::Variables;
|
||||
|
||||
fn exit(code: &ExitCode) {
|
||||
let code = i32::from(code.get());
|
||||
|
@ -11,12 +12,13 @@ fn exit(code: &ExitCode) {
|
|||
|
||||
pub fn run() {
|
||||
let mut current_exit_code = ExitCode::new(0);
|
||||
let mut variables = Variables::new();
|
||||
|
||||
loop {
|
||||
let user_input = get_user_input();
|
||||
|
||||
if user_input.is_some() {
|
||||
let mut command_sequence = parse(user_input.unwrap());
|
||||
let mut command_sequence = parse(user_input.unwrap(), &variables);
|
||||
|
||||
if !command_sequence.is_empty() {
|
||||
current_exit_code = command_sequence.spawn();
|
||||
|
|
10
src/error.rs
10
src/error.rs
|
@ -41,6 +41,16 @@ impl Display for CommandNotFoundError {
|
|||
}
|
||||
}
|
||||
|
||||
pub struct UnmatchedQuoteError {
|
||||
index: usize,
|
||||
}
|
||||
|
||||
impl Display for UnmatchedQuoteError {
|
||||
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
|
||||
write!(f, "unmatched quote at character {}", self.index)
|
||||
}
|
||||
}
|
||||
|
||||
pub fn print(error: Error) {
|
||||
let name = env::args().next().unwrap_or(String::from("rash"));
|
||||
let name = Path::new(&name).file_name().unwrap().to_str().unwrap();
|
||||
|
|
|
@ -4,6 +4,7 @@ mod error;
|
|||
mod exit_code;
|
||||
mod interface;
|
||||
mod parser;
|
||||
mod variables;
|
||||
|
||||
fn main() {
|
||||
control::run();
|
||||
|
|
|
@ -1,5 +1,22 @@
|
|||
use crate::command::command_builder::CommandBuilder;
|
||||
use crate::command::command_sequence::CommandSequence;
|
||||
use crate::variables::Variables;
|
||||
|
||||
fn parse_variable(characters: &mut Vec<char>, variables: &Variables) -> String {
|
||||
if characters.is_empty() {
|
||||
String::new()
|
||||
} else {
|
||||
let mut current_char = characters.pop().unwrap();
|
||||
let mut var_name = String::new();
|
||||
|
||||
while !characters.is_empty() && !current_char.is_whitespace() {
|
||||
var_name.push(current_char);
|
||||
current_char = characters.pop().unwrap();
|
||||
}
|
||||
|
||||
variables.get(var_name.as_str())
|
||||
}
|
||||
}
|
||||
|
||||
fn parse_quote(characters: &mut Vec<char>) -> String {
|
||||
let mut quoted = String::new();
|
||||
|
@ -16,41 +33,49 @@ fn parse_quote(characters: &mut Vec<char>) -> String {
|
|||
quoted
|
||||
}
|
||||
|
||||
fn parse_backslash(characters: &mut Vec<char>) -> Option<char> {
|
||||
fn parse_backslash(characters: &mut Vec<char>) -> String {
|
||||
let escaped_char = match characters.is_empty() {
|
||||
false => Some(characters.pop().unwrap()),
|
||||
true => None,
|
||||
false => String::from(characters.pop().unwrap()),
|
||||
true => String::new(),
|
||||
};
|
||||
|
||||
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,
|
||||
variables: &Variables,
|
||||
) -> Vec<String> {
|
||||
if characters.is_empty() {
|
||||
vec![]
|
||||
let mut last_arg = vec![];
|
||||
|
||||
if !current_arg.is_empty() {
|
||||
last_arg.push(current_arg.clone());
|
||||
}
|
||||
|
||||
last_arg
|
||||
} else {
|
||||
let current_char = characters.pop().unwrap();
|
||||
|
||||
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::new()));
|
||||
argv.append(&mut parse_main(characters, &mut String::new(), variables));
|
||||
|
||||
argv
|
||||
} else {
|
||||
parse_main(characters, current_arg)
|
||||
parse_main(characters, current_arg, variables)
|
||||
}
|
||||
} else if current_char == '\\' {
|
||||
let escaped_char = parse_backslash(characters);
|
||||
|
||||
if escaped_char.is_some() {
|
||||
current_arg.push(escaped_char.unwrap());
|
||||
}
|
||||
|
||||
parse_main(characters, current_arg)
|
||||
current_arg.push_str(parse_backslash(characters).as_str());
|
||||
parse_main(characters, current_arg, variables)
|
||||
} else if current_char == '$' {
|
||||
current_arg.push_str(parse_variable(characters, variables).as_str());
|
||||
parse_main(characters, current_arg, variables)
|
||||
} else if current_char == '\'' {
|
||||
current_arg.push_str(parse_quote(characters).as_str());
|
||||
parse_main(characters, current_arg)
|
||||
parse_main(characters, current_arg, variables)
|
||||
} else if current_char == ';' {
|
||||
let mut argv: Vec<String> = vec![];
|
||||
|
||||
|
@ -61,17 +86,17 @@ fn parse_main(characters: &mut Vec<char>, current_arg: &mut String) -> Vec<Strin
|
|||
argv
|
||||
} else {
|
||||
current_arg.push(current_char);
|
||||
parse_main(characters, current_arg)
|
||||
parse_main(characters, current_arg, variables)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn parse(line: String) -> CommandSequence {
|
||||
pub fn parse(line: String, variables: &Variables) -> CommandSequence {
|
||||
let mut characters: Vec<char> = line.chars().rev().collect();
|
||||
let mut command_sequence = CommandSequence::new();
|
||||
|
||||
while !characters.is_empty() {
|
||||
let argv = parse_main(&mut characters, &mut String::new());
|
||||
let argv = parse_main(&mut characters, &mut String::new(), variables);
|
||||
|
||||
if !argv.is_empty() {
|
||||
let command = CommandBuilder::new(argv).build();
|
||||
|
@ -81,6 +106,3 @@ pub fn parse(line: String) -> CommandSequence {
|
|||
|
||||
command_sequence
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
struct UnmatchedQuoteError;
|
||||
|
|
56
src/variables.rs
Normal file
56
src/variables.rs
Normal file
|
@ -0,0 +1,56 @@
|
|||
use std::collections::HashMap;
|
||||
use std::env::{self, args};
|
||||
|
||||
pub struct Variables {
|
||||
variables: HashMap<String, String>,
|
||||
}
|
||||
|
||||
impl Variables {
|
||||
pub fn new() -> Self {
|
||||
Self {
|
||||
variables: HashMap::new(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get(&self, key: &str) -> String {
|
||||
let arg_index = String::from(key).parse::<usize>();
|
||||
|
||||
match arg_index {
|
||||
Ok(index) => match env::args().nth(index) {
|
||||
Some(value) => value,
|
||||
None => String::new(),
|
||||
},
|
||||
Err(_e) => match self.variables.get(key) {
|
||||
Some(value) => value.clone(),
|
||||
None => match env::var(key) {
|
||||
Ok(value) => value,
|
||||
Err(_e) => String::new(),
|
||||
},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
pub fn unset(&mut self, key: &str) {
|
||||
let old_value = self.variables.remove(key);
|
||||
|
||||
if old_value.is_none() {
|
||||
env::remove_var(key);
|
||||
}
|
||||
}
|
||||
|
||||
pub fn set(&mut self, key: &str, value: &str) {
|
||||
self.variables
|
||||
.insert(String::from(key), String::from(value));
|
||||
}
|
||||
|
||||
pub fn export(&mut self, key: &str) {
|
||||
let var_to_export = self.variables.get(key);
|
||||
|
||||
if var_to_export.is_some() {
|
||||
env::set_var(key, var_to_export.unwrap());
|
||||
self.variables.remove(key);
|
||||
} else {
|
||||
env::set_var(key, "");
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue