summaryrefslogtreecommitdiff
path: root/src/parse/tokens.rs
diff options
context:
space:
mode:
authorMartin Haug <mhaug@live.de>2022-02-21 22:49:50 +0100
committerMartin Haug <mhaug@live.de>2022-02-23 13:58:56 +0100
commit20ac96f27a2e06b985abc1c95049c32c2b88ef5d (patch)
treeb145fa807c4088626c2f0bf1eeb32cff0fd163e1 /src/parse/tokens.rs
parentaac3afcba8ee9b3692f784c78626aa0596aaf612 (diff)
New incremental parsing paradigm
Also move column offset into scanner. This fixes #62
Diffstat (limited to 'src/parse/tokens.rs')
-rw-r--r--src/parse/tokens.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/parse/tokens.rs b/src/parse/tokens.rs
index e88b49f9..4a13694a 100644
--- a/src/parse/tokens.rs
+++ b/src/parse/tokens.rs
@@ -28,9 +28,9 @@ pub enum TokenMode {
impl<'s> Tokens<'s> {
/// Create a new token iterator with the given mode.
#[inline]
- pub fn new(src: &'s str, mode: TokenMode) -> Self {
+ pub fn new(src: &'s str, mode: TokenMode, offset: usize) -> Self {
Self {
- s: Scanner::new(src),
+ s: Scanner::with_indent_offset(src, offset),
mode,
terminated: true,
}
@@ -689,7 +689,7 @@ mod tests {
}};
(@$mode:ident: $src:expr => $($token:expr),*) => {{
let src = $src;
- let found = Tokens::new(&src, $mode).collect::<Vec<_>>();
+ let found = Tokens::new(&src, $mode, 0).collect::<Vec<_>>();
let expected = vec![$($token.clone()),*];
check(&src, found, expected);
}};