From: acolyer <acolyer>
Date: Fri, 2 Dec 2005 07:00:52 +0000 (+0000)
Subject: updates to name processing to take into account nesting on $ conversions
X-Git-Tag: V1_5_0RC1~68
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5d7f95e4ce1074a11e0674ade94fe96807624165;p=aspectj.git

updates to name processing to take into account nesting on $ conversions
---

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java
index 00c6ed69b..50ded3bd6 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/AstUtil.java
@@ -240,7 +240,7 @@ public class AstUtil {
 		return (long)end | ((long)start << 32);
 	}
 	public static char[][] getCompoundName(String string) {
-		return WildTypePattern.splitNames(string);
+		return WildTypePattern.splitNames(string,true);
 	}
 
 	public static TypeBinding[] insert(
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java
index bc7efca5b..494a714a2 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseScope.java
@@ -61,7 +61,7 @@ public class EclipseScope implements IScope {
 	
 	
 	public UnresolvedType lookupType(String name, IHasPosition location) {
-		char[][] splitName = WildTypePattern.splitNames(name);
+		char[][] splitName = WildTypePattern.splitNames(name,true);
 		TypeBinding b = scope.getType(splitName,splitName.length);
 		//FIXME ??? need reasonable error handling...
 		if (!b.isValidBinding()) {
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java
index 91eff5bd1..2785778e5 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseSourceType.java
@@ -111,6 +111,10 @@ public class EclipseSourceType extends AbstractReferenceTypeDelegate {
 	public boolean isAnonymous() {
 		return ((declaration.modifiers & ASTNode.AnonymousAndLocalMask) != 0);
 	}
+	
+	public boolean isNested() {
+		return ((declaration.modifiers & ASTNode.IsMemberTypeMASK) != 0);
+	}
 
     public boolean isAnnotationStyleAspect() {
         if (declaration.annotations == null) {