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

Cleaned up warnings

Browse Source
This commit is contained in:
pagedmov
2025-03-23 17:41:12 -04:00
parent 32ec62b52f
commit 937bbbacdd
18 changed files with 23 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/parse/execute.rs
View File

@@ -1,9 +1,9 @@
use std::collections::VecDeque;
use crate::{builtin::{alias::alias, cd::cd, echo::echo, export::export, flowctl::flowctl, jobctl::{continue_job, jobs, JobBehavior}, pwd::pwd, shift::shift, source::source}, exec_input, jobs::{dispatch_job, ChildProc, Job, JobBldr, JobStack}, libsh::{error::{ShErr, ShErrKind, ShResult, ShResultExt}, utils::RedirVecUtils}, prelude::*, procio::{IoFrame, IoMode, IoStack}, state::{self, read_logic, read_vars, write_logic, write_vars, ShFunc, VarTab}};
use crate::{builtin::{alias::alias, cd::cd, echo::echo, export::export, flowctl::flowctl, jobctl::{continue_job, jobs, JobBehavior}, pwd::pwd, shift::shift, source::source}, jobs::{dispatch_job, ChildProc, JobBldr, JobStack}, libsh::{error::{ShErr, ShErrKind, ShResult, ShResultExt}, utils::RedirVecUtils}, prelude::*, procio::{IoFrame, IoMode, IoStack}, state::{self, read_logic, read_vars, write_logic, write_vars, ShFunc, VarTab}};
use super::{lex::{LexFlags, LexStream, Span, Tk, TkFlags, KEYWORDS}, AssignKind, CaseNode, CondNode, ConjunctNode, ConjunctOp, LoopKind, NdFlags, NdRule, Node, ParseStream, ParsedSrc, Redir, RedirType};
use super::{lex::{Span, Tk, TkFlags, KEYWORDS}, AssignKind, CaseNode, CondNode, ConjunctNode, ConjunctOp, LoopKind, NdFlags, NdRule, Node, ParsedSrc, Redir, RedirType};
pub enum AssignBehavior {
Export,
@@ -476,7 +476,7 @@ pub fn run_fork<'t,C,P>(
) -> ShResult<()>
where
C: Fn(IoFrame,Option<ExecArgs>),
P: Fn(IoFrame,&mut JobBldr,Option<&str>,Pid) -> ShResult<()>
P: Fn(&mut JobBldr,Option<&str>,Pid) -> ShResult<()>
{
match unsafe { fork()? } {
ForkResult::Child => {
@@ -489,7 +489,7 @@ where
} else {
None
};
parent_action(io_frame,job,cmd.as_deref(),child)
parent_action(job,cmd.as_deref(),child)
}
}
}
@@ -529,7 +529,6 @@ pub fn def_child_action(mut io_frame: IoFrame, exec_args: Option<ExecArgs>) {
/// The default behavior for the parent process after forking
pub fn def_parent_action(
io_frame: IoFrame,
job: &mut JobBldr,
cmd: Option<&str>,
child_pid: Pid

2
src/parse/lex.rs
View File

@@ -311,7 +311,6 @@ impl LexStream {
let slice = self.slice_from_cursor().unwrap().to_string();
let mut pos = self.cursor;
let mut chars = slice.chars().peekable();
let mut quote_pos = None;
if let Some(count) = case_pat_lookahead(chars.clone()) {
pos += count;
@@ -434,7 +433,6 @@ impl LexStream {
}
'"' | '\'' => {
self.in_quote = true;
quote_pos = Some(pos);
pos += 1;
while let Some(q_ch) = chars.next() {
match q_ch {

2
src/parse/mod.rs
View File

@@ -570,7 +570,7 @@ impl ParseStream {
let mut node_tks: Vec<Tk> = vec![];
let pattern: Tk;
let mut case_blocks: Vec<CaseNode> = vec![];
let mut redirs: Vec<Redir> = vec![];
let redirs: Vec<Redir> = vec![];
if !self.check_keyword("case") || !self.next_tk_is_some() {
return Ok(None)