doc parser input

This commit is contained in:
csmoe 2018-12-31 21:30:37 +08:00
parent ea7b569e1b
commit b01e707dba
2 changed files with 30 additions and 10 deletions

View file

@ -64,7 +64,6 @@ pub(crate) fn parse_with<S: Sink>(
/// the public API of the `Parser`.
pub(crate) struct ParserImpl<'t> {
inp: &'t ParserInput<'t>,
pos: InputPosition,
events: Vec<Event>,
steps: Cell<u32>,
@ -74,7 +73,6 @@ impl<'t> ParserImpl<'t> {
pub(crate) fn new(inp: &'t ParserInput<'t>) -> ParserImpl<'t> {
ParserImpl {
inp,
pos: InputPosition::new(),
events: Vec::new(),
steps: Cell::new(0),
@ -89,7 +87,9 @@ impl<'t> ParserImpl<'t> {
pub(super) fn next2(&self) -> Option<(SyntaxKind, SyntaxKind)> {
let c1 = self.inp.kind(self.pos);
let c2 = self.inp.kind(self.pos + 1);
if self.inp.start(self.pos + 1) == self.inp.start(self.pos) + self.inp.len(self.pos) {
if self.inp.token_start_at(self.pos + 1)
== self.inp.token_start_at(self.pos) + self.inp.len(self.pos)
{
Some((c1, c2))
} else {
None
@ -100,9 +100,10 @@ impl<'t> ParserImpl<'t> {
let c1 = self.inp.kind(self.pos);
let c2 = self.inp.kind(self.pos + 1);
let c3 = self.inp.kind(self.pos + 2);
if self.inp.start(self.pos + 1) == self.inp.start(self.pos) + self.inp.len(self.pos)
&& self.inp.start(self.pos + 2)
== self.inp.start(self.pos + 1) + self.inp.len(self.pos + 1)
if self.inp.token_start_at(self.pos + 1)
== self.inp.token_start_at(self.pos) + self.inp.len(self.pos)
&& self.inp.token_start_at(self.pos + 2)
== self.inp.token_start_at(self.pos + 1) + self.inp.len(self.pos + 1)
{
Some((c1, c2, c3))
} else {

View file

@ -4,11 +4,26 @@ use std::ops::{Add, AddAssign};
pub(crate) struct ParserInput<'t> {
text: &'t str,
/// start position of each token(expect whitespace and comment)
/// ```non-rust
/// struct Foo;
/// ^------^---
/// | | ^-
/// 0 7 10
/// ```
/// (token, start_offset): `[(struct, 0), (Foo, 7), (;, 10)]`
start_offsets: Vec<TextUnit>,
tokens: Vec<Token>, // non-whitespace tokens
/// non-whitespace/comment tokens
/// ```non-rust
/// struct Foo {}
/// ^^^^^^ ^^^ ^^
/// ```
/// tokens: `[struct, Foo, {, }]`
tokens: Vec<Token>,
}
impl<'t> ParserInput<'t> {
/// Generate input from tokens(expect comment and whitespace).
pub fn new(text: &'t str, raw_tokens: &'t [Token]) -> ParserInput<'t> {
let mut tokens = Vec::new();
let mut start_offsets = Vec::new();
@ -28,6 +43,7 @@ impl<'t> ParserInput<'t> {
}
}
/// Get the syntax kind of token at given input position.
pub fn kind(&self, pos: InputPosition) -> SyntaxKind {
let idx = pos.0 as usize;
if !(idx < self.tokens.len()) {
@ -36,7 +52,8 @@ impl<'t> ParserInput<'t> {
self.tokens[idx].kind
}
pub fn len(&self, pos: InputPosition) -> TextUnit {
/// Get the length of a token at given input position.
pub fn token_len(&self, pos: InputPosition) -> TextUnit {
let idx = pos.0 as usize;
if !(idx < self.tokens.len()) {
return 0.into();
@ -44,7 +61,8 @@ impl<'t> ParserInput<'t> {
self.tokens[idx].len
}
pub fn start(&self, pos: InputPosition) -> TextUnit {
/// Get the start position of a taken at given input position.
pub fn token_start_at(&self, pos: InputPosition) -> TextUnit {
let idx = pos.0 as usize;
if !(idx < self.tokens.len()) {
return 0.into();
@ -52,7 +70,8 @@ impl<'t> ParserInput<'t> {
self.start_offsets[idx]
}
pub fn text(&self, pos: InputPosition) -> &'t str {
/// Get the raw text of a toen at given input position.
pub fn token_text(&self, pos: InputPosition) -> &'t str {
let idx = pos.0 as usize;
if !(idx < self.tokens.len()) {
return "";