Merge branch 'master' into infer-method-alternative

3 files changed, 58 insertions, 0 deletions

diff --git a/test/files/run/t3897/J_2.java b/test/files/run/t3897/J_2.java
new file mode 100644
index 0000000000..178412dc92
--- /dev/null
+++ b/test/files/run/t3897/J_2.java
@@ -0,0 +1,27 @@
+import java.lang.reflect.*;
+
+public class J_2 {
+  public void f1(Class<?> clazz) {
+    Field[] fields = clazz.getDeclaredFields();
+    for (int i = 0 ; i < fields.length; i++) {
+      String name = fields[i].getName();
+      if (name.length() >= 7 && name.substring(0, 7).equals("bitmap$")) { }
+      else System.out.println("(" + name + "," + fields[i].getGenericType() + ")");
+    }    
+  }
+  public void f2(Class<?> clazz) {
+    Method[] methods = clazz.getDeclaredMethods();
+    for (int i = 0 ; i < methods.length; i++) {
+      String name = methods[i].getName();
+      if (name.length() >= 7 && name.substring(0, 7).equals("bitmap$")) { }
+      else System.out.println("(" + name + "," + methods[i].getGenericReturnType() + ")");
+    }    
+  }
+
+  public void javaRun() {
+    f1(One.class);
+    f2(One.class);
+    f1(Two.class);
+    f2(Two.class);
+  }
+}
\ No newline at end of file
diff --git a/test/files/run/t3897/a_1.scala b/test/files/run/t3897/a_1.scala
new file mode 100644
index 0000000000..4da959e2ac
--- /dev/null
+++ b/test/files/run/t3897/a_1.scala
@@ -0,0 +1,8 @@
+class One {
+  private val messages = new collection.mutable.MutableList[String]
+  List("a") foreach { messages += _ }
+}
+
+class Two {
+  private val messages = new collection.mutable.MutableList[String]
+}
diff --git a/test/files/run/t3897/a_2.scala b/test/files/run/t3897/a_2.scala
new file mode 100644
index 0000000000..4d9e59ef05
--- /dev/null
+++ b/test/files/run/t3897/a_2.scala
@@ -0,0 +1,23 @@
+object Test {
+  def f1(clazz: Class[_]) = (
+    clazz.getDeclaredFields.toList 
+     . filterNot (_.getName contains "bitmap$")
+     . map (f => (f.getName, f.getGenericType))
+     . foreach (println)
+  )
+  def f2(clazz: Class[_]) = (
+    clazz.getDeclaredMethods.toList 
+     . filterNot (_.getName contains "bitmap$")
+     . map (f => (f.getName, f.getGenericReturnType))
+     . foreach (println)
+  )
+
+  def main(args: Array[String]): Unit = {
+    f1(classOf[One])
+    f2(classOf[One])
+    f1(classOf[Two])
+    f2(classOf[Two])
+    
+    new J_2().javaRun
+  }
+}