Skip to content

Commit 5938ee8

Browse files
committed
---
yaml --- r: 16249 b: refs/heads/try c: ae6d8d1 h: refs/heads/master i: 16247: 5fe64e3 v: v3
1 parent fe5ba96 commit 5938ee8

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5-
refs/heads/try: 7803488a43eb24864105506b3825f605bc87d693
5+
refs/heads/try: ae6d8d1b4dc5a150e1aa62ba52cd534b15e45c1d
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libsyntax/parse/lexer.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,12 @@ fn next_token_inner(rdr: reader) -> token::token {
389389
if rdr.curr == '=' {
390390
rdr.bump();
391391
ret token::EQEQ;
392-
} else { ret token::EQ; }
392+
} else if rdr.curr == '>' {
393+
rdr.bump();
394+
ret token::FAT_ARROW;
395+
} else {
396+
ret token::EQ;
397+
}
393398
}
394399
'!' {
395400
rdr.bump();

branches/try/src/libsyntax/parse/parser.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1281,6 +1281,7 @@ class parser {
12811281
let pats = self.parse_pats();
12821282
let mut guard = none;
12831283
if self.eat_keyword("if") { guard = some(self.parse_expr()); }
1284+
if self.token == token::FAT_ARROW { self.bump(); }
12841285
let blk = self.parse_block();
12851286
arms += [{pats: pats, guard: guard, body: blk}];
12861287
}

branches/try/src/libsyntax/parse/token.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ enum token {
4545
RARROW,
4646
LARROW,
4747
DARROW,
48+
FAT_ARROW,
4849
LPAREN,
4950
RPAREN,
5051
LBRACKET,
@@ -111,6 +112,7 @@ fn to_str(in: interner<str>, t: token) -> str {
111112
RARROW { ret "->"; }
112113
LARROW { ret "<-"; }
113114
DARROW { ret "<->"; }
115+
FAT_ARROW { ret "=>"; }
114116
LPAREN { ret "("; }
115117
RPAREN { ret ")"; }
116118
LBRACKET { ret "["; }

0 commit comments

Comments
 (0)