declare precedencetags/V_1_1_b5
@@ -93,7 +93,7 @@ public class CrosscuttingMembers { | |||
if (declare instanceof DeclareErrorOrWarning) { | |||
ShadowMunger m = new Checker((DeclareErrorOrWarning)declare); | |||
addShadowMunger(m); | |||
} else if (declare instanceof DeclareDominates) { | |||
} else if (declare instanceof DeclarePrecedence) { | |||
declareDominates.add(declare); | |||
} else if (declare instanceof DeclareParents) { | |||
DeclareParents dp = (DeclareParents)declare; |
@@ -278,7 +278,7 @@ public abstract class World { | |||
//??? This method can be called a large number of times. | |||
int order = 0; | |||
for (Iterator i = crosscuttingMembersSet.getDeclareDominates().iterator(); i.hasNext(); ) { | |||
DeclareDominates d = (DeclareDominates)i.next(); | |||
DeclarePrecedence d = (DeclarePrecedence)i.next(); | |||
int thisOrder = d.compare(aspect1, aspect2); | |||
//System.out.println("comparing: " + thisOrder + ": " + d); | |||
if (thisOrder != 0) { |
@@ -29,7 +29,7 @@ public abstract class Declare extends PatternNode { | |||
case ERROR_OR_WARNING: | |||
return DeclareErrorOrWarning.read(s, context); | |||
case DOMINATES: | |||
return DeclareDominates.read(s, context); | |||
return DeclarePrecedence.read(s, context); | |||
case PARENTS: | |||
return DeclareParents.read(s, context); | |||
case SOFT: |
@@ -20,15 +20,15 @@ import org.aspectj.bridge.IMessage; | |||
import org.aspectj.weaver.*; | |||
import org.aspectj.weaver.ResolvedTypeX; | |||
public class DeclareDominates extends Declare { | |||
public class DeclarePrecedence extends Declare { | |||
private TypePatternList patterns; | |||
public DeclareDominates(List patterns) { | |||
public DeclarePrecedence(List patterns) { | |||
this(new TypePatternList(patterns)); | |||
} | |||
private DeclareDominates(TypePatternList patterns) { | |||
private DeclarePrecedence(TypePatternList patterns) { | |||
this.patterns = patterns; | |||
} | |||
@@ -41,8 +41,8 @@ public class DeclareDominates extends Declare { | |||
} | |||
public boolean equals(Object other) { | |||
if (!(other instanceof DeclareDominates)) return false; | |||
DeclareDominates o = (DeclareDominates)other; | |||
if (!(other instanceof DeclarePrecedence)) return false; | |||
DeclarePrecedence o = (DeclarePrecedence)other; | |||
return o.patterns.equals(patterns); | |||
} | |||
@@ -58,7 +58,7 @@ public class DeclareDominates extends Declare { | |||
} | |||
public static Declare read(DataInputStream s, ISourceContext context) throws IOException { | |||
Declare ret = new DeclareDominates(TypePatternList.read(s, context)); | |||
Declare ret = new DeclarePrecedence(TypePatternList.read(s, context)); | |||
ret.readLocation(context, s); | |||
return ret; | |||
} |
@@ -109,13 +109,13 @@ public class PatternParser { | |||
return ret; | |||
} | |||
public DeclareDominates parseDominates() { | |||
public DeclarePrecedence parseDominates() { | |||
List l = new ArrayList(); | |||
do { | |||
l.add(parseTypePattern()); | |||
} while (maybeEat(",")); | |||
return new DeclareDominates(l); | |||
return new DeclarePrecedence(l); | |||
} | |||
private Declare parseParents() { |
@@ -19,7 +19,7 @@ import java.io.*; | |||
import org.apache.bcel.Constants; | |||
import org.apache.bcel.generic.*; | |||
import org.aspectj.weaver.patterns.*; | |||
import org.aspectj.weaver.patterns.DeclareDominates; | |||
import org.aspectj.weaver.patterns.DeclarePrecedence; | |||
import org.aspectj.weaver.*; | |||
/**. |