fix for pr108377, Verify error on unqualified reference to itd field inside itd method.

diff --git a/bcel-builder/.settings/org.eclipse.jdt.core.prefs b/bcel-builder/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..588492b
--- /dev/null
+++ b/bcel-builder/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Wed Aug 24 14:55:56 BST 2005
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.1
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.3
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=ignore
+org.eclipse.jdt.core.compiler.source=1.3

diff --git a/bcel-builder/.settings/org.eclipse.jdt.ui.prefs b/bcel-builder/.settings/org.eclipse.jdt.ui.prefs
new file mode 100644 (file)
index 0000000..968f6ad
--- /dev/null
+++ b/bcel-builder/.settings/org.eclipse.jdt.ui.prefs
@@ -0,0 +1,3 @@
+#Wed Aug 24 14:55:56 BST 2005
+eclipse.preferences.version=1
+internal.default.compliance=default

diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip
index 0a7be57fb366027aa6fa91678d19e989707b29fc..3d864d4e4ad694d7440fe9ccdf3eaba57a9dcfa4 100644 (file)
Binary files a/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip and b/org.eclipse.jdt.core/jdtcore-for-aspectj-src.zip differ

diff --git a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar
index 5de8a2a98c1e641eac75b848f96fbd17f2e20dfe..fae73efbe49bfc2ac462684ad48a3fed7b265754 100644 (file)
Binary files a/org.eclipse.jdt.core/jdtcore-for-aspectj.jar and b/org.eclipse.jdt.core/jdtcore-for-aspectj.jar differ

diff --git a/tests/bugs150/pr108377.aj b/tests/bugs150/pr108377.aj
new file mode 100644 (file)
index 0000000..041d361
--- /dev/null
+++ b/tests/bugs150/pr108377.aj
@@ -0,0 +1,15 @@
+public class pr108377 {
+    public static void main(String[] args) {
+       System.out.println(new pr108377().foo());
+    }
+}
+
+aspect Aspect1 {
+    public pr108377 pr108377.a;
+    public String pr108377.value;
+
+    public String pr108377.foo() {
+       if (a == null) a = this;
+       return a.value;
+    }
+}
\ 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 5d1ff7d8cad409c4a6038d8114528948f2922272..4413b9a267f6168850168a29bbee71b3ad52cae3 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
+++ b/tests/src/org/aspectj/systemtest/ajc150/Ajc150Tests.java
@@ -306,6 +306,10 @@ public class Ajc150Tests extends org.aspectj.testing.XMLBasedAjcTestCase {
          runTest("varargs with type variable");
   }
   
+  public void testFieldAccessInsideITDM() {
+         runTest("itd field access inside itd method");
+  }
+  
   // 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 a75e46b07a0be3697f986079300928dd9a87571b..0a4929d11bd8c69607725e9d1343e24b9753f853 100644 (file)
--- a/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
+++ b/tests/src/org/aspectj/systemtest/ajc150/ajc150.xml
@@ -358,6 +358,14 @@
         </compile>
     </ajc-test>
     
+    <ajc-test dir="bugs150" pr="108377" title="itd field access inside itd method">
+        <compile files="pr108377.aj"/>
+        <run class="pr108377"/>
+    </ajc-test>
+    
+    <!-- ============================================================================ -->
+    <!-- ============================================================================ -->
+    
     <!-- atOverride tests with ITDs -->
     
     <ajc-test dir="java5/generics/itds" pr="106630" title="atOverride used with ITDs">