>> and >>> are lexed as tokens by the JDT parser. We always want >,> and >,>,> - yuck.

1 files changed, 17 insertions, 1 deletions

diff --git a/weaver/src/org/aspectj/weaver/patterns/PatternParser.java b/weaver/src/org/aspectj/weaver/patterns/PatternParser.java
index b108b57b1..69d59cdae 100644
--- a/weaver/src/org/aspectj/weaver/patterns/PatternParser.java
+++ b/weaver/src/org/aspectj/weaver/patterns/PatternParser.java
@@ -1273,11 +1273,27 @@ public class PatternParser {
 	}
 	
 	private void eat(String expectedValue,String expectedMessage) {
-		IToken next = tokenSource.next();
+		IToken next = nextToken();
 		if (next.getString() != expectedValue) {
+			if (expectedValue.equals(">") && next.getString().startsWith(">")) {
+				// handle problem of >> and >>> being lexed as single tokens
+				pendingRightArrows = BasicToken.makeLiteral(next.getString().substring(1).intern(), "string", next.getStart()+1, next.getEnd());
+				return;
+			}
 			throw new ParserException(expectedMessage, next);
 		}
 	}
+
+	private IToken pendingRightArrows;
+	private IToken nextToken() {
+		if (pendingRightArrows != null) {
+			IToken ret = pendingRightArrows;
+			pendingRightArrows = null;
+			return ret;
+		} else {
+			return tokenSource.next();
+		}
+	}
 	
 	public boolean maybeEat(String token) {
 		IToken next = tokenSource.peek();