renamed "declare dominates" to "declare precedence"

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
index 26b4be2a00f68e80ea27cf4b97b517dbb7a6d34f..c6a4a3b5805a0e3548ac6145ef158cb5f7168ac8 100644 (file)
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AspectDeclaration.java
@@ -76,7 +76,7 @@ public class AspectDeclaration extends MemberTypeDeclaration {
                if (dominatesPattern != null) {
                        scope.problemReporter().signalError(
                                        dominatesPattern.getStart(), dominatesPattern.getEnd(), 
-                                       "dominates has changed for 1.1, use 'declare dominates: " +
+                                       "dominates has changed for 1.1, use 'declare precedence: " +
                                        new String(this.name) + ", " + dominatesPattern.toString() + ";' " +
                                        "in the body of the aspect instead");
                }

diff --git a/org.aspectj.ajdt.core/testdata/src1/UnimplementedSyntax.java b/org.aspectj.ajdt.core/testdata/src1/UnimplementedSyntax.java
index 3ea1a16857e2ba55ac4da6514cbfe95366f94419..de99c1905aef1e13c525e920601bbaf64b73d2f3 100644 (file)
--- a/org.aspectj.ajdt.core/testdata/src1/UnimplementedSyntax.java
+++ b/org.aspectj.ajdt.core/testdata/src1/UnimplementedSyntax.java
@@ -18,6 +18,8 @@ aspect C {
        pointcut p(): handler(Foo);
        
        pointcut p2(): initialization(Object.new(..));
+       
+       declare dominates: A, B;
 }
 
 aspect D a b c {}
\ No newline at end of file

diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BasicCommandTestCase.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BasicCommandTestCase.java
index 2ee04a21d8d2e9308cd0a6b6fc58ca1d97ab1798..22e8a64120d2342b60852c68aa6c18b1d42e2652 100644 (file)
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BasicCommandTestCase.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/BasicCommandTestCase.java
@@ -82,7 +82,7 @@ public class BasicCommandTestCase extends CommandTestCase {
        
        public void testUnimplementedSyntax() {
                checkCompile("src1/UnimplementedSyntax.java", 
-                       new int[] {5, 15, 16, 23});
+                       new int[] {5, 15, 16, 22, 25});
        }
        public void testXlintWarn() {
                checkCompile("src1/Xlint.java", NO_ERRORS);

diff --git a/tests/base/test117/Driver.java b/tests/base/test117/Driver.java
index 9abfb1789aa2e477e4b74bc15620e4c8d961f4ea..c8cf1a2b32f6133d41542848cc5ca634d75621a9 100644 (file)
--- a/tests/base/test117/Driver.java
+++ b/tests/base/test117/Driver.java
@@ -111,7 +111,7 @@ aspect A1 {
 }
 
 aspect A2 {
-       declare dominates: A2, A1;
+       declare precedence: A2, A1;
        
     int around() : set(int C1.f) && within(A1) {
        return C1.f = 3;

diff --git a/tests/errors/CircularDominates.java b/tests/errors/CircularDominates.java
index 3db4b691ebdb7d973667ef77898d80ac3af60bda..107135829482b05e6cb36c02955904ec5b100c09 100644 (file)
--- a/tests/errors/CircularDominates.java
+++ b/tests/errors/CircularDominates.java
@@ -6,17 +6,17 @@ class C {
     }
 }
 
-aspect A1 { declare dominates: A1, A2;
+aspect A1 { declare precedence: A1, A2;
     pointcut cut(): target(C) && execution(void a());
 
     before(): A1.cut() { T.add("A1"); }
 }
 
-aspect A2 { declare dominates: A2, A3;
+aspect A2 { declare precedence: A2, A3;
     before(): A1.cut() { T.add("A2"); }
 }
 
-aspect A3 { declare dominates: A3, A1;
+aspect A3 { declare precedence: A3, A1;
     before(): A1.cut() { T.add("A3"); }
 }
 

diff --git a/tests/new/AdviceOrdering.java b/tests/new/AdviceOrdering.java
index a67dc57c623271ee08ac997e978656c96957c77e..a5f4103c6f880aeb27894df6afff5476e9801b4f 100644 (file)
--- a/tests/new/AdviceOrdering.java
+++ b/tests/new/AdviceOrdering.java
@@ -84,21 +84,21 @@ aspect FlowCheck {
 
 // This cluster of aspects checks that the partial order rules work
 //aspect A1 dominates A2, B1 {
-aspect A1 { declare dominates: A1, A2 || B1;
+aspect A1 { declare precedence: A1, A2 || B1;
     pointcut cut() : target(C) && call(void a());
 
     before(): A1.cut() { T.add("A1"); }
 }
 
-aspect A2 { declare dominates: A2, B1;
+aspect A2 { declare precedence: A2, B1;
     before(): A1.cut() { T.add("A2"); }
 }
 
-aspect A3 { declare dominates: A3,  A4, A1;
+aspect A3 { declare precedence: A3,  A4, A1;
     before(): A1.cut() { T.add("A3"); }
 }
 
-aspect A4 { declare dominates: A4, A1;
+aspect A4 { declare precedence: A4, A1;
     before(): A1.cut() { T.add("A4"); }
 }
 
@@ -109,17 +109,17 @@ aspect B1 {
 
 
 //aspect C1 dominates C2, C3 {
-aspect C1 { declare dominates: C1, C2 || C3;
+aspect C1 { declare precedence: C1, C2 || C3;
     before(): A1.cut() { T.add("C1"); }
 }
-aspect C2 { declare dominates: C2, C3;
+aspect C2 { declare precedence: C2, C3;
     before(): A1.cut() { T.add("C2"); }
 }
-aspect C3 { declare dominates: C3, C4;
+aspect C3 { declare precedence: C3, C4;
     before(): A1.cut() { T.add("C3"); }
 }
 //aspect C4 dominates A1, A2, A3, A4, B1 {
-aspect C4 { declare dominates: C4, (A1 || A2 || A3 || A4 || B1);
+aspect C4 { declare precedence: C4, (A1 || A2 || A3 || A4 || B1);
     before(): A1.cut() { T.add("C4"); }
 }
 

diff --git a/tests/new/Counting1.java b/tests/new/Counting1.java
index 6027409e23eb20f3a2c753b61f069be193d74b9b..62cb325285f88763b3b102858f1bb6d5beec4463 100644 (file)
--- a/tests/new/Counting1.java
+++ b/tests/new/Counting1.java
@@ -142,7 +142,7 @@ aspect MoveTracking {
    }
  }
 
-aspect Mobility { declare dominates: Mobility, MoveTracking;
+aspect Mobility { declare precedence: Mobility, MoveTracking;
        
     private static boolean enableMoves = true;
     

diff --git a/tests/new/DeclarationCollisionCE.java b/tests/new/DeclarationCollisionCE.java
index b9c8d744559ff9998746cf601b030cb39960398a..452eb377c79599167131a6c20db5eba0a7133689 100644 (file)
--- a/tests/new/DeclarationCollisionCE.java
+++ b/tests/new/DeclarationCollisionCE.java
@@ -10,7 +10,7 @@ public class DeclarationCollisionCE {
 class C {}
 
 // bug: dominates clause prevents collision error
-abstract aspect AA { declare dominates: AA, B; 
+abstract aspect AA { declare precedence: AA, B; 
     // same result if this line is uncommented
     //public String C.title() { return "[AA] C.title()"; }
 }

diff --git a/tests/new/DominatesTypePattern.java b/tests/new/DominatesTypePattern.java
index 1409241fb234f1ac38ec43e34bde16fce107cbfe..9edc5d5ea9df1e7e410dd59493de1b4e17afa040 100644 (file)
--- a/tests/new/DominatesTypePattern.java
+++ b/tests/new/DominatesTypePattern.java
@@ -12,7 +12,7 @@ public class DominatesTypePattern {
 class C {}
 
 // works if A is specified explicitly
-abstract aspect AA { declare dominates: AA, (AA+ && !AA); // error: should dominate A
+abstract aspect AA { declare precedence: AA, (AA+ && !AA); // error: should dominate A
     public String C.method() { return "pass"; }
 }
 

diff --git a/tests/new/DominatesTypePatternCE.java b/tests/new/DominatesTypePatternCE.java
index a9787394dedd7a9671525c98088935a03f38fba2..962a9ed045d5465eb9fee3251c0ce986c3ee40ca 100644 (file)
--- a/tests/new/DominatesTypePatternCE.java
+++ b/tests/new/DominatesTypePatternCE.java
@@ -12,7 +12,7 @@ public class DominatesTypePatternCE {
 class C {}
 
 // works if A is specified explicitly
-abstract aspect AA { declare dominates: AA, AA+; // CE, AA is matched by both pieces
+abstract aspect AA { declare precedence: AA, AA+; // CE, AA is matched by both pieces
     public String C.method() { return "pass"; }
 }
 

diff --git a/tests/new/MultiDispatchCp.java b/tests/new/MultiDispatchCp.java
index a373bab5563eb90d343d3e1dc8cb03b5a077d493..fa733060125997b08fec630f41ef9904a718a630 100644 (file)
--- a/tests/new/MultiDispatchCp.java
+++ b/tests/new/MultiDispatchCp.java
@@ -68,7 +68,7 @@ aspect MultiCall extends Multi {
 
 // dominates should have no effect as call join points
 // always come before executions
-aspect MultiExec extends Multi { declare dominates: MultiExec, MultiCall;
+aspect MultiExec extends Multi { declare precedence: MultiExec, MultiCall;
     public static boolean enabled = false;
 
     String getPrefix() { return "exec"; }

diff --git a/weaver/src/org/aspectj/weaver/patterns/DeclareDominates.java b/weaver/src/org/aspectj/weaver/patterns/DeclareDominates.java
index 1d354f0cc9e14eb2373e1c411fd0c88da88115df..b5c9f563f39b678b4b9cf20c05f8005ee3f79496 100644 (file)
--- a/weaver/src/org/aspectj/weaver/patterns/DeclareDominates.java
+++ b/weaver/src/org/aspectj/weaver/patterns/DeclareDominates.java
@@ -34,7 +34,7 @@ public class DeclareDominates extends Declare {
        
        public String toString() {
                StringBuffer buf = new StringBuffer();
-               buf.append("declare dominates: ");
+               buf.append("declare precedence: ");
                buf.append(patterns);
                buf.append(";");
                return buf.toString();

diff --git a/weaver/src/org/aspectj/weaver/patterns/PatternParser.java b/weaver/src/org/aspectj/weaver/patterns/PatternParser.java
index f29cced688d34cecafe1b12f6d6ea7ae5653b0ae..315272981b8b63827b797d8c7fdfdd839aa95168 100644 (file)
--- a/weaver/src/org/aspectj/weaver/patterns/PatternParser.java
+++ b/weaver/src/org/aspectj/weaver/patterns/PatternParser.java
@@ -92,8 +92,10 @@ public class PatternParser {
                        ret = parseErrorOrWarning(true);
                } else if (kind.equals("warning")) {
                        ret = parseErrorOrWarning(false);
-               } else if (kind.equals("dominates")) {
+               } else if (kind.equals("precedence")) {
                        ret = parseDominates();
+               } else if (kind.equals("dominates")) {
+                       throw new ParserException("name changed to declare precedence", tokenSource.peek(-2));
                } else if (kind.equals("parents")) {
                        ret = parseParents();
                } else if (kind.equals("soft")) {

diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/WeaveOrderTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/WeaveOrderTestCase.java
index bfa222ed61ce61fc32d4222f37d884508e558a51..270faf6fc9b8377f8a1329e8f1b32aeec3f5c3cd 100644 (file)
--- a/weaver/testsrc/org/aspectj/weaver/bcel/WeaveOrderTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/WeaveOrderTestCase.java
@@ -83,7 +83,7 @@ public class WeaveOrderTestCase extends WeaveTestCase {
 
        public void testDominates() {
                Declare dom =
-                       new PatternParser("declare dominates: java.lang.String, java.lang.Throwable").parseDeclare();
+                       new PatternParser("declare precedence: java.lang.String, java.lang.Throwable").parseDeclare();
                //??? concretize dom
                ResolvedTypeX aType =  world.resolve("Aspect");
                CrosscuttingMembers xcut = new CrosscuttingMembers(aType);
@@ -111,7 +111,7 @@ public class WeaveOrderTestCase extends WeaveTestCase {
        
        public void testDominatesHarder() {
                Declare dom =
-                       new PatternParser("declare dominates: *, java.lang.String, java.lang.Throwable").parseDeclare();
+                       new PatternParser("declare precedence: *, java.lang.String, java.lang.Throwable").parseDeclare();
                //??? concretize dom
                ResolvedTypeX aType =  world.resolve("Aspect");
                CrosscuttingMembers xcut = new CrosscuttingMembers(aType);