Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 25 additions & 8 deletions src/sed/script_line_provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,12 @@ enum State {
input_name: String, // Input description (path or script string)
line_number: usize, // Current line number
},
Done, // All scripts have been processed
// All scripts have been processed; keeps the last position for errors
// raised at the end of the script.
Done {
input_name: String,
line_number: usize,
},
}

impl ScriptLineProvider {
Expand All @@ -55,16 +60,18 @@ impl ScriptLineProvider {
/// Return the currently processed script line number.
pub fn get_line_number(&self) -> usize {
match &self.state {
State::Active { line_number, .. } => *line_number,
_ => 0,
State::Active { line_number, .. } | State::Done { line_number, .. } => *line_number,
State::NotStarted => 0,
}
}

/// Return the currently processed script descriptive name.
pub fn get_input_name(&self) -> &str {
match &self.state {
State::Active { input_name, .. } => input_name.as_str(),
_ => "",
State::Active { input_name, .. } | State::Done { input_name, .. } => {
input_name.as_str()
}
State::NotStarted => "",
}
}

Expand Down Expand Up @@ -94,7 +101,7 @@ impl ScriptLineProvider {
return Ok(Some(line));
}
}
State::Done => {
State::Done { .. } => {
return Ok(None);
}
};
Expand All @@ -108,7 +115,10 @@ impl ScriptLineProvider {
// Move to the next available script source.
fn advance_source(&mut self, next_index: usize) -> UResult<()> {
if next_index >= self.sources.len() {
self.state = State::Done;
self.state = State::Done {
input_name: self.get_input_name().to_string(),
line_number: self.get_line_number(),
};
return Ok(());
}

Expand Down Expand Up @@ -151,7 +161,14 @@ impl fmt::Debug for State {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
State::NotStarted => f.debug_struct("NotStarted").finish(),
State::Done => f.debug_struct("Done").finish(),
State::Done {
input_name,
line_number,
} => f
.debug_struct("Done")
.field("input_name", input_name)
.field("line_number", line_number)
.finish(),
State::Active {
index,
input_name,
Expand Down
34 changes: 33 additions & 1 deletion tests/by-util/test_sed.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2487,7 +2487,39 @@ fn test_incomplete_test_command_posix() {
.args(&["--posix", "i\\"])
.fails()
.code_is(1)
.stderr_is("sed: :0:3: error: incomplete command\n");
.stderr_is("sed: <script argument 1>:1:3: error: incomplete command\n");
}

#[test]
fn test_error_at_end_of_script_keeps_its_position() {
// The script is exhausted when the error is found: report its last line,
// as GNU sed does ("-e expression #1").
new_ucmd!()
.args(&["s/a/b\\"])
.fails()
.code_is(1)
.stderr_is(
"sed: <script argument 1>:1:7: error: unterminated substitute replacement (unexpected EOF)\n",
);
}

#[test]
fn test_error_at_end_of_script_file_keeps_its_position() {
// The replacement on the last line of a script file runs past its end:
// report that file and line.
let mut script = NamedTempFile::new().expect("create temporary sed script");
script
.write_all(b"p\n$!d\ns/one/two\\")
.expect("write temporary sed script");
let script_path = script.path().to_str().expect("temporary path is UTF-8");

new_ucmd!()
.args(&["-f", script_path])
.fails()
.code_is(1)
.stderr_is(format!(
"sed: {script_path}:3:11: error: unterminated substitute replacement (unexpected EOF)\n"
));
}

#[test]
Expand Down
Loading