ArthurB/sesh
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: ArthurB:388f709394b5b2337d7048656b08d5e3b6e33b87
Branches Tags
ArthurB:main
..
compare: ArthurB:4be54dc5edb5c75e1400e294f3359fd1a281f65b
Branches Tags
ArthurB:main

No commits in common. "388f709394b5b2337d7048656b08d5e3b6e33b87" and "4be54dc5edb5c75e1400e294f3359fd1a281f65b" have entirely different histories.
388f709394 ... 4be54dc5ed

2 changed files with 32 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

177
src/builtins.rs
View file

@ -8,108 +8,26 @@ pub const BUILTINS: [(
&str,
fn(args: Vec<String>, unsplit_args: String, state: &mut super::State) -> i32,
&str,
&str,
); 20] = [
(
"cd",
cd,
"[dir]",
"Change the current directory into the specified one. If unspecified, change the directory into the user's home directory.",
),
("exit", exit, "", "Exit the shell."),
(
"echo",
echo,
"[-e] [text ...]",
"Output the specified text. If -e is passed, parse escape characters.",
),
(
"alias",
alias,
"name=value [name=value ...]",
"Create one or more command aliases. Command line arguments may be passed to the value.",
),
(
"help",
help,
"[command]",
"Hey, that's me! Get help on a specified builtin or without arguments list all of the available builtin commands.",
),
(
"source",
eval,
"filename [arguments]",
"Evaluate the contents of a file, optionally passing arguments in variables $1 and up.",
),
(
"loadf",
loadf,
"filename [...]",
"Load the contents of a file into the focus.",
),
(
"splitf",
splitf,
"[character] [-e]",
"Split the contents of the focus. If -e is passed, parse escapes.",
),
(
"set",
set,
"name=value [name=value ...]",
"Set one or more variables to values.",
),
("dumpvars", dumpvars, "", "List all variables."),
(
"unset",
unset,
"var [var ...]",
"Unset one or more variables.",
),
(
"copyf",
copyf,
"",
"Copy the contents of the focus to your clipboard.",
),
(
"pastef",
pastef,
"",
"Paste the contents of your clipboard into the focus.",
),
(
"setf",
setf,
"var [var ...]",
"Set one or more variables to the contents of the focus.",
),
(
"getf",
getf,
"var",
"Set the focus to the contents of a variable.",
),
("()", nop, "", "Do nothing and return a status code of 0."),
("nop", nop, "", "Do nothing and return a status code of 0."),
(
"if",
_if,
"condition (statement) [ (else_statement) ]",
"If [condition] returns a status of 0, do (statement). Else, do (else_statement).",
),
(
"while",
_while,
"condition (statement)",
"While [condition] returns a status of 0, do (statement).",
),
(
"gay",
gay,
"",
"Change the colors of the terminal to cycle through the pride flag colors!",
),
); 19] = [
("cd", cd, "[dir]"),
("exit", exit, ""),
("echo", echo, "[-e] [text ...]"),
("alias", alias, "[name] [value]"),
("help", help, ""),
("source", eval, "filename [arguments]"),
("loadf", loadf, "filename [...]"),
("splitf", splitf, "[character] [-e]"),
("set", set, "name=value [name=value ...]"),
("dumpvars", dumpvars, ""),
("unset", unset, "var [var ...]"),
("copyf", copyf, ""),
("pastef", pastef, ""),
("setf", setf, "var [var ...]"),
("getf", getf, "var"),
("()", nop, ""),
("if", _if, "condition (statement) [ (else_statement)"),
("while", _while, "condition (statement)"),
("gay", gay, "")
];
/// Change the directory
@ -183,61 +101,23 @@ pub fn alias(args: Vec<String>, _: String, state: &mut super::State) -> i32 {
}
/// Output help on builtins.
pub fn help(args: Vec<String>, _: String, state: &mut super::State) -> i32 {
if args.len() >= 2 {
for builtin in BUILTINS {
if builtin.0 == args[1] {
println!("{} {}: {}", builtin.0, builtin.2, builtin.3);
}
}
return 0;
}
pub fn help(_: Vec<String>, _: String, _: &mut super::State) -> i32 {
println!(
"{}sesh, version {} ({})",
if state.in_mode {
"\x1b[31;1m"
} else {
""
},
"sesh, version {} ({})",
env!("CARGO_PKG_VERSION"),
env!("TARGET")
);
println!("{}This provides a list of built-in shell commands.", if state.in_mode {
"\x1b[38;2;255;165;0m"
} else {
""
});
println!("{}Use `man sesh` to find out more about the shell in general.", if state.in_mode {
"\x1b[33;1m"
} else {
""
});
println!("{}Use `man -k' or `info' to find out more about commands not in this list.", if state.in_mode {
"\x1b[32;1m"
} else {
""
});
println!("This provides a list of built-in shell commands.");
println!("Use `man sesh` to find out more about the shell in general.");
println!("Use `man -k' or `info' to find out more about commands not in this list.");
println!();
let mut builtins = BUILTINS;
builtins.sort_by(|v1, v2| v1.0.cmp(v2.0));
for (i, builtin) in builtins.iter().enumerate() {
for builtin in builtins {
if builtin.0 == "gay" {
continue;
}
if state.in_mode {
let table = [
"\x1b[34;1m",
"\x1b[36;1m",
"\x1b[35;1m",
"\x1b[31;1m",
"\x1b[38;2;255;165;0m",
"\x1b[33;1m",
"\x1b[32;1m",
];
let idx = i%table.len();
print!("{}", table[idx]);
}
println!("{} {}", builtin.0, builtin.2);
}
0
@ -492,7 +372,10 @@ pub fn _if(args: Vec<String>, _: String, state: &mut super::State) -> i32 {
/// loop while a condition is true
pub fn _while(args: Vec<String>, _: String, state: &mut super::State) -> i32 {
if args.len() < 3 {
println!("sesh: {0}: usage: {0} condition (statement)", args[0]);
println!(
"sesh: {0}: usage: {0} condition (statement)",
args[0]
);
return 1;
}

8
src/main.rs
View file

@ -112,7 +112,6 @@ fn split_statement(statement: &str) -> Vec<String> {
let mut in_str = (false, ' ');
let mut escape = false;
let mut f = 0usize;
let mut str_idx = usize::MAX;
for ch in statement.chars() {
if ch == '\\' && !in_str.0 {
escape = true;
@ -122,10 +121,6 @@ fn split_statement(statement: &str) -> Vec<String> {
if ch == ']' {
out[i].push(ch);
}
if ch == ')' && f == str_idx+1 {
out[i].push('(');
out[i].push(ch);
}
escape = false;
f += 1;
continue;
@ -143,7 +138,6 @@ fn split_statement(statement: &str) -> Vec<String> {
out[i].push(ch);
}
escape = false;
str_idx = f;
f += 1;
continue;
}
@ -393,7 +387,7 @@ fn write_prompt(state: State) -> Result<(), Box<dyn std::error::Error>> {
if state.in_mode {
let table = [
"\x1b[31;1m",
"\x1b[38;2;255;165;0;1m",
"\x1b[38;2;255;165;0m",
"\x1b[33;1m",
"\x1b[32;1m",
"\x1b[34;1m",