bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Get rid of the >>> operator and make >> logical or arithmetic depending on the signedness. Closes #2417.

Browse source
This commit is contained in:
Michael Sullivan 2012-05-22 14:59:15 -07:00
parent 8d7f3bd1ca
commit 15cef374b9
14 changed files with 49 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/librustsyntax/parse/common.rs
View file

@ -114,10 +114,8 @@ fn check_restricted_keywords_(p: parser, w: ast::ident) {
fn expect_gt(p: parser) {
if p.token == token::GT {
p.bump();
} else if p.token == token::BINOP(token::LSR) {
} else if p.token == token::BINOP(token::SHR) {
p.swap(token::GT, p.span.lo + 1u, p.span.hi);
} else if p.token == token::BINOP(token::ASR) {
p.swap(token::BINOP(token::LSR), p.span.lo + 1u, p.span.hi);
} else {
let mut s: str = "expecting ";
s += token_to_str(p.reader, token::GT);
@ -132,8 +130,7 @@ fn parse_seq_to_before_gt<T: copy>(sep: option<token::token>,
p: parser) -> [T] {
let mut first = true;
let mut v = [];
while p.token != token::GT && p.token != token::BINOP(token::LSR) &&
p.token != token::BINOP(token::ASR) {
while p.token != token::GT && p.token != token::BINOP(token::SHR) {
alt sep {
some(t) { if first { first = false; } else { expect(p, t); } }
_ { }