Merge pull request #158 from moosetechnology/issue/124

fix #124

Author: NicolasAnquetil

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

@@ -103,6 +103,11 @@ public class EntityDictionary {
 	 */
 	public static final String CONSTRUCTOR_KIND_MARKER = "constructor";
 
+	/** name of the entity representing the "unknown" type 'var'
+	 * The entity is intended to be uniq, see {@link #ensureFamixUniqEntity(Class, IBinding, String)}
+	 */
+	public static final String IMPLICIT_VAR_TYPE_NAME = "<ImplicitVarType>";
+
 	/**
 	 * The FAMIX repository where all FAMIX entities are created and stored
 	 */

app/src/main/java/fr/inria/verveine/extractor/java/visitors/refvisitors/AbstractRefVisitor.java

@@ -126,6 +126,8 @@ protected TType referredType(ITypeBinding bnd, TNamedEntity ctxt, boolean isClas
 			} else {
 				fmxTyp = (ParametricClass) dico.ensureFamixClass(parameterizableBnd, name, /*owner*/null, /*isGeneric*/true, modifiers);
 			}
+		} else if ( (name != null) && name.equals("var") ) {
+			fmxTyp = dico.ensureFamixUniqEntity(org.moosetechnology.model.famix.famixjavaentities.Type.class, /*binding*/null, EntityDictionary.IMPLICIT_VAR_TYPE_NAME);	
 		} else {
 			fmxTyp = dico.ensureFamixType(bnd, name, /*owner*/null, (TWithTypes) ctxt, bnd.getModifiers());
 		}

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

@@ -363,12 +363,27 @@ public void testClassVar() {
 		assertTrue("ensureFamixEntity does not access <someClass>.class", classFieldFound);
 	}
 
+	@Test
+	public void testImplicitVarType() {
+		parse(new String[]{"src/test/resources/ad_hoc/Bla.java"});
+
+		Type varType = detectFamixElement(Type.class, EntityDictionary.IMPLICIT_VAR_TYPE_NAME);
+		assertNotNull(varType);
+
+		Collection<TEntityTyping> incomingTypings = varType.getIncomingTypings();
+		assertEquals(1, incomingTypings.size());
+
+		assertEquals("str", ((TNamedEntity)firstElt(incomingTypings).getTypedEntity()).getName());
+	}
+
 	@Test
 	public void testArrayListMatthias() {
 		parse(new String[]{"src/test/resources/ad_hoc/Bla.java"});
 
-		assertEquals(7, entitiesOfType(org.moosetechnology.model.famix.famixjavaentities.Class.class).size()); // Classes are : Bla, Object, String, ArrayList, Arrays, AbstractList, AbstractCollection
-		assertEquals(3, entitiesOfType(ParametricClass.class).size()); // Parametric classes are : ArrayList, AbstractList, AbstractCollection
+		// Classes are : Bla, Object, String, ArrayList, Arrays, AbstractList, AbstractCollection, TYPE_VAR_NAME
+		assertEquals(7, entitiesOfType(org.moosetechnology.model.famix.famixjavaentities.Class.class).size()); 
+		// Parametric classes are : ArrayList, AbstractList, AbstractCollection
+		assertEquals(3, entitiesOfType(ParametricClass.class).size()); 
 
 		// compute all interfaces used by the 3 types String, ArrayList, Arrays
 		Set<java.lang.Class<?>> allInterfaces = new HashSet<>();

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

@@ -8,7 +8,9 @@
 public class Bla {
 
 	public static void main(String[] arg){
-		List<?> list = new ArrayList();
-		Arrays.asList("abc");
+		List<String> list = new ArrayList<>();
+		for (var str : Arrays.asList("abc")) {
+			list.add(str);
+		};
 	}
 }