token: Make TKind::{Pub, Mod} match their keywords
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -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),
|
||||
|
||||
@@ -80,9 +80,9 @@ pub enum TKind {
|
||||
Loop,
|
||||
Macro,
|
||||
Match,
|
||||
Module,
|
||||
Mod,
|
||||
Mut,
|
||||
Public,
|
||||
Pub,
|
||||
Return,
|
||||
Static,
|
||||
Struct,
|
||||
|
||||
Reference in New Issue
Block a user