From 263d2290c09c1b4b37e8c100729b65859f760dac Mon Sep 17 00:00:00 2001 From: John Date: Tue, 21 Oct 2025 08:35:33 -0400 Subject: [PATCH] token: Make TKind::{Pub, Mod} match their keywords --- src/lexer.rs | 4 ++-- src/parser.rs | 8 ++++---- src/token.rs | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lexer.rs b/src/lexer.rs index 8c52215..fdc0f4c 100644 --- a/src/lexer.rs +++ b/src/lexer.rs @@ -305,9 +305,9 @@ impl<'t> Lexer<'t> { "loop" => TKind::Loop, "macro" => TKind::Macro, "match" => TKind::Match, - "mod" => TKind::Module, + "mod" => TKind::Mod, "mut" => TKind::Mut, - "pub" => TKind::Public, + "pub" => TKind::Pub, "return" => TKind::Return, "static" => TKind::Static, "struct" => TKind::Struct, diff --git a/src/parser.rs b/src/parser.rs index a215ae3..8430020 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -361,8 +361,8 @@ impl<'t> Parse<'t> for Pat { TKind::Bar => p.consume().parse(level)?, TKind::Bang => p.consume().then(Pat::Never), TKind::Amp => Pat::Op(PatOp::Ref, vec![p.consume().parse(PPrec::Max)?]), - TKind::Mut => Pat::Op(PatOp::Mut, vec![p.consume().parse(level)?]), - TKind::Public => Pat::Op(PatOp::Pub, vec![p.consume().parse(level)?]), + TKind::Mut => Pat::Op(PatOp::Mut, vec![p.consume().parse(PPrec::Max)?]), + TKind::Pub => Pat::Op(PatOp::Pub, vec![p.consume().parse(PPrec::Max)?]), TKind::AmpAmp => Pat::Op( PatOp::Ref, vec![Pat::Op(PatOp::Ref, vec![p.consume().parse(PPrec::Max)?])], @@ -565,12 +565,12 @@ fn from_prefix(token: &Token) -> PResult<(Ps, Prec)> { } TKind::Use => (Ps::Use, Prec::Max), - TKind::Public => (Ps::Op(Op::Pub), Prec::Body), + TKind::Pub => (Ps::Op(Op::Pub), Prec::Body), TKind::For => (Ps::For, Prec::Body), TKind::Fn => (Ps::Fn, Prec::Body), TKind::Match => (Ps::Op(Op::Match), Prec::Body), TKind::Macro => (Ps::Op(Op::Macro), Prec::Assign), - TKind::Module => (Ps::Mod, Prec::Body), + TKind::Mod => (Ps::Mod, Prec::Body), TKind::Impl => (Ps::Impl, Prec::Body), TKind::Let => (Ps::Let, Prec::Tuple), TKind::Const => (Ps::Const, Prec::Body), diff --git a/src/token.rs b/src/token.rs index 5f5d6df..6aaacc2 100644 --- a/src/token.rs +++ b/src/token.rs @@ -80,9 +80,9 @@ pub enum TKind { Loop, Macro, Match, - Module, + Mod, Mut, - Public, + Pub, Return, Static, Struct,