j/Doughlang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

token: Make TKind::{Pub, Mod} match their keywords

Browse Source
This commit is contained in:
John
2025-10-21 08:35:33 -04:00
parent 3fd089ad11
commit 263d2290c0
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lexer.rs
View File

@@ -305,9 +305,9 @@ impl<'t> Lexer<'t> {
"loop" => TKind::Loop, "loop" => TKind::Loop,
"macro" => TKind::Macro, "macro" => TKind::Macro,
"match" => TKind::Match, "match" => TKind::Match,
"mod" => TKind::Module, "mod" => TKind::Mod,
"mut" => TKind::Mut, "mut" => TKind::Mut,
"pub" => TKind::Public, "pub" => TKind::Pub,
"return" => TKind::Return, "return" => TKind::Return,
"static" => TKind::Static, "static" => TKind::Static,
"struct" => TKind::Struct, "struct" => TKind::Struct,

8
src/parser.rs
View File

@@ -361,8 +361,8 @@ impl<'t> Parse<'t> for Pat {
TKind::Bar => p.consume().parse(level)?, TKind::Bar => p.consume().parse(level)?,
TKind::Bang => p.consume().then(Pat::Never), TKind::Bang => p.consume().then(Pat::Never),
TKind::Amp => Pat::Op(PatOp::Ref, vec![p.consume().parse(PPrec::Max)?]), TKind::Amp => Pat::Op(PatOp::Ref, vec![p.consume().parse(PPrec::Max)?]),
TKind::Mut => Pat::Op(PatOp::Mut, vec![p.consume().parse(level)?]), TKind::Mut => Pat::Op(PatOp::Mut, vec![p.consume().parse(PPrec::Max)?]),
TKind::Public => Pat::Op(PatOp::Pub, vec![p.consume().parse(level)?]), TKind::Pub => Pat::Op(PatOp::Pub, vec![p.consume().parse(PPrec::Max)?]),
TKind::AmpAmp => Pat::Op( TKind::AmpAmp => Pat::Op(
PatOp::Ref, PatOp::Ref,
vec![Pat::Op(PatOp::Ref, vec![p.consume().parse(PPrec::Max)?])], 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::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::For => (Ps::For, Prec::Body),
TKind::Fn => (Ps::Fn, Prec::Body), TKind::Fn => (Ps::Fn, Prec::Body),
TKind::Match => (Ps::Op(Op::Match), Prec::Body), TKind::Match => (Ps::Op(Op::Match), Prec::Body),
TKind::Macro => (Ps::Op(Op::Macro), Prec::Assign), 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::Impl => (Ps::Impl, Prec::Body),
TKind::Let => (Ps::Let, Prec::Tuple), TKind::Let => (Ps::Let, Prec::Tuple),
TKind::Const => (Ps::Const, Prec::Body), TKind::Const => (Ps::Const, Prec::Body),

4
src/token.rs
View File

@@ -80,9 +80,9 @@ pub enum TKind {
Loop, Loop,
Macro, Macro,
Match, Match,
Module, Mod,
Mut, Mut,
Public, Pub,
Return, Return,
Static, Static,
Struct, Struct,