Merge pull request #2310 from retronym/ticket/6168

SI-6168 Retain prefix when parsing types in JVM signatures

9 files changed, 142 insertions, 0 deletions

diff --git a/test/files/run/t6168/Context.java b/test/files/run/t6168/Context.java
new file mode 100644
index 0000000000..e527844563
--- /dev/null
+++ b/test/files/run/t6168/Context.java
@@ -0,0 +1,34 @@
+public class Context<ParentType> {
+    private ParentType parent;
+
+    public Context() {}
+
+    public ParentType getParent() {
+        return parent;
+    }
+
+    public void setParent(ParentType parent) {
+         this.parent = parent;
+    }
+    
+    public Field<Integer> intField() {
+        return new Field<Integer>() {
+            @Override
+            public Integer get() {
+                return 0;
+            }
+
+            @Override
+            public ParentType set(Integer t) {
+                return parent;
+            }
+        };
+    }
+
+    public abstract class Field<T> { //Note this is a path dependent type
+
+        public abstract T get();
+
+        public abstract ParentType set(T t);
+    }
+}
\ No newline at end of file
diff --git a/test/files/run/t6168/JavaTest.java b/test/files/run/t6168/JavaTest.java
new file mode 100644
index 0000000000..94ae91661d
--- /dev/null
+++ b/test/files/run/t6168/JavaTest.java
@@ -0,0 +1,8 @@
+public class JavaTest {
+  public static void main(String[] args) {
+    SomeClass a = new SomeClass();
+    SomeClass2 a2 = new SomeClass2();
+    SomeClass b = a.f.set(23).f.set(23);
+    SomeClass2 b2 = a2.f.set(23).f.set(23);
+  }
+}
\ No newline at end of file
diff --git a/test/files/run/t6168/SomeClass.java b/test/files/run/t6168/SomeClass.java
new file mode 100644
index 0000000000..6f76b829bb
--- /dev/null
+++ b/test/files/run/t6168/SomeClass.java
@@ -0,0 +1,14 @@
+public class SomeClass {
+    private final Context<SomeClass> context = new Context<SomeClass>();
+    {
+        context.setParent(this);
+    }
+
+    public final Context<SomeClass>.Field<Integer> f = context.intField();
+
+    public SomeClass() {
+        f.set(23).f.set(23);
+    }
+}
+
+
diff --git a/test/files/run/t6168/SomeClass2.java b/test/files/run/t6168/SomeClass2.java
new file mode 100644
index 0000000000..b2c7a7540b
--- /dev/null
+++ b/test/files/run/t6168/SomeClass2.java
@@ -0,0 +1,12 @@
+public class SomeClass2 {
+    private final Context<SomeClass2> context = new Context<SomeClass2>();
+    {
+        context.setParent(this);
+    }
+
+    public final Context<SomeClass2>.Field<Integer> f = context.intField();
+
+    public SomeClass2() {
+        f.set(23).f.set(23);
+    }
+}
\ No newline at end of file
diff --git a/test/files/run/t6168/main.scala b/test/files/run/t6168/main.scala
new file mode 100644
index 0000000000..c7ad37830b
--- /dev/null
+++ b/test/files/run/t6168/main.scala
@@ -0,0 +1,15 @@
+
+
+object Test extends App {
+  JavaTest.main(null)
+
+  var a1 : SomeClass = new SomeClass
+  var a2 : SomeClass2 = new SomeClass2
+  //import language.implicitConversions
+  //implicit def setParentType2SomeClass(x:Any) = x.asInstanceOf[SomeClass]
+  //implicit def setParentType2SomeClass2(x:Any) = x.asInstanceOf[SomeClass2]
+  //var b : SomeClass = a.f.set(23).asInstanceOf[SomeClass].f.set(23).asInstanceOf[SomeClass]
+  //var b2 : SomeClass2 = a2.f.set(23).asInstanceOf[SomeClass2].f.set(23).asInstanceOf[SomeClass2]
+  var b1 : SomeClass =  a1.f.set(23).f.set(23)
+  var b2 : SomeClass2 = a2.f.set(23).f.set(23)
+}
diff --git a/test/files/run/t6168b/Context.java b/test/files/run/t6168b/Context.java
new file mode 100644
index 0000000000..b3ea22126f
--- /dev/null
+++ b/test/files/run/t6168b/Context.java
@@ -0,0 +1,34 @@
+public class Context<ParentType> {
+    private ParentType parent;
+
+    public Context() {}
+
+    public ParentType getParent() {
+        return parent;
+    }
+
+    public void setParent(ParentType parent) {
+         this.parent = parent;
+    }
+
+    public Field<Integer> intField() {
+        return new Field<Integer>() {
+            @Override
+            public Integer get() {
+                return 0;
+            }
+
+            @Override
+            public ParentType set(Integer t) {
+                return parent;
+            }
+        };
+    }
+
+    public static abstract class Field<T> {
+
+        public abstract T get();
+
+        public abstract Object set(T t);
+    }
+}
\ No newline at end of file
diff --git a/test/files/run/t6168b/JavaTest.java b/test/files/run/t6168b/JavaTest.java
new file mode 100644
index 0000000000..a09fa0382d
--- /dev/null
+++ b/test/files/run/t6168b/JavaTest.java
@@ -0,0 +1,6 @@
+public class JavaTest {
+  public static void main(String[] args) {
+    SomeClass a = new SomeClass();
+    Object b = a.f.set(23);
+  }
+}
\ No newline at end of file
diff --git a/test/files/run/t6168b/SomeClass.java b/test/files/run/t6168b/SomeClass.java
new file mode 100644
index 0000000000..566c55e1c5
--- /dev/null
+++ b/test/files/run/t6168b/SomeClass.java
@@ -0,0 +1,11 @@
+public class SomeClass {
+    private final Context<SomeClass> context = new Context<SomeClass>();
+    {
+        context.setParent(this);
+    }
+
+    public final Context.Field<Integer> f = context.intField();
+
+}
+
+
diff --git a/test/files/run/t6168b/main.scala b/test/files/run/t6168b/main.scala
new file mode 100644
index 0000000000..187e9fe85e
--- /dev/null
+++ b/test/files/run/t6168b/main.scala
@@ -0,0 +1,8 @@
+
+
+object Test extends App {
+  JavaTest.main(null)
+
+  var a1 : SomeClass = new SomeClass
+  var b1 : Object =  a1.f.set(23)
+}