-
Notifications
You must be signed in to change notification settings - Fork 602
RFC Source spans #393
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
RFC Source spans #393
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,142 @@ | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
#[cfg(not(feature = "std"))] | ||
use alloc::{boxed::Box, vec::Vec}; | ||
|
||
#[cfg(feature = "serde")] | ||
use serde::{Deserialize, Serialize}; | ||
|
||
/// A byte span within the parsed string | ||
#[derive(Debug, Eq, Clone, Copy)] | ||
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))] | ||
pub enum Span { | ||
Unset, | ||
Set { start: usize, end: usize }, | ||
} | ||
|
||
/// All spans are equal | ||
impl PartialEq for Span { | ||
fn eq(&self, _: &Self) -> bool { | ||
true | ||
} | ||
} | ||
|
||
/// All spans hash to the same value | ||
impl core::hash::Hash for Span { | ||
fn hash<H: core::hash::Hasher>(&self, _: &mut H) {} | ||
} | ||
|
||
impl Span { | ||
pub fn new() -> Self { | ||
Span::Unset | ||
} | ||
|
||
pub fn expanded(&self, item: &impl Spanned) -> Span { | ||
match self { | ||
Span::Unset => item.span(), | ||
Span::Set { start: s1, end: e1 } => match item.span() { | ||
Span::Unset => *self, | ||
Span::Set { start: s2, end: e2 } => { | ||
(usize::min(*s1, s2)..usize::max(*e1, e2)).into() | ||
} | ||
}, | ||
} | ||
} | ||
|
||
pub fn expand(&mut self, item: &impl Spanned) { | ||
*self = self.expanded(item); | ||
} | ||
|
||
pub fn start(&self) -> Option<usize> { | ||
match self { | ||
Span::Unset => None, | ||
Span::Set { start, .. } => Some(*start), | ||
} | ||
} | ||
|
||
pub fn end(&self) -> Option<usize> { | ||
match self { | ||
Span::Unset => None, | ||
Span::Set { end, .. } => Some(*end), | ||
} | ||
} | ||
|
||
pub fn range(&self) -> Option<core::ops::Range<usize>> { | ||
match self { | ||
Span::Unset => None, | ||
Span::Set { start, end } => Some(*start..*end), | ||
} | ||
} | ||
} | ||
|
||
impl Default for Span { | ||
fn default() -> Self { | ||
Span::Unset | ||
} | ||
} | ||
|
||
impl core::convert::From<core::ops::Range<usize>> for Span { | ||
fn from(r: core::ops::Range<usize>) -> Self { | ||
Self::Set { | ||
start: r.start, | ||
end: r.end, | ||
} | ||
} | ||
} | ||
|
||
pub struct UnsetSpanError; | ||
|
||
impl core::convert::TryInto<core::ops::Range<usize>> for Span { | ||
type Error = UnsetSpanError; | ||
|
||
fn try_into(self) -> Result<core::ops::Range<usize>, Self::Error> { | ||
match self { | ||
Span::Unset => Err(UnsetSpanError), | ||
Span::Set { start, end } => Ok(start..end), | ||
} | ||
} | ||
} | ||
|
||
pub trait Spanned { | ||
fn span(&self) -> Span; | ||
} | ||
|
||
impl Spanned for Span { | ||
fn span(&self) -> Span { | ||
*self | ||
} | ||
} | ||
|
||
impl<T: Spanned> Spanned for Option<T> { | ||
fn span(&self) -> Span { | ||
match self { | ||
Some(v) => v.span(), | ||
None => Default::default(), | ||
} | ||
} | ||
} | ||
|
||
impl<T: Spanned> Spanned for Vec<T> { | ||
fn span(&self) -> Span { | ||
let mut ans = Span::new(); | ||
for v in self { | ||
ans.expand(v); | ||
} | ||
ans | ||
} | ||
} | ||
|
||
impl<T: Spanned> Spanned for Box<T> { | ||
fn span(&self) -> Span { | ||
self.as_ref().span() | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about making this a wrapper for
Token
?Like:
Then you don't have to modify parser heavily, but wrapping the error with span at top of parser instead.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is indeed a better approach. Since there did not seem to be much interest in this MR. I have started on my own parser to experiment with spans and proper error recovery:
Here I ended up having the lexer return
(Token<'a>, Span)
I have also created a Spanned trait that is implemented for all AST nodes.
I need a parser that can produce spans for tokens and nodes, that can report multiple errors, and return an AST even if it encountered some errors.
I tried to see if I could add it to this crate, but it seems hard without breaking all existing uses of the library, perhaps it can be done somehow.