caisin/typst
1
0
Fork 0
mirror of https://github.com/typst/typst synced 2025-05-14 04:56:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename skip_white to skip_ws ✒

Browse Source
This commit is contained in:
Laurenz 2020-09-02 16:54:22 +02:00
parent b2f3730013
commit 7f575dc098
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/syntax/parsing.rs
View File

@ -179,7 +179,7 @@ impl Parser<'_> {
); );
} }
self.skip_white(); self.skip_ws();
let mut tree = SyntaxTree::new(); let mut tree = SyntaxTree::new();
while !self.eof() && !matches!(self.peekv(), Some(Token::Space(n)) if n >= 1) { while !self.eof() && !matches!(self.peekv(), Some(Token::Space(n)) if n >= 1) {
@ -204,13 +204,13 @@ impl Parser<'_> {
let before_name = self.pos(); let before_name = self.pos();
self.start_group(Group::Subheader); self.start_group(Group::Subheader);
self.skip_white(); self.skip_ws();
let name = self.parse_ident().unwrap_or_else(|| { let name = self.parse_ident().unwrap_or_else(|| {
self.expected_found_or_at("function name", before_name); self.expected_found_or_at("function name", before_name);
Spanned::new(Ident(String::new()), Span::at(before_name)) Spanned::new(Ident(String::new()), Span::at(before_name))
}); });
self.skip_white(); self.skip_ws();
let mut args = match self.eatv() { let mut args = match self.eatv() {
Some(Token::Colon) => self.parse_table_contents().0, Some(Token::Colon) => self.parse_table_contents().0,
@ -223,7 +223,7 @@ impl Parser<'_> {
}; };
self.end_group(); self.end_group();
self.skip_white(); self.skip_ws();
let (has_chained_child, end) = if self.peek().is_some() { let (has_chained_child, end) = if self.peek().is_some() {
let item = self.parse_bracket_call(true); let item = self.parse_bracket_call(true);
let span = item.span; let span = item.span;
@ -271,16 +271,16 @@ impl Parser<'_> {
let mut comma_and_keyless = true; let mut comma_and_keyless = true;
while { while {
self.skip_white(); self.skip_ws();
!self.eof() !self.eof()
} { } {
let (key, val) = if let Some(ident) = self.parse_ident() { let (key, val) = if let Some(ident) = self.parse_ident() {
self.skip_white(); self.skip_ws();
match self.peekv() { match self.peekv() {
Some(Token::Equals) => { Some(Token::Equals) => {
self.eat(); self.eat();
self.skip_white(); self.skip_ws();
if let Some(value) = self.parse_expr() { if let Some(value) = self.parse_expr() {
(Some(ident), value) (Some(ident), value)
} else { } else {
@ -315,7 +315,7 @@ impl Parser<'_> {
} }
if { if {
self.skip_white(); self.skip_ws();
self.eof() self.eof()
} { } {
break; break;
@ -359,17 +359,17 @@ impl Parser<'_> {
) -> Option<Spanned<Expr>> { ) -> Option<Spanned<Expr>> {
let mut left = parse_operand(self)?; let mut left = parse_operand(self)?;
self.skip_white(); self.skip_ws();
while let Some(token) = self.peek() { while let Some(token) = self.peek() {
if let Some(op) = parse_op(token.v) { if let Some(op) = parse_op(token.v) {
self.eat(); self.eat();
self.skip_white(); self.skip_ws();
if let Some(right) = parse_operand(self) { if let Some(right) = parse_operand(self) {
let span = Span::merge(left.span, right.span); let span = Span::merge(left.span, right.span);
let v = op(Box::new(left), Box::new(right)); let v = op(Box::new(left), Box::new(right));
left = Spanned::new(v, span); left = Spanned::new(v, span);
self.skip_white(); self.skip_ws();
continue; continue;
} }
@ -386,7 +386,7 @@ impl Parser<'_> {
fn parse_factor(&mut self) -> Option<Spanned<Expr>> { fn parse_factor(&mut self) -> Option<Spanned<Expr>> {
if let Some(hyph) = self.check_eat(Token::Hyphen) { if let Some(hyph) = self.check_eat(Token::Hyphen) {
self.skip_white(); self.skip_ws();
if let Some(factor) = self.parse_factor() { if let Some(factor) = self.parse_factor() {
let span = Span::merge(hyph.span, factor.span); let span = Span::merge(hyph.span, factor.span);
Some(Spanned::new(Expr::Neg(Box::new(factor)), span)) Some(Spanned::new(Expr::Neg(Box::new(factor)), span))
@ -406,7 +406,7 @@ impl Parser<'_> {
Token::Ident(id) => { Token::Ident(id) => {
let name = Spanned::new(Ident(id.to_string()), span); let name = Spanned::new(Ident(id.to_string()), span);
self.eat(); self.eat();
self.skip_white(); self.skip_ws();
if self.check(Token::LeftParen) { if self.check(Token::LeftParen) {
self.parse_paren_call(name).map(Expr::Call) self.parse_paren_call(name).map(Expr::Call)
} else { } else {
@ -557,7 +557,7 @@ impl<'s> Parser<'s> {
} }
} }
fn skip_white(&mut self) { fn skip_ws(&mut self) {
while matches!( while matches!(
self.peekv(), self.peekv(),
Some(Token::Space(_)) | Some(Token::Space(_)) |