paramannos: ResolvedType can hold 'temporary annotations' during a match (parameter annos). PatternParser supports distinction between parameter and type annos.

2 files changed, 6 insertions, 6 deletions

diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java
index 08584fd00..4aa17f059 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java
@@ -301,20 +301,20 @@ public class ParserTestCase extends TestCase {
 	
 	public void testParseAnythingTypeVariable() {
 		PatternParser parser = new PatternParser("?");
-		WildTypePattern tp = (WildTypePattern) parser.parseTypePattern(true);
+		WildTypePattern tp = (WildTypePattern) parser.parseTypePattern(true,false);
 		assertEquals("Expected type variable ?","?",tp.maybeGetSimpleName());
 	}
 
 	public void testParseAnythingExtendsTypeVariable() {
 		PatternParser parser = new PatternParser("? extends Number");
-		WildTypePattern tp = (WildTypePattern) parser.parseTypePattern(true);
+		WildTypePattern tp = (WildTypePattern) parser.parseTypePattern(true,false);
 		assertEquals("Expected type variable ?","?",tp.maybeGetSimpleName());
 		assertEquals("upper Bound of Number",new PatternParser("Number").parseTypePattern(),tp.getUpperBound());
 	}
 	
 	public void testParseAnythingSuperTypeVariable() {
 		PatternParser parser = new PatternParser("? super Number+");
-		WildTypePattern tp = (WildTypePattern) parser.parseTypePattern(true);
+		WildTypePattern tp = (WildTypePattern) parser.parseTypePattern(true,false);
 		assertEquals("Expected type variable ?","?",tp.maybeGetSimpleName());
 		assertEquals("lower Bound of Number+",new PatternParser("Number+").parseTypePattern(),tp.getLowerBound());
 	}
@@ -335,7 +335,7 @@ public class ParserTestCase extends TestCase {
 	public void testParameterizedTypePatternsAny() {
 		try {
 			PatternParser parser = new PatternParser("*<T,S extends Number>");
-			WildTypePattern wtp = (WildTypePattern) parser.parseTypePattern(false);
+			WildTypePattern wtp = (WildTypePattern) parser.parseTypePattern(false,false);
 	//		TypePatternList tvs = wtp.getTypeParameters();
 	//		assertEquals("2 type parameters",2,tvs.getTypePatterns().length);
 	//		assertEquals("T",new PatternParser("T").parseTypePattern(),tvs.getTypePatterns()[0]);
@@ -609,7 +609,7 @@ public class ParserTestCase extends TestCase {
 	public void testTypeParamList() {
 		PatternParser parser = new PatternParser("Bar<T,S extends T, R extends S>");
 		try {
-			TypePattern tp = parser.parseTypePattern(false);
+			TypePattern tp = parser.parseTypePattern(false,false);
 //			TypePattern[] tps = tp.getTypeParameters().getTypePatterns();
 //			assertEquals("3 type patterns",3,tps.length);
 //			assertEquals("T",tps[0].toString());
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/TypePatternListTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/TypePatternListTestCase.java
index 4b1f2c737..accc8c5f5 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/TypePatternListTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/TypePatternListTestCase.java
@@ -99,7 +99,7 @@ public class TypePatternListTestCase extends TestCase {
 	}
 
 	private TypePatternList makeArgumentsPattern(String pattern) {
-		return new PatternParser(pattern).parseArgumentsPattern();
+		return new PatternParser(pattern).parseArgumentsPattern(false);
 	}
 
 	private void checkStaticMatch(String pattern, String[] names,