scalap changed to treat named parameters and pa...

scalap changed to treat named parameters and package objects

25 files changed, 32 insertions, 20 deletions

diff --git a/test/disabled/scalap/caseClass/result.test b/test/disabled/scalap/caseClass/result.test
deleted file mode 100644
index 5057f87a3f..0000000000
--- a/test/disabled/scalap/caseClass/result.test
+++ /dev/null
@@ -1,11 +0,0 @@
-case class CaseClass[A >: scala.Nothing <: scala.Seq[scala.Int]](a : A, s : scala.Predef.String) 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 */ }
-  override def hashCode() : scala.Int = { /* compiled code */ }
-  override def toString() : scala.Predef.String = { /* compiled code */ }
-  override def equals(a : scala.Any) : scala.Boolean = { /* compiled code */ }
-  override def productPrefix : java.lang.String = { /* compiled code */ }
-  override def productArity : scala.Int = { /* compiled code */ }
-  override def productElement(i : scala.Int) : scala.Any = { /* compiled code */ }
-}
\ No newline at end of file
diff --git a/test/disabled/scalap/paramNames/result.test b/test/disabled/scalap/paramNames/result.test
deleted file mode 100644
index 2d59f72ec1..0000000000
--- a/test/disabled/scalap/paramNames/result.test
+++ /dev/null
@@ -1,4 +0,0 @@
-class ParamNames extends java.lang.Object with scala.ScalaObject {
-  def this() = { /* compiled code */ }
-  def foo(s : => scala.Seq[scala.Int], s : => scala.Seq[scala.Any]) : scala.Unit = { /* compiled code */ }
-}
\ No newline at end of file
diff --git a/test/disabled/scalap/caseClass/A.scala b/test/files/scalap/caseClass/A.scala
index 3addfbdaaa..3addfbdaaa 100644
--- a/test/disabled/scalap/caseClass/A.scala
+++ b/test/files/scalap/caseClass/A.scala
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/disabled/scalap/caseObject/A.scala b/test/files/scalap/caseObject/A.scala
index 7c15416841..7c15416841 100644
--- a/test/disabled/scalap/caseObject/A.scala
+++ b/test/files/scalap/caseObject/A.scala
diff --git a/test/disabled/scalap/caseObject/result.test b/test/files/scalap/caseObject/result.test
index c265c8a529..2097c5a71d 100644
--- a/test/disabled/scalap/caseObject/result.test
+++ b/test/files/scalap/caseObject/result.test
@@ -1,8 +1,8 @@
-final case object CaseObject extends java.lang.Object with scala.ScalaObject with scala.Product {
+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(i : scala.Int) : scala.Any = { /* 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/disabled/scalap/cbnParam/A.scala b/test/files/scalap/cbnParam/A.scala
index d804ba6502..d804ba6502 100644
--- a/test/disabled/scalap/cbnParam/A.scala
+++ b/test/files/scalap/cbnParam/A.scala
diff --git a/test/disabled/scalap/cbnParam/result.test b/test/files/scalap/cbnParam/result.test
index 7b18228986..7b18228986 100644
--- a/test/disabled/scalap/cbnParam/result.test
+++ b/test/files/scalap/cbnParam/result.test
diff --git a/test/disabled/scalap/classWithExistential/A.scala b/test/files/scalap/classWithExistential/A.scala
index 2a77a842c9..2a77a842c9 100644
--- a/test/disabled/scalap/classWithExistential/A.scala
+++ b/test/files/scalap/classWithExistential/A.scala
diff --git a/test/disabled/scalap/classWithExistential/result.test b/test/files/scalap/classWithExistential/result.test
index 377edff7ef..377edff7ef 100644
--- a/test/disabled/scalap/classWithExistential/result.test
+++ b/test/files/scalap/classWithExistential/result.test
diff --git a/test/disabled/scalap/covariantParam/A.scala b/test/files/scalap/covariantParam/A.scala
index 19fb8805b7..19fb8805b7 100644
--- a/test/disabled/scalap/covariantParam/A.scala
+++ b/test/files/scalap/covariantParam/A.scala
diff --git a/test/disabled/scalap/covariantParam/result.test b/test/files/scalap/covariantParam/result.test
index e7c4a00bcb..e7c4a00bcb 100644
--- a/test/disabled/scalap/covariantParam/result.test
+++ b/test/files/scalap/covariantParam/result.test
diff --git a/test/disabled/scalap/implicitParam/A.scala b/test/files/scalap/implicitParam/A.scala
index 5a5c88bc69..5a5c88bc69 100644
--- a/test/disabled/scalap/implicitParam/A.scala
+++ b/test/files/scalap/implicitParam/A.scala
diff --git a/test/disabled/scalap/implicitParam/result.test b/test/files/scalap/implicitParam/result.test
index 4d2f49e803..4d2f49e803 100644
--- a/test/disabled/scalap/implicitParam/result.test
+++ b/test/files/scalap/implicitParam/result.test
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/disabled/scalap/paramClauses/A.scala b/test/files/scalap/paramClauses/A.scala
index bcc76f50e3..bcc76f50e3 100644
--- a/test/disabled/scalap/paramClauses/A.scala
+++ b/test/files/scalap/paramClauses/A.scala
diff --git a/test/disabled/scalap/paramClauses/result.test b/test/files/scalap/paramClauses/result.test
index 4a3138d3c9..6ecbcec873 100644
--- a/test/disabled/scalap/paramClauses/result.test
+++ b/test/files/scalap/paramClauses/result.test
@@ -1,4 +1,4 @@
 class ParamClauses extends java.lang.Object with scala.ScalaObject {
   def this() = { /* compiled code */ }
-  def foo(i : scala.Int)(s : scala.Predef.String)(d : scala.Double) : scala.Int = { /* 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/disabled/scalap/paramNames/A.scala b/test/files/scalap/paramNames/A.scala
index 7ba9ff0feb..7ba9ff0feb 100644
--- a/test/disabled/scalap/paramNames/A.scala
+++ b/test/files/scalap/paramNames/A.scala
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/disabled/scalap/sequenceParam/A.scala b/test/files/scalap/sequenceParam/A.scala
index 98874fafb1..98874fafb1 100644
--- a/test/disabled/scalap/sequenceParam/A.scala
+++ b/test/files/scalap/sequenceParam/A.scala
diff --git a/test/disabled/scalap/sequenceParam/result.test b/test/files/scalap/sequenceParam/result.test
index a4769c81df..928ab45ef1 100644
--- a/test/disabled/scalap/sequenceParam/result.test
+++ b/test/files/scalap/sequenceParam/result.test
@@ -1,3 +1,3 @@
 class SequenceParam extends java.lang.Object with scala.ScalaObject {
-  def this(s : scala.Predef.String, s : scala.Int*) = { /* compiled code */ }
+  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/disabled/scalap/wildcardType/A.scala b/test/files/scalap/wildcardType/A.scala
index d99841cb36..d99841cb36 100644
--- a/test/disabled/scalap/wildcardType/A.scala
+++ b/test/files/scalap/wildcardType/A.scala
diff --git a/test/disabled/scalap/wildcardType/result.test b/test/files/scalap/wildcardType/result.test
index 78a24ef22a..78a24ef22a 100644
--- a/test/disabled/scalap/wildcardType/result.test
+++ b/test/files/scalap/wildcardType/result.test