* 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.
478 lines
11 KiB
Rust
478 lines
11 KiB
Rust
pub(crate) mod debug;
|
|
|
|
use crate::errors::ShellError;
|
|
use crate::parser::TokenNode;
|
|
use crate::{Span, Spanned, SpannedItem};
|
|
|
|
#[derive(Debug)]
|
|
pub struct TokensIterator<'content> {
|
|
tokens: &'content [TokenNode],
|
|
span: Span,
|
|
skip_ws: bool,
|
|
index: usize,
|
|
seen: indexmap::IndexSet<usize>,
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct Checkpoint<'content, 'me> {
|
|
pub(crate) iterator: &'me mut TokensIterator<'content>,
|
|
index: usize,
|
|
seen: indexmap::IndexSet<usize>,
|
|
committed: bool,
|
|
}
|
|
|
|
impl<'content, 'me> Checkpoint<'content, 'me> {
|
|
pub(crate) fn commit(mut self) {
|
|
self.committed = true;
|
|
}
|
|
}
|
|
|
|
impl<'content, 'me> std::ops::Drop for Checkpoint<'content, 'me> {
|
|
fn drop(&mut self) {
|
|
if !self.committed {
|
|
self.iterator.index = self.index;
|
|
self.iterator.seen = self.seen.clone();
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct Peeked<'content, 'me> {
|
|
pub(crate) node: Option<&'content TokenNode>,
|
|
iterator: &'me mut TokensIterator<'content>,
|
|
from: usize,
|
|
to: usize,
|
|
}
|
|
|
|
impl<'content, 'me> Peeked<'content, 'me> {
|
|
pub fn commit(&mut self) -> Option<&'content TokenNode> {
|
|
let Peeked {
|
|
node,
|
|
iterator,
|
|
from,
|
|
to,
|
|
} = self;
|
|
|
|
let node = (*node)?;
|
|
iterator.commit(*from, *to);
|
|
Some(node)
|
|
}
|
|
|
|
pub fn not_eof(
|
|
self,
|
|
expected: impl Into<String>,
|
|
) -> Result<PeekedNode<'content, 'me>, ShellError> {
|
|
match self.node {
|
|
None => Err(ShellError::unexpected_eof(
|
|
expected,
|
|
self.iterator.eof_span(),
|
|
)),
|
|
Some(node) => Ok(PeekedNode {
|
|
node,
|
|
iterator: self.iterator,
|
|
from: self.from,
|
|
to: self.to,
|
|
}),
|
|
}
|
|
}
|
|
|
|
pub fn type_error(&self, expected: impl Into<String>) -> ShellError {
|
|
peek_error(&self.node, self.iterator.eof_span(), expected)
|
|
}
|
|
}
|
|
|
|
#[derive(Debug)]
|
|
pub struct PeekedNode<'content, 'me> {
|
|
pub(crate) node: &'content TokenNode,
|
|
iterator: &'me mut TokensIterator<'content>,
|
|
from: usize,
|
|
to: usize,
|
|
}
|
|
|
|
impl<'content, 'me> PeekedNode<'content, 'me> {
|
|
pub fn commit(self) -> &'content TokenNode {
|
|
let PeekedNode {
|
|
node,
|
|
iterator,
|
|
from,
|
|
to,
|
|
} = self;
|
|
|
|
iterator.commit(from, to);
|
|
node
|
|
}
|
|
|
|
pub fn rollback(self) {}
|
|
|
|
pub fn type_error(&self, expected: impl Into<String>) -> ShellError {
|
|
peek_error(&Some(self.node), self.iterator.eof_span(), expected)
|
|
}
|
|
}
|
|
|
|
pub fn peek_error(
|
|
node: &Option<&TokenNode>,
|
|
eof_span: Span,
|
|
expected: impl Into<String>,
|
|
) -> ShellError {
|
|
match node {
|
|
None => ShellError::unexpected_eof(expected, eof_span),
|
|
Some(node) => ShellError::type_error(expected, node.tagged_type_name()),
|
|
}
|
|
}
|
|
|
|
impl<'content> TokensIterator<'content> {
|
|
pub fn new(
|
|
items: &'content [TokenNode],
|
|
span: Span,
|
|
skip_ws: bool,
|
|
) -> TokensIterator<'content> {
|
|
TokensIterator {
|
|
tokens: items,
|
|
span,
|
|
skip_ws,
|
|
index: 0,
|
|
seen: indexmap::IndexSet::new(),
|
|
}
|
|
}
|
|
|
|
pub fn all(tokens: &'content [TokenNode], span: Span) -> TokensIterator<'content> {
|
|
TokensIterator::new(tokens, span, false)
|
|
}
|
|
|
|
pub fn len(&self) -> usize {
|
|
self.tokens.len()
|
|
}
|
|
|
|
pub fn spanned<T>(
|
|
&mut self,
|
|
block: impl FnOnce(&mut TokensIterator<'content>) -> T,
|
|
) -> Spanned<T> {
|
|
let start = self.span_at_cursor();
|
|
|
|
let result = block(self);
|
|
|
|
let end = self.span_at_cursor();
|
|
|
|
result.spanned(start.until(end))
|
|
}
|
|
|
|
/// Use a checkpoint when you need to peek more than one token ahead, but can't be sure
|
|
/// that you'll succeed.
|
|
pub fn checkpoint<'me>(&'me mut self) -> Checkpoint<'content, 'me> {
|
|
let index = self.index;
|
|
let seen = self.seen.clone();
|
|
|
|
Checkpoint {
|
|
iterator: self,
|
|
index,
|
|
seen,
|
|
committed: false,
|
|
}
|
|
}
|
|
|
|
/// Use a checkpoint when you need to peek more than one token ahead, but can't be sure
|
|
/// that you'll succeed.
|
|
pub fn atomic<'me, T>(
|
|
&'me mut self,
|
|
block: impl FnOnce(&mut TokensIterator<'content>) -> Result<T, ShellError>,
|
|
) -> Result<T, ShellError> {
|
|
let index = self.index;
|
|
let seen = self.seen.clone();
|
|
|
|
let checkpoint = Checkpoint {
|
|
iterator: self,
|
|
index,
|
|
seen,
|
|
committed: false,
|
|
};
|
|
|
|
let value = block(checkpoint.iterator)?;
|
|
|
|
checkpoint.commit();
|
|
return Ok(value);
|
|
}
|
|
|
|
fn eof_span(&self) -> Span {
|
|
Span::new(self.span.end(), self.span.end())
|
|
}
|
|
|
|
pub fn typed_span_at_cursor(&mut self) -> Spanned<&'static str> {
|
|
let next = self.peek_any();
|
|
|
|
match next.node {
|
|
None => "end".spanned(self.eof_span()),
|
|
Some(node) => node.spanned_type_name(),
|
|
}
|
|
}
|
|
|
|
pub fn span_at_cursor(&mut self) -> Span {
|
|
let next = self.peek_any();
|
|
|
|
match next.node {
|
|
None => self.eof_span(),
|
|
Some(node) => node.span(),
|
|
}
|
|
}
|
|
|
|
pub fn remove(&mut self, position: usize) {
|
|
self.seen.insert(position);
|
|
}
|
|
|
|
pub fn at_end(&self) -> bool {
|
|
peek(self, self.skip_ws).is_none()
|
|
}
|
|
|
|
pub fn at_end_possible_ws(&self) -> bool {
|
|
peek(self, true).is_none()
|
|
}
|
|
|
|
pub fn advance(&mut self) {
|
|
self.seen.insert(self.index);
|
|
self.index += 1;
|
|
}
|
|
|
|
pub fn extract<T>(&mut self, f: impl Fn(&TokenNode) -> Option<T>) -> Option<(usize, T)> {
|
|
for (i, item) in self.tokens.iter().enumerate() {
|
|
if self.seen.contains(&i) {
|
|
continue;
|
|
}
|
|
|
|
match f(item) {
|
|
None => {
|
|
continue;
|
|
}
|
|
Some(value) => {
|
|
self.seen.insert(i);
|
|
return Some((i, value));
|
|
}
|
|
}
|
|
}
|
|
|
|
None
|
|
}
|
|
|
|
pub fn move_to(&mut self, pos: usize) {
|
|
self.index = pos;
|
|
}
|
|
|
|
pub fn restart(&mut self) {
|
|
self.index = 0;
|
|
}
|
|
|
|
pub fn clone(&self) -> TokensIterator<'content> {
|
|
TokensIterator {
|
|
tokens: self.tokens,
|
|
span: self.span,
|
|
index: self.index,
|
|
seen: self.seen.clone(),
|
|
skip_ws: self.skip_ws,
|
|
}
|
|
}
|
|
|
|
// Get the next token, not including whitespace
|
|
pub fn next_non_ws(&mut self) -> Option<&TokenNode> {
|
|
let mut peeked = start_next(self, true);
|
|
peeked.commit()
|
|
}
|
|
|
|
// Peek the next token, not including whitespace
|
|
pub fn peek_non_ws<'me>(&'me mut self) -> Peeked<'content, 'me> {
|
|
start_next(self, true)
|
|
}
|
|
|
|
// Peek the next token, including whitespace
|
|
pub fn peek_any<'me>(&'me mut self) -> Peeked<'content, 'me> {
|
|
start_next(self, false)
|
|
}
|
|
|
|
// Peek the next token, including whitespace, but not EOF
|
|
pub fn peek_any_token<'me, T>(
|
|
&'me mut self,
|
|
block: impl FnOnce(&'content TokenNode) -> Result<T, ShellError>,
|
|
) -> Result<T, ShellError> {
|
|
let peeked = start_next(self, false);
|
|
let peeked = peeked.not_eof("invariant");
|
|
|
|
match peeked {
|
|
Err(err) => return Err(err),
|
|
Ok(peeked) => match block(peeked.node) {
|
|
Err(err) => return Err(err),
|
|
Ok(val) => {
|
|
peeked.commit();
|
|
return Ok(val);
|
|
}
|
|
},
|
|
}
|
|
}
|
|
|
|
fn commit(&mut self, from: usize, to: usize) {
|
|
for index in from..to {
|
|
self.seen.insert(index);
|
|
}
|
|
|
|
self.index = to;
|
|
}
|
|
|
|
pub fn pos(&self, skip_ws: bool) -> Option<usize> {
|
|
peek_pos(self, skip_ws)
|
|
}
|
|
|
|
pub fn debug_remaining(&self) -> Vec<TokenNode> {
|
|
let mut tokens = self.clone();
|
|
tokens.restart();
|
|
tokens.cloned().collect()
|
|
}
|
|
}
|
|
|
|
impl<'content> Iterator for TokensIterator<'content> {
|
|
type Item = &'content TokenNode;
|
|
|
|
fn next(&mut self) -> Option<&'content TokenNode> {
|
|
next(self, self.skip_ws)
|
|
}
|
|
}
|
|
|
|
fn peek<'content, 'me>(
|
|
iterator: &'me TokensIterator<'content>,
|
|
skip_ws: bool,
|
|
) -> Option<&'me TokenNode> {
|
|
let mut to = iterator.index;
|
|
|
|
loop {
|
|
if to >= iterator.tokens.len() {
|
|
return None;
|
|
}
|
|
|
|
if iterator.seen.contains(&to) {
|
|
to += 1;
|
|
continue;
|
|
}
|
|
|
|
if to >= iterator.tokens.len() {
|
|
return None;
|
|
}
|
|
|
|
let node = &iterator.tokens[to];
|
|
|
|
match node {
|
|
TokenNode::Whitespace(_) if skip_ws => {
|
|
to += 1;
|
|
}
|
|
_ => {
|
|
return Some(node);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn peek_pos<'content, 'me>(
|
|
iterator: &'me TokensIterator<'content>,
|
|
skip_ws: bool,
|
|
) -> Option<usize> {
|
|
let mut to = iterator.index;
|
|
|
|
loop {
|
|
if to >= iterator.tokens.len() {
|
|
return None;
|
|
}
|
|
|
|
if iterator.seen.contains(&to) {
|
|
to += 1;
|
|
continue;
|
|
}
|
|
|
|
if to >= iterator.tokens.len() {
|
|
return None;
|
|
}
|
|
|
|
let node = &iterator.tokens[to];
|
|
|
|
match node {
|
|
TokenNode::Whitespace(_) if skip_ws => {
|
|
to += 1;
|
|
}
|
|
_ => return Some(to),
|
|
}
|
|
}
|
|
}
|
|
|
|
fn start_next<'content, 'me>(
|
|
iterator: &'me mut TokensIterator<'content>,
|
|
skip_ws: bool,
|
|
) -> Peeked<'content, 'me> {
|
|
let from = iterator.index;
|
|
let mut to = iterator.index;
|
|
|
|
loop {
|
|
if to >= iterator.tokens.len() {
|
|
return Peeked {
|
|
node: None,
|
|
iterator,
|
|
from,
|
|
to,
|
|
};
|
|
}
|
|
|
|
if iterator.seen.contains(&to) {
|
|
to += 1;
|
|
continue;
|
|
}
|
|
|
|
if to >= iterator.tokens.len() {
|
|
return Peeked {
|
|
node: None,
|
|
iterator,
|
|
from,
|
|
to,
|
|
};
|
|
}
|
|
|
|
let node = &iterator.tokens[to];
|
|
|
|
match node {
|
|
TokenNode::Whitespace(_) if skip_ws => {
|
|
to += 1;
|
|
}
|
|
_ => {
|
|
to += 1;
|
|
return Peeked {
|
|
node: Some(node),
|
|
iterator,
|
|
from,
|
|
to,
|
|
};
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
fn next<'me, 'content>(
|
|
iterator: &'me mut TokensIterator<'content>,
|
|
skip_ws: bool,
|
|
) -> Option<&'content TokenNode> {
|
|
loop {
|
|
if iterator.index >= iterator.tokens.len() {
|
|
return None;
|
|
}
|
|
|
|
if iterator.seen.contains(&iterator.index) {
|
|
iterator.advance();
|
|
continue;
|
|
}
|
|
|
|
if iterator.index >= iterator.tokens.len() {
|
|
return None;
|
|
}
|
|
|
|
match &iterator.tokens[iterator.index] {
|
|
TokenNode::Whitespace(_) if skip_ws => {
|
|
iterator.advance();
|
|
}
|
|
other => {
|
|
iterator.advance();
|
|
return Some(other);
|
|
}
|
|
}
|
|
}
|
|
}
|