pagedmov/shed
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implemented arithmetic substitution

Browse Source
This commit is contained in:
pagedmov
2025-03-07 04:30:17 -05:00
parent 90243834ff
commit 2edb6cb8ce
11 changed files with 201 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/shellenv/jobs.rs
View File

@@ -97,7 +97,6 @@ impl<'a> ChildProc {
} else {
WtStat::Exited(pid, 0)
};
log!(DEBUG, command);
let mut child = Self { pgid: pid, pid, command, stat };
if let Some(pgid) = pgid {
child.set_pgid(pgid).ok();
@@ -505,7 +504,6 @@ impl JobTab {
self.fg.as_mut()
}
pub fn new_fg<'a>(&mut self, job: Job) -> ShResult<Vec<WtStat>> {
log!(DEBUG, "New fg job: {:?}", job);
let pgid = job.pgid();
self.fg = Some(job);
attach_tty(pgid)?;
@@ -519,7 +517,6 @@ impl JobTab {
}
take_term()?;
let fg = std::mem::take(&mut self.fg);
log!(DEBUG, "Moving foreground job to background");
if let Some(mut job) = fg {
job.set_stats(stat);
self.insert_job(job, false)?;

9
src/shellenv/shenv.rs
View File

@@ -33,7 +33,6 @@ impl ShEnv {
}
pub fn source_file(&mut self, path: PathBuf) -> ShResult<()> {
if path.is_file() {
log!(DEBUG, "sourcing {}", path.to_str().unwrap());
let mut file = std::fs::File::open(path)?;
let mut buf = String::new();
file.read_to_string(&mut buf)?;
@@ -43,14 +42,12 @@ impl ShEnv {
Ok(())
}
pub fn source_rc(&mut self) -> ShResult<()> {
log!(DEBUG, "sourcing rc");
let path_raw = std::env::var("FERN_RC")?;
let path = PathBuf::from(path_raw);
self.source_file(path)?;
Ok(())
}
pub fn expand_input(&mut self, new: &str, repl_span: Rc<RefCell<Span>>) -> Vec<Token> {
log!(DEBUG,repl_span);
if repl_span.borrow().expanded {
return vec![];
}
@@ -71,10 +68,8 @@ impl ShEnv {
if let Some(input) = self.input_man.get_input_mut() {
let old = &input[range.clone()];
let delta: isize = new.len() as isize - old.len() as isize;
log!(DEBUG, input);
input.replace_range(range, new);
let expanded = input.clone();
log!(DEBUG, expanded);
for span in self.input_man.spans_mut() {
let mut span_mut = span.borrow_mut();
@@ -87,7 +82,6 @@ impl ShEnv {
}
}
self.input_man.clamp_all();
log!(DEBUG, new_tokens);
if new_tokens.is_empty() {
let empty = Token::new(
TkRule::Ident,
@@ -156,11 +150,8 @@ impl ShEnv {
let stderr = ctx.masks().stderr().get_fd();
let saved_in = dup(stdin)?;
log!(DEBUG, saved_in);
let saved_out = dup(stdout)?;
log!(DEBUG, saved_out);
let saved_err = dup(stderr)?;
log!(DEBUG, saved_err);
let saved_io = shellenv::exec_ctx::SavedIo::save(saved_in, saved_out, saved_err);
*ctx.saved_io() = Some(saved_io);