added tests and fixes

fixed two bugs in ajcTestsFailing

2 files changed, 12 insertions, 1 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java
index 583edca78..ef833b13e 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/ast/InterTypeFieldDeclaration.java
@@ -67,6 +67,14 @@ public class InterTypeFieldDeclaration extends InterTypeDeclaration {
 		EclipseFactory world = EclipseFactory.fromScopeLookupEnvironment(upperScope);
 		ResolvedMember sig = munger.getSignature();
 		TypeX aspectType = EclipseFactory.fromBinding(upperScope.referenceContext.binding);
+		
+		if (sig.getReturnType() == ResolvedTypeX.VOID || 
+				(sig.getReturnType().isArray() && (sig.getReturnType().getComponentType() == ResolvedTypeX.VOID)))
+		{
+			upperScope.problemReporter().signalError(sourceStart, sourceEnd,
+				"field type can not be void");
+		}
+		
 //
 //		System.err.println("sig: " + sig);
 //		System.err.println("field: " + world.makeFieldBinding(
@@ -129,6 +137,8 @@ public class InterTypeFieldDeclaration extends InterTypeDeclaration {
 		EclipseFactory world = EclipseFactory.fromScopeLookupEnvironment(classScope);
 		resolveOnType(classScope);
 		
+		if (classScope.referenceContext.binding == null) return null;
+		
 		binding = classScope.referenceContext.binding.resolveTypesFor(binding);
 		if (ignoreFurtherInvestigation) return null;
 		
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
index d1744dafb..68c875bfc 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/lookup/EclipseFactory.java
@@ -108,13 +108,14 @@ public class EclipseFactory {
 		if (binding instanceof HelperInterfaceBinding) {
 			return ((HelperInterfaceBinding) binding).getTypeX();
 		}
-		if (binding.qualifiedSourceName() == null) {
+		if (binding == null || binding.qualifiedSourceName() == null) {
 			return ResolvedTypeX.MISSING;
 		}
 		return TypeX.forName(getName(binding));
 	}
 
 	public static TypeX[] fromBindings(TypeBinding[] bindings) {
+		if (bindings == null) return TypeX.NONE;
 		int len = bindings.length;
 		TypeX[] ret = new TypeX[len];
 		for (int i=0; i<len; i++) {