nordic-dev.net/wgpu
nordic-dev.net/wgpu
2
0
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2024-12-04 20:53:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove trailing trivia

Browse Source
This commit is contained in:
SparkyPotato 2022-09-14 11:52:26 +05:30 committed by Jim Blandy
parent 5d9cdd361f
commit 4f8db997b0
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/front/wgsl/lexer.rs
View File

@ -163,6 +163,8 @@ fn is_word_part(c: char) -> bool {
pub(super) struct Lexer<'a> { pub(super) struct Lexer<'a> {
input: &'a str, input: &'a str,
pub(super) source: &'a str, pub(super) source: &'a str,
// The byte offset of the end of the last non-trivia token.
last_end_offset: usize,
} }
impl<'a> Lexer<'a> { impl<'a> Lexer<'a> {
@ -170,6 +172,7 @@ impl<'a> Lexer<'a> {
Lexer { Lexer {
input, input,
source: input, source: input,
last_end_offset: 0,
} }
} }
@ -198,7 +201,7 @@ impl<'a> Lexer<'a> {
pub(super) fn start_byte_offset(&mut self) -> usize { pub(super) fn start_byte_offset(&mut self) -> usize {
loop { loop {
// Eat all trivia becuase `next` doesn't eat trailing trivia. // Eat all trivia because `next` doesn't eat trailing trivia.
let (token, rest) = consume_token(self.input, false); let (token, rest) = consume_token(self.input, false);
if let Token::Trivia = token { if let Token::Trivia = token {
self.input = rest; self.input = rest;
@ -209,7 +212,7 @@ impl<'a> Lexer<'a> {
} }
pub(super) const fn end_byte_offset(&self) -> usize { pub(super) const fn end_byte_offset(&self) -> usize {
self.current_byte_offset() self.last_end_offset
} }
fn peek_token_and_rest(&mut self) -> (TokenSpan<'a>, &'a str) { fn peek_token_and_rest(&mut self) -> (TokenSpan<'a>, &'a str) {
@ -224,7 +227,7 @@ impl<'a> Lexer<'a> {
} }
pub(super) const fn span_from(&self, offset: usize) -> Span { pub(super) const fn span_from(&self, offset: usize) -> Span {
offset..self.current_byte_offset() offset..self.end_byte_offset()
} }
#[must_use] #[must_use]
@ -235,7 +238,10 @@ impl<'a> Lexer<'a> {
self.input = rest; self.input = rest;
match token { match token {
Token::Trivia => start_byte_offset = self.current_byte_offset(), Token::Trivia => start_byte_offset = self.current_byte_offset(),
_ => return (token, start_byte_offset..self.current_byte_offset()), _ => {
self.last_end_offset = self.current_byte_offset();
return (token, start_byte_offset..self.last_end_offset);
}
} }
} }
} }