Skip to content

Commit c47be69

Browse files
thestingerthestinger
committed
remove copy as a keyword
1 parent 4bad515 commit c47be69

File tree

1 file changed

+68
-70
lines changed

1 file changed

+68
-70
lines changed

‎src/libsyntax/parse/token.rs

Lines changed: 68 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -440,42 +440,41 @@ fn mk_fresh_ident_interner() -> @ident_interner {
440440
"as", // 32
441441
"break", // 33
442442
"const", // 34
443-
"copy", // 35
444-
"do", // 36
445-
"else", // 37
446-
"enum", // 38
447-
"extern", // 39
448-
"false", // 40
449-
"fn", // 41
450-
"for", // 42
451-
"if", // 43
452-
"impl", // 44
453-
"let", // 45
454-
"__log", // 46
455-
"loop", // 47
456-
"match", // 48
457-
"mod", // 49
458-
"mut", // 50
459-
"once", // 51
460-
"priv", // 52
461-
"pub", // 53
462-
"pure", // 54
463-
"ref", // 55
464-
"return", // 56
443+
"do", // 35
444+
"else", // 36
445+
"enum", // 37
446+
"extern", // 38
447+
"false", // 39
448+
"fn", // 40
449+
"for", // 41
450+
"if", // 42
451+
"impl", // 43
452+
"let", // 44
453+
"__log", // 45
454+
"loop", // 46
455+
"match", // 47
456+
"mod", // 48
457+
"mut", // 49
458+
"once", // 50
459+
"priv", // 51
460+
"pub", // 52
461+
"pure", // 53
462+
"ref", // 54
463+
"return", // 55
465464
"static", // 27 -- also a special ident
466465
"self", // 8 -- also a special ident
467-
"struct", // 57
468-
"super", // 58
469-
"true", // 59
470-
"trait", // 60
471-
"type", // 61
472-
"unsafe", // 62
473-
"use", // 63
474-
"while", // 64
475-
476-
"be", // 65
477-
"in", // 66
478-
"foreach", // 67
466+
"struct", // 56
467+
"super", // 57
468+
"true", // 58
469+
"trait", // 59
470+
"type", // 60
471+
"unsafe", // 61
472+
"use", // 62
473+
"while", // 63
474+
475+
"be", // 64
476+
"in", // 65
477+
"foreach", // 66
479478
];
480479

