Moved static forwarder generation behind -Xforw...

Moved static forwarder generation behind -Xforwarders option. Special
cased main so #363 continues to work. Moved test case for #1745 into
pending since it requires forwarders to work.

5 files changed, 6 insertions, 21 deletions

diff --git a/test/files/pos/t1840/J.java b/test/files/pos/t1840/J.java
new file mode 100644
index 0000000000..3914721431
--- /dev/null
+++ b/test/files/pos/t1840/J.java
@@ -0,0 +1,4 @@
+package p;
+class J {
+  J() {}
+}
\ No newline at end of file
diff --git a/test/files/pos/t1840/S.scala b/test/files/pos/t1840/S.scala
new file mode 100644
index 0000000000..00ab0ff3b1
--- /dev/null
+++ b/test/files/pos/t1840/S.scala
@@ -0,0 +1,2 @@
+package p
+class S { new J }
\ No newline at end of file
diff --git a/test/files/pos5/misc-pos.log b/test/files/pos5/misc-pos.log
deleted file mode 100644
index b921dd4d64..0000000000
--- a/test/files/pos5/misc-pos.log
+++ /dev/null
@@ -1,4 +0,0 @@
-A.java:3: error: illegal cyclic reference involving object A
-import static test.A.STATE.UNDEF;
-       ^
-one error found
diff --git a/test/files/pos5/t1745/J.java b/test/files/pos5/t1745/J.java
deleted file mode 100644
index 8444eabb24..0000000000
--- a/test/files/pos5/t1745/J.java
+++ /dev/null
@@ -1,10 +0,0 @@
-class J {
-  S1 s1;
-  S2 s2;
-
-  String s = bar(S3.foo(), S3.bar("def"));
-
-  private String bar(String s1, String s2) {
-    return s1 + s2;
-  }
-}
diff --git a/test/files/pos5/t1745/S.scala b/test/files/pos5/t1745/S.scala
deleted file mode 100644
index 70210ba502..0000000000
--- a/test/files/pos5/t1745/S.scala
+++ /dev/null
@@ -1,7 +0,0 @@
-case class S1(n: Int) { }
-case class S2(n: Int, p: Int) { }
-class S3 { }
-object S3 {
-  def foo() = "abc"
-  def bar[T](x: T): T = x
-}
\ No newline at end of file