diff options
| author | jhugunin <jhugunin> | 2003-01-14 17:33:36 +0000 |
|---|---|---|
| committer | jhugunin <jhugunin> | 2003-01-14 17:33:36 +0000 |
| commit | a5fb21459045ea1ed295c21836672eecf2ca0242 (patch) | |
| tree | af4f1b261483237ff2d2484e7245a8dc41048d0f /weaver | |
| parent | 08c86843265088699f88a4fedc4c78c5d7081d6a (diff) | |
| download | aspectj-a5fb21459045ea1ed295c21836672eecf2ca0242.tar.gz aspectj-a5fb21459045ea1ed295c21836672eecf2ca0242.zip | |
renamed "declare dominates" to "declare precedence"
Diffstat (limited to 'weaver')
3 files changed, 6 insertions, 4 deletions
diff --git a/weaver/src/org/aspectj/weaver/patterns/DeclareDominates.java b/weaver/src/org/aspectj/weaver/patterns/DeclareDominates.java index 1d354f0cc..b5c9f563f 100644 --- 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 f29cced68..315272981 100644 --- 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 bfa222ed6..270faf6fc 100644 --- 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); |