Merge pull request #148 from moosetechnology/issue/146

fix issue #146

Author: NicolasAnquetil

app/src/main/java/fr/inria/verveine/extractor/java/EntityDictionary.java

@@ -560,20 +560,24 @@ public void ensureImplementedInterfaces(ITypeBinding bnd, TType fmx, TWithTypes
 	 * @return the FamixReference
 	 */
 	public Reference addFamixReference(Method src, TType tgt, TAssociation prev, ITypeBinding referredTypeBnd) {
+		Reference ref;
+		
 		if ( (src == null) || (tgt == null) ) {
 			return null;
 		}
 
 		if (prev == null) {
-			for (TReference ref : src.getOutgoingReferences()) {
-				if (ref.getReferredEntity() == tgt) {
-					return (Reference) ref;
+			for (TReference existingRef : src.getOutgoingReferences()) {
+				if (existingRef.getReferredEntity() == tgt) {
+					return (Reference) existingRef;
 				}
 			}
 		}
 
-		Reference ref;
-		if (referredTypeBnd != null && referredTypeBnd.isParameterizedType()) { // Needs checks and tests.
+		/* issue <href="https://github.com/moosetechnology/VerveineJ/issues/146">146</href> an expression like <code>char[].class</code> is a <code>Class</code>
+		 * gives referredTypeBnd.isParameterizedType() == true.
+		 * We test <code>tgt instanceof PrimitiveType</code> to avoid this case */
+		if (referredTypeBnd != null && referredTypeBnd.isParameterizedType() && ! (tgt instanceof PrimitiveType)) { // Needs checks and tests.
 			ref = (ParametricReference)buildFamixParametricAssociation(new ParametricReference(), referredTypeBnd.getErasure().getTypeParameters(), referredTypeBnd.getTypeArguments());
 		} else {
 			ref = new Reference();

app/src/test/java/fr/inria/verveine/extractor/java/VerveineJTest_AdHoc.java

@@ -80,6 +80,16 @@ public void testSeveralFieldsOneInit() {
 	}
 
 
+	@Test
+	public void testCharTypeReference() {
+		parse(new String[] {"src/test/resources/ad_hoc/CharTypeReference.java"});
+
+		assertEquals(1, entitiesOfType(Reference.class).size());
+		Reference ref = firstElt(entitiesOfType(Reference.class));
+		assertEquals("char", ((TNamedEntity) ref.getReferredEntity()).getName());
+	}
+
+
 	@Test
 	public void testJunit5Bug1() {
 		File generatedMSE = new File(DEFAULT_OUTPUT_FILE);

app/src/test/resources/ad_hoc/CharTypeReference.java

@@ -0,0 +1,8 @@
+package ad_hoc;
+
+public class CharTypeReference {
+
+    public static void main(String[] args) {
+        Class<?> c = char[].class;
+    }
+}