481480
@ident_interner {
@@ -609,40 +608,40 @@ pub mod keywords {
609608
As => ident { name: 32, ctxt: 0 },
610609
Break => ident { name: 33, ctxt: 0 },
611610
Const => ident { name: 34, ctxt: 0 },
612-
Do => ident { name: 36, ctxt: 0 },
613-
Else => ident { name: 37, ctxt: 0 },
614-
Enum => ident { name: 38, ctxt: 0 },
615-
Extern => ident { name: 39, ctxt: 0 },
616-
False => ident { name: 40, ctxt: 0 },
617-
Fn => ident { name: 41, ctxt: 0 },
618-
For => ident { name: 42, ctxt: 0 },
619-
ForEach => ident { name: 67, ctxt: 0 },
620-
If => ident { name: 43, ctxt: 0 },
621-
Impl => ident { name: 44, ctxt: 0 },
622-
In => ident { name: 66, ctxt: 0 },
623-
Let => ident { name: 45, ctxt: 0 },
624-
__Log => ident { name: 46, ctxt: 0 },
625-
Loop => ident { name: 47, ctxt: 0 },
626-
Match => ident { name: 48, ctxt: 0 },
627-
Mod => ident { name: 49, ctxt: 0 },
628-
Mut => ident { name: 50, ctxt: 0 },
629-
Once => ident { name: 51, ctxt: 0 },
630-
Priv => ident { name: 52, ctxt: 0 },
631-
Pub => ident { name: 53, ctxt: 0 },
632-
Pure => ident { name: 54, ctxt: 0 },
633-
Ref => ident { name: 55, ctxt: 0 },
634-
Return => ident { name: 56, ctxt: 0 },
611+
Do => ident { name: 35, ctxt: 0 },
612+
Else => ident { name: 36, ctxt: 0 },
613+
Enum => ident { name: 37, ctxt: 0 },
614+
Extern => ident { name: 38, ctxt: 0 },
615+
False => ident { name: 39, ctxt: 0 },
616+
Fn => ident { name: 40, ctxt: 0 },
617+
For => ident { name: 41, ctxt: 0 },
618+
ForEach => ident { name: 66, ctxt: 0 },
619+
If => ident { name: 42, ctxt: 0 },
620+
Impl => ident { name: 43, ctxt: 0 },
621+
In => ident { name: 65, ctxt: 0 },
622+
Let => ident { name: 44, ctxt: 0 },
623+
__Log => ident { name: 45, ctxt: 0 },
624+
Loop => ident { name: 46, ctxt: 0 },
625+
Match => ident { name: 47, ctxt: 0 },
626+
Mod => ident { name: 48, ctxt: 0 },
627+
Mut => ident { name: 49, ctxt: 0 },
628+
Once => ident { name: 50, ctxt: 0 },
629+
Priv => ident { name: 51, ctxt: 0 },
630+
Pub => ident { name: 52, ctxt: 0 },
631+
Pure => ident { name: 53, ctxt: 0 },
632+
Ref => ident { name: 54, ctxt: 0 },
633+
Return => ident { name: 55, ctxt: 0 },
635634
Static => ident { name: 27, ctxt: 0 },
636635
Self => ident { name: 8, ctxt: 0 },
637-
Struct => ident { name: 57, ctxt: 0 },
638-
Super => ident { name: 58, ctxt: 0 },
639-
True => ident { name: 59, ctxt: 0 },
640-
Trait => ident { name: 60, ctxt: 0 },
641-
Type => ident { name: 61, ctxt: 0 },
642-
Unsafe => ident { name: 62, ctxt: 0 },
643-
Use => ident { name: 63, ctxt: 0 },
644-
While => ident { name: 64, ctxt: 0 },
645-
Be => ident { name: 65, ctxt: 0 },
636+
Struct => ident { name: 56, ctxt: 0 },
637+
Super => ident { name: 57, ctxt: 0 },
638+
True => ident { name: 58, ctxt: 0 },
639+
Trait => ident { name: 59, ctxt: 0 },
640+
Type => ident { name: 60, ctxt: 0 },
641+
Unsafe => ident { name: 61, ctxt: 0 },
642+
Use => ident { name: 62, ctxt: 0 },
643+
While => ident { name: 63, ctxt: 0 },
644+
Be => ident { name: 64, ctxt: 0 },
646645
}
647646
}
648647
}
@@ -658,7 +657,7 @@ pub fn is_keyword(kw: keywords::Keyword, tok: &Token) -> bool {
658657
pub fn is_any_keyword(tok: &Token) -> bool {
659658
match *tok {
660659
token::IDENT(sid, false) => match sid.name {
661-
8 | 27 | 32 .. 65 => true,
660+
8 | 27 | 32 .. 64 => true,
662661
_ => false,
663662
},
664663
_ => false
@@ -668,7 +667,7 @@ pub fn is_any_keyword(tok: &Token) -> bool {
668667
pub fn is_strict_keyword(tok: &Token) -> bool {
669668
match *tok {
670669
token::IDENT(sid, false) => match sid.name {
671-
8 | 27 | 32 .. 64 => true,
670+
8 | 27 | 32 .. 63 => true,
672671
_ => false,
673672
},
674673
_ => false,
@@ -678,14 +677,13 @@ pub fn is_strict_keyword(tok: &Token) -> bool {
678677
pub fn is_reserved_keyword(tok: &Token) -> bool {
679678
match *tok {
680679
token::IDENT(sid, false) => match sid.name {
681-
65 => true,
680+
64 => true,
682681
_ => false,
683682
},
684683
_ => false,
685684
}
686685
}
687686

688-
689687
#[cfg(test)]
690688
mod test {
691689
use super::*;

0 commit comments

Comments
 (0)