From 60aa5771ea92f91ed34778f90c04113e226d09ca Mon Sep 17 00:00:00 2001
From: Adriaan Moors <adriaan.moors@typesafe.com>
Date: Thu, 6 Mar 2014 14:12:56 -0800
Subject: SI-8367 revert SI-8192's change to primaryConstructor when
 isJavaDefined

this is some weird stuff
---
 test/files/run/t6392b.check               |  2 +-
 test/files/run/t7582-private-within.check |  2 +-
 test/files/run/t8192.check                | 12 ------------
 test/files/run/t8192/Macros_1.scala       |  3 ++-
 test/files/run/t8192/Test_2.scala         |  3 ++-
 5 files changed, 6 insertions(+), 16 deletions(-)

(limited to 'test/files/run')

diff --git a/test/files/run/t6392b.check b/test/files/run/t6392b.check
index 83d8fe20c1..9bb9b5694f 100644
--- a/test/files/run/t6392b.check
+++ b/test/files/run/t6392b.check
@@ -1 +1 @@
-ModuleDef(Modifiers(), TermName("C")#MOD, Template(List(Select(Ident(scala#PK), TypeName("AnyRef")#TPE)), noSelfType, List(DefDef(Modifiers(), termNames.CONSTRUCTOR#PCTOR, List(), List(List()), TypeTree(), Block(List(Apply(Select(Super(This(TypeName("C")), typeNames.EMPTY), termNames.CONSTRUCTOR#CTOR), List())), Literal(Constant(())))))))
+ModuleDef(Modifiers(), TermName("C")#MOD, Template(List(Select(Ident(scala#PK), TypeName("AnyRef")#TPE)), noSelfType, List(DefDef(Modifiers(), termNames.CONSTRUCTOR#PCTOR, List(), List(List()), TypeTree(), Block(List(Apply(Select(Super(This(TypeName("C")), typeNames.EMPTY), termNames.CONSTRUCTOR#PCTOR), List())), Literal(Constant(())))))))
diff --git a/test/files/run/t7582-private-within.check b/test/files/run/t7582-private-within.check
index 1b9a0910af..b2743ffa06 100644
--- a/test/files/run/t7582-private-within.check
+++ b/test/files/run/t7582-private-within.check
@@ -2,7 +2,7 @@ private[package pack] class JavaPackagePrivate
 private[package pack] module JavaPackagePrivate
 private[package pack] module class JavaPackagePrivate
 private[package pack] field field
-private[package pack] constructor <init>
+private[package pack] primary constructor <init>
 private[package pack] method meth
 private[package pack] field staticField
 private[package pack] method staticMeth
diff --git a/test/files/run/t8192.check b/test/files/run/t8192.check
index 7195703e19..2423a7acbf 100644
--- a/test/files/run/t8192.check
+++ b/test/files/run/t8192.check
@@ -1,10 +1,4 @@
 compile-time
-class File
-primary constructor: NoSymbol
-def <init>(x$1: String): java.io.File => false
-def <init>(x$1: String,x$2: String): java.io.File => false
-def <init>(x$1: java.io.File,x$2: String): java.io.File => false
-def <init>(x$1: java.net.URI): java.io.File => false
 package scala
 primary constructor: NoSymbol
 object List
@@ -21,12 +15,6 @@ primary constructor: def <init>(x: Int): C => true
 def <init>(x: Int): C => true
 def <init>(x: String): C => false
 runtime
-class File
-primary constructor: NoSymbol
-def <init>(x$1: java.io.File,x$2: java.lang.String): java.io.File => false
-def <init>(x$1: java.lang.String): java.io.File => false
-def <init>(x$1: java.lang.String,x$2: java.lang.String): java.io.File => false
-def <init>(x$1: java.net.URI): java.io.File => false
 package scala
 primary constructor: NoSymbol
 object List
diff --git a/test/files/run/t8192/Macros_1.scala b/test/files/run/t8192/Macros_1.scala
index ddad9fb872..72fb2cf313 100644
--- a/test/files/run/t8192/Macros_1.scala
+++ b/test/files/run/t8192/Macros_1.scala
@@ -30,7 +30,8 @@ object Macros {
     }
 
     println("compile-time")
-    test(typeOf[File].typeSymbol.asClass)
+    // SI-8367 primaryConstructor for Java-defined classes is unstable, so I'm commenting this out
+    // test(typeOf[File].typeSymbol.asClass)
     test(definitions.ScalaPackageClass)
     test(definitions.ListModule.moduleClass.asClass)
     test(typeOf[Product1[_]].typeSymbol.asClass)
diff --git a/test/files/run/t8192/Test_2.scala b/test/files/run/t8192/Test_2.scala
index 29f187c171..89302083ad 100644
--- a/test/files/run/t8192/Test_2.scala
+++ b/test/files/run/t8192/Test_2.scala
@@ -30,7 +30,8 @@ object Test extends App {
 
   Macros.foo
   println("runtime")
-  test(typeOf[File].typeSymbol.asClass)
+  // SI-8367 primaryConstructor for Java-defined classes is unstable, so I'm commenting this out
+  // test(typeOf[File].typeSymbol.asClass)
   test(definitions.ScalaPackageClass)
   test(definitions.ListModule.moduleClass.asClass)
   test(typeOf[Product1[_]].typeSymbol.asClass)
-- 
cgit v1.2.3