From 5735e966959da60fcacebb23e8b5463c4138020c Mon Sep 17 00:00:00 2001
From: acolyer <acolyer>
Date: Wed, 10 Aug 2005 11:49:34 +0000
Subject: [PATCH] tests and fix for bug pr106461: 
 "org.aspectj.weaver.patterns.WildTypePattern.maybeGetCleanName(WildTypePattern.java:500)"

---
 tests/bugs150/PR106461.aj                      | 18 ++++++++++++++++++
 .../aspectj/systemtest/ajc150/Ajc150Tests.java |  2 ++
 .../org/aspectj/systemtest/ajc150/ajc150.xml   |  8 ++++++++
 .../aspectj/weaver/patterns/PatternParser.java |  1 +
 .../weaver/patterns/WildTypePattern.java       |  5 +++++
 5 files changed, 34 insertions(+)
 create mode 100644 tests/bugs150/PR106461.aj

diff --git a/tests/bugs150/PR106461.aj b/tests/bugs150/PR106461.aj
new file mode 100644
index 000000000..5edc14064
--- /dev/null
+++ b/tests/bugs150/PR106461.aj
@@ -0,0 +1,18 @@
+public aspect PR106461 {
+	
+	pointcut missingNamePattern() : call(* Foo+(..));
+	
+	pointcut missingNamePatternInField() : get(* Foo+);
+	
+	pointcut missingNamePatternInConstructor() : call(Foo+(..));
+	
+	pointcut butThisIsAllowedOfCourse() : call(* *(..));
+	
+	pointcut asIsThis() : call(* foo(..));
+}
+
+class Foo {
+	
+	void foo() {}
+	
+}
\ No newline at end of file
diff --git a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
index 40803152b..8ecef9a1d 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -192,6 +192,8 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
   
   public void testSyntaxErrorNPE_pr103266() {runTest("NPE on syntax error");}
   
+  public void testMissingNamePattern_pr106461() { runTest("missing name pattern"); }
+  
   // helper methods.....
   
   public SyntheticRepository createRepos(File cpentry) {
diff --git a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
index c2faab4f6..ef77a0528 100644
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -173,6 +173,14 @@
     <ajc-test dir="bugs150" title="bad asm for enums" vm="1.5">
         <compile files="Rainbow.java" options="-emacssym,-1.5"/>
     </ajc-test>
+    
+    <ajc-test dir="bugs150" title="missing name pattern">
+        <compile files="PR106461.aj">
+            <message kind="error" line="3" text="Syntax error on token &quot;(&quot;, &quot;name pattern&quot; expected"/>
+            <message kind="error" line="5" text="Syntax error on token &quot;)&quot;, &quot;name pattern&quot; expected"/>
+            <message kind="error" line="7" text="Syntax error on token &quot;.&quot;, &quot;name pattern&quot; expected"/>
+        </compile>
+    </ajc-test>
         
     <ajc-test dir="../docs/dist/doc/examples/introduction" title="introduction sample" vm="1.5">
         <compile files="CloneablePoint.java,ComparablePoint.java,HashablePoint.java,Point.java" options="-1.5"/>
diff --git a/weaver/src/org/aspectj/weaver/patterns/PatternParser.java b/weaver/src/org/aspectj/weaver/patterns/PatternParser.java
index 69d59cdae..76060b1b6 100644
--- a/weaver/src/org/aspectj/weaver/patterns/PatternParser.java
+++ b/weaver/src/org/aspectj/weaver/patterns/PatternParser.java
@@ -1111,6 +1111,7 @@ public class PatternParser {
 		    name = parseNamePattern();
 	    } else {
 	    	name = tryToExtractName(declaringType);
+	    	if (name == null) throw new ParserException("name pattern",tokenSource.peek());
 	    	if (declaringType.toString().equals("")) {
 	    		declaringType = TypePattern.ANY;
 	    	}
diff --git a/weaver/src/org/aspectj/weaver/patterns/WildTypePattern.java b/weaver/src/org/aspectj/weaver/patterns/WildTypePattern.java
index e2f99c0fa..493d82fcc 100644
--- a/weaver/src/org/aspectj/weaver/patterns/WildTypePattern.java
+++ b/weaver/src/org/aspectj/weaver/patterns/WildTypePattern.java
@@ -455,6 +455,11 @@ public class WildTypePattern extends TypePattern {
 	}
 
 	public NamePattern extractName() {
+		if (isIncludeSubtypes() || isVarArgs() || isArray()) {
+			// we can't extract a name, the pattern is something like Foo+ and therefore
+			// it is not ok to treat Foo as a method name!
+			return null;
+		}
 		//System.err.println("extract from : " + Arrays.asList(namePatterns));
 		int len = namePatterns.length;
 		NamePattern ret = namePatterns[len-1];
-- 
2.39.5