scalap changed to treat named parameters and pa...

scalap changed to treat named parameters and package objects

23 files changed, 85 insertions, 1 deletions

diff --git a/test/files/scalap/caseClass/A.scala b/test/files/scalap/caseClass/A.scala
new file mode 100644
index 0000000000..3addfbdaaa
--- /dev/null
+++ b/test/files/scalap/caseClass/A.scala
@@ -0,0 +1,3 @@
+case class CaseClass[A <: Seq[Int]](i: A, s: String) {
+    def foo = 239
+}
\ No newline at end of file
diff --git a/test/files/scalap/caseClass/result.test b/test/files/scalap/caseClass/result.test
new file mode 100644
index 0000000000..3daa036d18
--- /dev/null
+++ b/test/files/scalap/caseClass/result.test
@@ -0,0 +1,14 @@
+case class CaseClass[A >: scala.Nothing <: scala.Seq[scala.Int]] extends java.lang.Object with scala.ScalaObject with scala.Product {
+  val i : A = { /* compiled code */ }
+  val s : scala.Predef.String = { /* compiled code */ }
+  def foo : scala.Int = { /* compiled code */ }
+  def copy[A >: scala.Nothing <: scala.Seq[scala.Int]]() : CaseClass[A] = { /* compiled code */ }
+  def copy$default$1[A >: scala.Nothing <: scala.Seq[scala.Int]] : A = { /* compiled code */ }
+  def copy$default$2[A >: scala.Nothing <: scala.Seq[scala.Int]] : scala.Predef.String = { /* compiled code */ }
+  override def hashCode() : scala.Int = { /* compiled code */ }
+  override def toString() : scala.Predef.String = { /* compiled code */ }
+  override def equals(x$1 : scala.Any) : scala.Boolean = { /* compiled code */ }
+  override def productPrefix : java.lang.String = { /* compiled code */ }
+  override def productArity : scala.Int = { /* compiled code */ }
+  override def productElement(x$1 : scala.Int) : scala.Any = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/caseObject/A.scala b/test/files/scalap/caseObject/A.scala
new file mode 100644
index 0000000000..7c15416841
--- /dev/null
+++ b/test/files/scalap/caseObject/A.scala
@@ -0,0 +1,3 @@
+case object CaseObject {
+    def bar = 239
+}
\ No newline at end of file
diff --git a/test/files/scalap/caseObject/result.test b/test/files/scalap/caseObject/result.test
new file mode 100644
index 0000000000..2097c5a71d
--- /dev/null
+++ b/test/files/scalap/caseObject/result.test
@@ -0,0 +1,8 @@
+case object CaseObject extends java.lang.Object with scala.ScalaObject with scala.Product {
+  def bar : scala.Int = { /* compiled code */ }
+  final override def toString() : java.lang.String = { /* compiled code */ }
+  override def productPrefix : java.lang.String = { /* compiled code */ }
+  override def productArity : scala.Int = { /* compiled code */ }
+  override def productElement(x$1 : scala.Int) : scala.Any = { /* compiled code */ }
+  protected def readResolve() : java.lang.Object = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/cbnParam/A.scala b/test/files/scalap/cbnParam/A.scala
new file mode 100644
index 0000000000..d804ba6502
--- /dev/null
+++ b/test/files/scalap/cbnParam/A.scala
@@ -0,0 +1 @@
+class CbnParam(s: => String)
\ No newline at end of file
diff --git a/test/files/scalap/cbnParam/result.test b/test/files/scalap/cbnParam/result.test
new file mode 100644
index 0000000000..7b18228986
--- /dev/null
+++ b/test/files/scalap/cbnParam/result.test
@@ -0,0 +1,3 @@
+class CbnParam extends java.lang.Object with scala.ScalaObject {
+  def this(s : => scala.Predef.String) = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/classWithExistential/A.scala b/test/files/scalap/classWithExistential/A.scala
new file mode 100644
index 0000000000..2a77a842c9
--- /dev/null
+++ b/test/files/scalap/classWithExistential/A.scala
@@ -0,0 +1,3 @@
+class ClassWithExistential {
+  def foo[A, B] : A=> B forSome {type A <: Seq[Int]; type B >: String} = null
+}
\ No newline at end of file
diff --git a/test/files/scalap/classWithExistential/result.test b/test/files/scalap/classWithExistential/result.test
new file mode 100644
index 0000000000..377edff7ef
--- /dev/null
+++ b/test/files/scalap/classWithExistential/result.test
@@ -0,0 +1,4 @@
+class ClassWithExistential extends java.lang.Object with scala.ScalaObject {
+  def this() = { /* compiled code */ }
+  def foo[A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any] : scala.Function1[A, B forSome {type A >: scala.Nothing <: scala.Seq[scala.Int]; type B >: scala.Predef.String <: scala.Any}] = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/covariantParam/A.scala b/test/files/scalap/covariantParam/A.scala
new file mode 100644
index 0000000000..19fb8805b7
--- /dev/null
+++ b/test/files/scalap/covariantParam/A.scala
@@ -0,0 +1,3 @@
+class CovariantParam[+A] {
+    def foo[A](a: A) = 42
+}
\ No newline at end of file
diff --git a/test/files/scalap/covariantParam/result.test b/test/files/scalap/covariantParam/result.test
new file mode 100644
index 0000000000..e7c4a00bcb
--- /dev/null
+++ b/test/files/scalap/covariantParam/result.test
@@ -0,0 +1,4 @@
+class CovariantParam[+A >: scala.Nothing <: scala.Any] extends java.lang.Object with scala.ScalaObject {
+  def this() = { /* compiled code */ }
+  def foo[A >: scala.Nothing <: scala.Any](a : A) : scala.Int = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/implicitParam/A.scala b/test/files/scalap/implicitParam/A.scala
new file mode 100644
index 0000000000..5a5c88bc69
--- /dev/null
+++ b/test/files/scalap/implicitParam/A.scala
@@ -0,0 +1,3 @@
+class ImplicitParam {
+    def foo(i: Int)(implicit f: Float, d: Double) = 42
+}
\ No newline at end of file
diff --git a/test/files/scalap/implicitParam/result.test b/test/files/scalap/implicitParam/result.test
new file mode 100644
index 0000000000..4d2f49e803
--- /dev/null
+++ b/test/files/scalap/implicitParam/result.test
@@ -0,0 +1,4 @@
+class ImplicitParam extends java.lang.Object with scala.ScalaObject {
+  def this() = { /* compiled code */ }
+  def foo(i : scala.Int)(implicit f : scala.Float, d : scala.Double) : scala.Int = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/packageObject/A.scala b/test/files/scalap/packageObject/A.scala
new file mode 100644
index 0000000000..959517c4c4
--- /dev/null
+++ b/test/files/scalap/packageObject/A.scala
@@ -0,0 +1,4 @@
+package object PackageObject {
+  type A = String
+  def foo(i: Int) = 239
+}
\ No newline at end of file
diff --git a/test/files/scalap/packageObject/result.test b/test/files/scalap/packageObject/result.test
new file mode 100644
index 0000000000..6a7cc16ba8
--- /dev/null
+++ b/test/files/scalap/packageObject/result.test
@@ -0,0 +1,5 @@
+package object PackageObject extends java.lang.Object with scala.ScalaObject {
+  def this() = { /* compiled code */ }
+  type A = scala.Predef.String
+  def foo(i : scala.Int) : scala.Int = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/paramClauses/A.scala b/test/files/scalap/paramClauses/A.scala
new file mode 100644
index 0000000000..bcc76f50e3
--- /dev/null
+++ b/test/files/scalap/paramClauses/A.scala
@@ -0,0 +1,3 @@
+class ParamClauses {
+    def foo(i: Int)(s: String)(t: Double) = 239
+}
\ No newline at end of file
diff --git a/test/files/scalap/paramClauses/result.test b/test/files/scalap/paramClauses/result.test
new file mode 100644
index 0000000000..6ecbcec873
--- /dev/null
+++ b/test/files/scalap/paramClauses/result.test
@@ -0,0 +1,4 @@
+class ParamClauses extends java.lang.Object with scala.ScalaObject {
+  def this() = { /* compiled code */ }
+  def foo(i : scala.Int)(s : scala.Predef.String)(t : scala.Double) : scala.Int = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/paramNames/A.scala b/test/files/scalap/paramNames/A.scala
new file mode 100644
index 0000000000..7ba9ff0feb
--- /dev/null
+++ b/test/files/scalap/paramNames/A.scala
@@ -0,0 +1,3 @@
+class ParamNames {
+  def foo (s: => Seq[Int], s2: => Seq[Any]) {}
+}
diff --git a/test/files/scalap/paramNames/result.test b/test/files/scalap/paramNames/result.test
new file mode 100644
index 0000000000..59565dc782
--- /dev/null
+++ b/test/files/scalap/paramNames/result.test
@@ -0,0 +1,4 @@
+class ParamNames extends java.lang.Object with scala.ScalaObject {
+  def this() = { /* compiled code */ }
+  def foo(s : => scala.Seq[scala.Int], s2 : => scala.Seq[scala.Any]) : scala.Unit = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/sequenceParam/A.scala b/test/files/scalap/sequenceParam/A.scala
new file mode 100644
index 0000000000..98874fafb1
--- /dev/null
+++ b/test/files/scalap/sequenceParam/A.scala
@@ -0,0 +1 @@
+class SequenceParam(s: String, i: Int*)
\ No newline at end of file
diff --git a/test/files/scalap/sequenceParam/result.test b/test/files/scalap/sequenceParam/result.test
new file mode 100644
index 0000000000..928ab45ef1
--- /dev/null
+++ b/test/files/scalap/sequenceParam/result.test
@@ -0,0 +1,3 @@
+class SequenceParam extends java.lang.Object with scala.ScalaObject {
+  def this(s : scala.Predef.String, i : scala.Int*) = { /* compiled code */ }
+}
\ No newline at end of file
diff --git a/test/files/scalap/traitObject/result.test b/test/files/scalap/traitObject/result.test
index dc5b9b5f9e..c05a4b0968 100644
--- a/test/files/scalap/traitObject/result.test
+++ b/test/files/scalap/traitObject/result.test
@@ -2,7 +2,7 @@ trait TraitObject extends java.lang.Object with scala.ScalaObject {
   def $init$() : scala.Unit = { /* compiled code */ }
   def foo : scala.Int = { /* compiled code */ }
 }
-final object TraitObject extends java.lang.Object with scala.ScalaObject {
+object TraitObject extends java.lang.Object with scala.ScalaObject {
   def this() = { /* compiled code */ }
   def bar : scala.Int = { /* compiled code */ }
 }
\ No newline at end of file
diff --git a/test/files/scalap/wildcardType/A.scala b/test/files/scalap/wildcardType/A.scala
new file mode 100644
index 0000000000..d99841cb36
--- /dev/null
+++ b/test/files/scalap/wildcardType/A.scala
@@ -0,0 +1 @@
+class WildcardType(f: Int => _)
\ No newline at end of file
diff --git a/test/files/scalap/wildcardType/result.test b/test/files/scalap/wildcardType/result.test
new file mode 100644
index 0000000000..78a24ef22a
--- /dev/null
+++ b/test/files/scalap/wildcardType/result.test
@@ -0,0 +1,3 @@
+class WildcardType extends java.lang.Object with scala.ScalaObject {
+  def this(f : scala.Function1[scala.Int, _]) = { /* compiled code */ }
+}
\ No newline at end of file