summaryrefslogtreecommitdiff
path: root/src/parse/parser.rs
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2022-03-11 12:22:27 +0100
committerLaurenz <laurmaedje@gmail.com>2022-03-11 12:22:27 +0100
commit5ce2a006b6d45d29be15e4562ae3ab4fc1b8e97c (patch)
tree454b25e04530adcdf08a161e1ab09abb33c0644c /src/parse/parser.rs
parente6b532391deb1e30dc356c4d20dd48199f748f29 (diff)
Consistent block naming
Diffstat (limited to 'src/parse/parser.rs')
-rw-r--r--src/parse/parser.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/parse/parser.rs b/src/parse/parser.rs
index 123871a5..33cf489c 100644
--- a/src/parse/parser.rs
+++ b/src/parse/parser.rs
@@ -229,13 +229,13 @@ impl<'s> Parser<'s> {
self.groups.push(GroupEntry { kind, prev_mode: self.tokens.mode() });
self.tokens.set_mode(match kind {
Group::Bracket | Group::Strong | Group::Emph => TokenMode::Markup,
- Group::Paren | Group::Brace | Group::Expr | Group::Imports => TokenMode::Code,
+ Group::Brace | Group::Paren | Group::Expr | Group::Imports => TokenMode::Code,
});
match kind {
- Group::Paren => self.eat_assert(&NodeKind::LeftParen),
- Group::Bracket => self.eat_assert(&NodeKind::LeftBracket),
Group::Brace => self.eat_assert(&NodeKind::LeftBrace),
+ Group::Bracket => self.eat_assert(&NodeKind::LeftBracket),
+ Group::Paren => self.eat_assert(&NodeKind::LeftParen),
Group::Strong => self.eat_assert(&NodeKind::Star),
Group::Emph => self.eat_assert(&NodeKind::Underscore),
Group::Expr => self.repeek(),
@@ -321,9 +321,9 @@ impl<'s> Parser<'s> {
/// group.
fn repeek(&mut self) {
self.eof = match &self.current {
- Some(NodeKind::RightParen) => self.inside(Group::Paren),
- Some(NodeKind::RightBracket) => self.inside(Group::Bracket),
Some(NodeKind::RightBrace) => self.inside(Group::Brace),
+ Some(NodeKind::RightBracket) => self.inside(Group::Bracket),
+ Some(NodeKind::RightParen) => self.inside(Group::Paren),
Some(NodeKind::Star) => self.inside(Group::Strong),
Some(NodeKind::Underscore) => self.inside(Group::Emph),
Some(NodeKind::Semicolon) => self.inside(Group::Expr),
@@ -482,10 +482,10 @@ struct GroupEntry {
/// A group, confined by optional start and end delimiters.
#[derive(Debug, Copy, Clone, Eq, PartialEq)]
pub enum Group {
- /// A bracketed group: `[...]`.
- Bracket,
/// A curly-braced group: `{...}`.
Brace,
+ /// A bracketed group: `[...]`.
+ Bracket,
/// A parenthesized group: `(...)`.
Paren,
/// A group surrounded with stars: `*...*`.