Skip to content

Commit e4cfecb

Browse files
committed
---
yaml --- r: 67507 b: refs/heads/master c: b57ffef h: refs/heads/master i: 67505: 6f62f7e 67503: 54ebd86 v: v3
1 parent b26d0d8 commit e4cfecb

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: dabd4762037baab06603fe76dd59795e4d415334
2+
refs/heads/master: b57ffef37e6e2196ad948ab2f6944d242c3aaaf1
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/src/libsyntax/parse/token.rs

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -458,23 +458,23 @@ fn mk_fresh_ident_interner() -> @ident_interner {
458458
"once", // 50
459459
"priv", // 51
460460
"pub", // 52
461-
"pure", // 53
462-
"ref", // 54
463-
"return", // 55
461+
"ref", // 53
462+
"return", // 54
464463
"static", // 27 -- also a special ident
465464
"self", // 8 -- also a special ident
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-
"in", // 64
475-
"foreach", // 65
476-
477-
"be", // 66
465+
"struct", // 55
466+
"super", // 56
467+
"true", // 57
468+
"trait", // 58
469+
"type", // 59
470+
"unsafe", // 60
471+
"use", // 61
472+
"while", // 62
473+
"in", // 63
474+
"foreach", // 64
475+
476+
"be", // 65
477+
"pure", // 66
478478
];
479479

480480
@ident_interner {
@@ -615,10 +615,10 @@ pub mod keywords {
615615
False => ident { name: 39, ctxt: 0 },
616616
Fn => ident { name: 40, ctxt: 0 },
617617
For => ident { name: 41, ctxt: 0 },
618-
ForEach => ident { name: 65, ctxt: 0 },
618+
ForEach => ident { name: 64, ctxt: 0 },
619619
If => ident { name: 42, ctxt: 0 },
620620
Impl => ident { name: 43, ctxt: 0 },
621-
In => ident { name: 64, ctxt: 0 },
621+
In => ident { name: 63, ctxt: 0 },
622622
Let => ident { name: 44, ctxt: 0 },
623623
__Log => ident { name: 45, ctxt: 0 },
624624
Loop => ident { name: 46, ctxt: 0 },
@@ -628,20 +628,20 @@ pub mod keywords {
628628
Once => ident { name: 50, ctxt: 0 },
629629
Priv => ident { name: 51, ctxt: 0 },
630630
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 },
631+
Pure => ident { name: 66, ctxt: 0 },
632+
Ref => ident { name: 53, ctxt: 0 },
633+
Return => ident { name: 54, ctxt: 0 },
634634
Static => ident { name: 27, ctxt: 0 },
635635
Self => ident { name: 8, 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: 66, ctxt: 0 },
636+
Struct => ident { name: 55, ctxt: 0 },
637+
Super => ident { name: 56, ctxt: 0 },
638+
True => ident { name: 57, ctxt: 0 },
639+
Trait => ident { name: 58, ctxt: 0 },
640+
Type => ident { name: 59, ctxt: 0 },
641+
Unsafe => ident { name: 60, ctxt: 0 },
642+
Use => ident { name: 61, ctxt: 0 },
643+
While => ident { name: 62, ctxt: 0 },
644+
Be => ident { name: 65, ctxt: 0 },
645645
}
646646
}
647647
}
@@ -667,7 +667,7 @@ pub fn is_any_keyword(tok: &Token) -> bool {
667667
pub fn is_strict_keyword(tok: &Token) -> bool {
668668
match *tok {
669669
token::IDENT(sid, false) => match sid.name {
670-
8 | 27 | 32 .. 65 => true,
670+
8 | 27 | 32 .. 64 => true,
671671
_ => false,
672672
},
673673
_ => false,
@@ -677,7 +677,7 @@ pub fn is_strict_keyword(tok: &Token) -> bool {
677677
pub fn is_reserved_keyword(tok: &Token) -> bool {
678678
match *tok {
679679
token::IDENT(sid, false) => match sid.name {
680-
66 => true,
680+
65 .. 66 => true,
681681
_ => false,
682682
},
683683
_ => false,

0 commit comments

Comments
 (0)