From 3a996832d394faf409bbca5bef7846256bb3592d Mon Sep 17 00:00:00 2001
From: aclement <aclement>
Date: Sat, 29 Nov 2008 20:46:47 +0000
Subject: [PATCH] 255555: pattern parser allowing for parentheses around
 declare anno signatures; cope with weaving broken code.

---
 .../pr255555/base/src/test/Demo.aj                | 15 +++++++++++++++
 .../pr255555/base/src/test/MyAspect.aj            | 12 ++++++++++++
 .../tools/MultiProjectIncrementalTests.java       |  7 +++++++
 3 files changed, 34 insertions(+)
 create mode 100644 tests/multiIncremental/pr255555/base/src/test/Demo.aj
 create mode 100644 tests/multiIncremental/pr255555/base/src/test/MyAspect.aj

diff --git a/tests/multiIncremental/pr255555/base/src/test/Demo.aj b/tests/multiIncremental/pr255555/base/src/test/Demo.aj
new file mode 100644
index 000000000..1f23a21d8
--- /dev/null
+++ b/tests/multiIncremental/pr255555/base/src/test/Demo.aj
@@ -0,0 +1,15 @@
+package test;
+
+import java.util.List;
+
+public class Demo {
+
+/*
+    void g() {
+        new Demo(7).foo(null);
+        x++;
+        this.x++;
+    }
+*/
+
+}
diff --git a/tests/multiIncremental/pr255555/base/src/test/MyAspect.aj b/tests/multiIncremental/pr255555/base/src/test/MyAspect.aj
new file mode 100644
index 000000000..970be41e5
--- /dev/null
+++ b/tests/multiIncremental/pr255555/base/src/test/MyAspect.aj
@@ -0,0 +1,12 @@
+package test;
+import java.util.List;
+
+public privileged aspect MyAspect {
+	void Demo.foo(java.util.List<String> x) { }
+        declare @method: (void Demo.foo(..): @Deprecated;
+	declare @type: Demo: @Deprecated;
+	
+        //declare @field: (int Demo.x): @Deprecated;
+        //declare @constructor: (public Demo.new(int)): @Deprecated;
+
+}
diff --git a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
index 293bfe9ec..6e7ef3dca 100644
--- a/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
+++ b/tests/src/org/aspectj/systemtest/incremental/tools/MultiProjectIncrementalTests.java
@@ -183,6 +183,13 @@ public class MultiProjectIncrementalTests extends AbstractMultiProjectIncrementa
 		assertEquals("=BrokenHandles<p{GetInfo.java}GetInfo`declare parents!3", ipe.getHandleIdentifier());
 	}
 
+	public void testAnnotations_pr255555() {
+		String p = "pr255555";
+		initialiseProject(p);
+		build(p);
+		checkCompileWeaveCount(p, 2, 1);
+	}
+
 	public void testSpacewarHandles() {
 		// String p = "SpaceWar";
 		String p = "Simpler";
-- 
2.39.5