diff options
Diffstat (limited to 'weaver')
6 files changed, 15 insertions, 4 deletions
diff --git a/weaver/src/org/aspectj/weaver/NameMangler.java b/weaver/src/org/aspectj/weaver/NameMangler.java index 1888faef8..0ff633952 100644 --- a/weaver/src/org/aspectj/weaver/NameMangler.java +++ b/weaver/src/org/aspectj/weaver/NameMangler.java @@ -22,7 +22,7 @@ public class NameMangler { } public static final String PREFIX = "ajc$"; - + public static final String ITD_PREFIX = PREFIX + "interType$"; public static final String CFLOW_STACK_TYPE = "org.aspectj.runtime.internal.CFlowStack"; public static final String CFLOW_COUNTER_TYPE="org.aspectj.runtime.internal.CFlowCounter"; diff --git a/weaver/src/org/aspectj/weaver/patterns/Declare.java b/weaver/src/org/aspectj/weaver/patterns/Declare.java index 76b1dd686..a387c6fc1 100644 --- a/weaver/src/org/aspectj/weaver/patterns/Declare.java +++ b/weaver/src/org/aspectj/weaver/patterns/Declare.java @@ -63,7 +63,5 @@ public abstract class Declare extends PatternNode { * this 'getNameSuffix()' method - depending on whether, at weave time, we * want to easily differentiate between the declare methods. */ - public String getNameSuffix() { - return ""; - } + public abstract String getNameSuffix(); } diff --git a/weaver/src/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java b/weaver/src/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java index 33321dd73..a3bebe50c 100644 --- a/weaver/src/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java +++ b/weaver/src/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java @@ -98,4 +98,7 @@ public class DeclareErrorOrWarning extends Declare { return true; } + public String getNameSuffix() { + return "eow"; + } } diff --git a/weaver/src/org/aspectj/weaver/patterns/DeclareParents.java b/weaver/src/org/aspectj/weaver/patterns/DeclareParents.java index a6bbe0af1..3607afe7d 100644 --- a/weaver/src/org/aspectj/weaver/patterns/DeclareParents.java +++ b/weaver/src/org/aspectj/weaver/patterns/DeclareParents.java @@ -245,4 +245,7 @@ public class DeclareParents extends Declare { return ret; } + public String getNameSuffix() { + return "parents"; + } } diff --git a/weaver/src/org/aspectj/weaver/patterns/DeclarePrecedence.java b/weaver/src/org/aspectj/weaver/patterns/DeclarePrecedence.java index 02f59df48..0bc548c8c 100644 --- a/weaver/src/org/aspectj/weaver/patterns/DeclarePrecedence.java +++ b/weaver/src/org/aspectj/weaver/patterns/DeclarePrecedence.java @@ -148,4 +148,7 @@ public class DeclarePrecedence extends Declare { return false; } + public String getNameSuffix() { + return "precedence"; + } } diff --git a/weaver/src/org/aspectj/weaver/patterns/DeclareSoft.java b/weaver/src/org/aspectj/weaver/patterns/DeclareSoft.java index 74e27e2f1..a7bb8fade 100644 --- a/weaver/src/org/aspectj/weaver/patterns/DeclareSoft.java +++ b/weaver/src/org/aspectj/weaver/patterns/DeclareSoft.java @@ -109,4 +109,8 @@ public class DeclareSoft extends Declare { public boolean isAdviceLike() { return true; } + + public String getNameSuffix() { + return "soft"; + } } |