* Moves off of draining between filters. Instead, the sink will pull on the stream, and will drain element-wise. This moves the whole stream to being lazy. * Adds ctrl-c support and connects it into some of the key points where we pull on the stream. If a ctrl-c is detect, we immediately halt pulling on the stream and return to the prompt. * Moves away from having a SourceMap where anchor locations are stored. Now AnchorLocation is kept directly in the Tag. * To make this possible, split tag and span. Span is largely used in the parser and is copyable. Tag is now no longer copyable.
102 lines
2.7 KiB
Rust
102 lines
2.7 KiB
Rust
use crate::Span;
|
|
use derive_new::new;
|
|
use language_reporting::{FileName, Location};
|
|
use log::trace;
|
|
|
|
#[derive(new, Debug, Clone)]
|
|
pub struct Files {
|
|
snippet: String,
|
|
}
|
|
|
|
impl language_reporting::ReportingFiles for Files {
|
|
type Span = Span;
|
|
type FileId = usize;
|
|
|
|
fn byte_span(
|
|
&self,
|
|
_file: Self::FileId,
|
|
from_index: usize,
|
|
to_index: usize,
|
|
) -> Option<Self::Span> {
|
|
Some(Span::new(from_index, to_index))
|
|
}
|
|
|
|
fn file_id(&self, _tag: Self::Span) -> Self::FileId {
|
|
0
|
|
}
|
|
|
|
fn file_name(&self, _file: Self::FileId) -> FileName {
|
|
FileName::Verbatim(format!("shell"))
|
|
}
|
|
|
|
fn byte_index(&self, _file: Self::FileId, _line: usize, _column: usize) -> Option<usize> {
|
|
unimplemented!("byte_index")
|
|
}
|
|
|
|
fn location(&self, _file: Self::FileId, byte_index: usize) -> Option<Location> {
|
|
let source = &self.snippet;
|
|
let mut seen_lines = 0;
|
|
let mut seen_bytes = 0;
|
|
|
|
for (pos, slice) in source.match_indices('\n') {
|
|
trace!(
|
|
"SEARCH={} SEEN={} POS={} SLICE={:?} LEN={} ALL={:?}",
|
|
byte_index,
|
|
seen_bytes,
|
|
pos,
|
|
slice,
|
|
source.len(),
|
|
source
|
|
);
|
|
|
|
if pos >= byte_index {
|
|
return Some(language_reporting::Location::new(
|
|
seen_lines,
|
|
byte_index - seen_bytes,
|
|
));
|
|
} else {
|
|
seen_lines += 1;
|
|
seen_bytes = pos;
|
|
}
|
|
}
|
|
|
|
if seen_lines == 0 {
|
|
Some(language_reporting::Location::new(0, byte_index))
|
|
} else {
|
|
panic!("byte index {} wasn't valid", byte_index);
|
|
}
|
|
}
|
|
|
|
fn line_span(&self, _file: Self::FileId, lineno: usize) -> Option<Self::Span> {
|
|
let source = &self.snippet;
|
|
let mut seen_lines = 0;
|
|
let mut seen_bytes = 0;
|
|
|
|
for (pos, _) in source.match_indices('\n') {
|
|
if seen_lines == lineno {
|
|
return Some(Span::new(seen_bytes, pos + 1));
|
|
} else {
|
|
seen_lines += 1;
|
|
seen_bytes = pos + 1;
|
|
}
|
|
}
|
|
|
|
if seen_lines == 0 {
|
|
Some(Span::new(0, self.snippet.len() - 1))
|
|
} else {
|
|
None
|
|
}
|
|
}
|
|
|
|
fn source(&self, span: Self::Span) -> Option<String> {
|
|
trace!("source(tag={:?}) snippet={:?}", span, self.snippet);
|
|
|
|
if span.start() > span.end() {
|
|
return None;
|
|
} else if span.end() > self.snippet.len() {
|
|
return None;
|
|
}
|
|
Some(span.slice(&self.snippet).to_string())
|
|
}
|
|
}
|