Chromium Code Reviews| Index: vm/parser.cc |
| =================================================================== |
| --- vm/parser.cc (revision 3276) |
| +++ vm/parser.cc (working copy) |
| @@ -2870,10 +2870,8 @@ |
| void Parser::ConsumeRightAngleBracket() { |
| if (token_kind_ == Token::kGT) { |
| ConsumeToken(); |
| - } else if (token_kind_ == Token::kSAR) { |
| - token_kind_ = Token::kGT; |
| } else if (token_kind_ == Token::kSHR) { |
| - token_kind_ = Token::kSAR; |
| + token_kind_ = Token::kGT; |
| } else { |
| UNREACHABLE(); |
| } |
| @@ -2888,7 +2886,6 @@ |
| } while (CurrentToken() == Token::kCOMMA); |
| Token::Kind token = CurrentToken(); |
| if ((token == Token::kGT) || |
| - (token == Token::kSAR) || |
| (token == Token::kSHR)) { |
| ConsumeRightAngleBracket(); |
| } else { |
| @@ -2937,7 +2934,6 @@ |
| } while (CurrentToken() == Token::kCOMMA); |
| Token::Kind token = CurrentToken(); |
| if ((token == Token::kGT) || |
| - (token == Token::kSAR) || |
| (token == Token::kSHR)) { |
|
hausner
2012/01/13 07:22:53
Probably fits on one line now. Also in other place
Ivan Posva
2012/01/13 09:04:18
Done.
|
| ConsumeRightAngleBracket(); |
| } else { |
| @@ -2971,7 +2967,6 @@ |
| } while (CurrentToken() == Token::kCOMMA); |
| Token::Kind token = CurrentToken(); |
| if ((token == Token::kGT) || |
| - (token == Token::kSAR) || |
| (token == Token::kSHR)) { |
| ConsumeRightAngleBracket(); |
| } else { |
| @@ -3911,10 +3906,8 @@ |
| nesting_level++; |
| } else if (CurrentToken() == Token::kGT) { |
| nesting_level--; |
| - } else if (CurrentToken() == Token::kSAR) { |
| - nesting_level -= 2; |
| } else if (CurrentToken() == Token::kSHR) { |
| - nesting_level -= 3; |
| + nesting_level -= 2; |
| } else if (CurrentToken() == Token::kIDENT) { |
| // Check to see if it is a qualified identifier. |
| if (LookaheadToken(1) == Token::kPERIOD) { |
| @@ -5577,12 +5570,10 @@ |
| return new BinaryOpNode(op_pos, Token::kDIV, lhs, rhs); |
| case Token::kASSIGN_MOD: |
| return new BinaryOpNode(op_pos, Token::kMOD, lhs, rhs); |
| - case Token::kASSIGN_SAR: |
| - return new BinaryOpNode(op_pos, Token::kSAR, lhs, rhs); |
| - case Token::kASSIGN_SHL: |
| - return new BinaryOpNode(op_pos, Token::kSHL, lhs, rhs); |
| case Token::kASSIGN_SHR: |
| return new BinaryOpNode(op_pos, Token::kSHR, lhs, rhs); |
| + case Token::kASSIGN_SHL: |
| + return new BinaryOpNode(op_pos, Token::kSHL, lhs, rhs); |
| case Token::kASSIGN_OR: |
| return new BinaryOpNode(op_pos, Token::kBIT_OR, lhs, rhs); |
| case Token::kASSIGN_AND: |