diff options
| author | Seth Tisue <seth@tisue.net> | 2017-03-21 10:35:05 -0700 |
|---|---|---|
| committer | Seth Tisue <seth@tisue.net> | 2017-03-21 10:35:05 -0700 |
| commit | 4b9816100c704fd8ecfb1a8fa66f86e6284c07cb (patch) | |
| tree | 5f748bbc562da8803513444375659f7cd96496f5 /test | |
| parent | 25048bc73741846107c18ed01e0e9f6f07785379 (diff) | |
| download | scala-4b9816100c704fd8ecfb1a8fa66f86e6284c07cb.tar.gz scala-4b9816100c704fd8ecfb1a8fa66f86e6284c07cb.tar.bz2 scala-4b9816100c704fd8ecfb1a8fa66f86e6284c07cb.zip | |
remove test/pending directory too
it will all stay right there in the Git history to be consulted
anytime we want...
Diffstat (limited to 'test')
357 files changed, 0 insertions, 9792 deletions
diff --git a/test/pending/buildmanager/t2443/BitSet.scala b/test/pending/buildmanager/t2443/BitSet.scala deleted file mode 100644 index 8d7c8dcd23..0000000000 --- a/test/pending/buildmanager/t2443/BitSet.scala +++ /dev/null @@ -1,2 +0,0 @@ -import scala.collection.BitSet -//class BitSet diff --git a/test/pending/buildmanager/t2443/t2443.changes/BitSet2.scala b/test/pending/buildmanager/t2443/t2443.changes/BitSet2.scala deleted file mode 100644 index 27a5d4de9f..0000000000 --- a/test/pending/buildmanager/t2443/t2443.changes/BitSet2.scala +++ /dev/null @@ -1 +0,0 @@ -import scala.collection.BitSet diff --git a/test/pending/buildmanager/t2443/t2443.check b/test/pending/buildmanager/t2443/t2443.check deleted file mode 100644 index dd88e1ceb9..0000000000 --- a/test/pending/buildmanager/t2443/t2443.check +++ /dev/null @@ -1,6 +0,0 @@ -builder > BitSet.scala -compiling Set(BitSet.scala) -builder > BitSet.scala -Changes: Map(class BitSet -> List(Removed(Class(BitSet)))) - - diff --git a/test/pending/buildmanager/t2443/t2443.test b/test/pending/buildmanager/t2443/t2443.test deleted file mode 100644 index a1d61ff5a3..0000000000 --- a/test/pending/buildmanager/t2443/t2443.test +++ /dev/null @@ -1,3 +0,0 @@ ->>compile BitSet.scala ->>update BitSet.scala=>BitSet2.scala ->>compile BitSet.scala diff --git a/test/pending/jvm/cf-attributes.check b/test/pending/jvm/cf-attributes.check deleted file mode 100644 index 018febb81b..0000000000 --- a/test/pending/jvm/cf-attributes.check +++ /dev/null @@ -1,50 +0,0 @@ - -{{ anonymousFunctions$ }} - -{{ anonymousFunctions$bar$ }} - public final class anonymousFunctions$bar$$anonfun$4 of class anonymousFunctions$bar$ -anonymousClasses$$anon$1 - -{{ anonymousClasses$ }} - -[[ anonymousFunctions$ ]] - InnerClass: - public final #66 of #90; //class anonymousFunctions$$anonfun$1 of class anonymousFunctions - public final #77; //class anonymousFunctions$$anonfun$2 - public final #24; //class anonymousFunctions$$anonfun$3 - public final #49; //class anonymousFunctions$$anonfun$foo$1 - - -[[ anonymousFunctions$bar$ ]] - InnerClass: - public final #28 of #9; //class anonymousFunctions$bar$$anonfun$4 of class anonymousFunctions$bar$ - public final #52; //class anonymousFunctions$bar$$anonfun$5 - - -[[ anonymousClasses$ ]] - InnerClass: - public abstract #33= #30 of #32; //Foo=class anonymousClasses$Foo of class anonymousClasses - public final #25 of #32; //class anonymousClasses$$anon$1 of class anonymousClasses - public abstract #36= #35 of #32; //Foo$class=class anonymousClasses$Foo$class of class anonymousClasses - - -[[ anonymousFunctions$$anonfun$3 ]] - InnerClass: - public final #8; //class anonymousFunctions$$anonfun$3 - - -[[ anonymousFunctions$$anonfun$foo$1 ]] - InnerClass: - public final #8; //class anonymousFunctions$$anonfun$foo$1 - - -[[ anonymousFunctions$bar$$anonfun$4 ]] - InnerClass: - public final #8 of #41; //class anonymousFunctions$bar$$anonfun$4 of class anonymousFunctions$bar$ - - -[[ anonymousClasses$$anon$1 ]] - InnerClass: - public abstract #46= #43 of #45; //Foo=class anonymousClasses$Foo of class anonymousClasses - public final #48 of #45; //class anonymousClasses$$anon$1 of class anonymousClasses - diff --git a/test/pending/jvm/cf-attributes.scala b/test/pending/jvm/cf-attributes.scala deleted file mode 100644 index 2d08f22d8b..0000000000 --- a/test/pending/jvm/cf-attributes.scala +++ /dev/null @@ -1,146 +0,0 @@ -object Test extends Application { - InnerClassTest1 - InnerClassTest2 -} - -object InnerClassTest1 extends Test1 { - printClass(anonymousFunctions.getClass) - printClass(anonymousFunctions.bar.getClass) - println(anonymousClasses.x) // see run/t1167.scala - printClass(anonymousClasses.getClass) -} - -object InnerClassTest2 extends Test2 { - printClass(anonymousFunctions.getClass) - printClass(anonymousFunctions.bar.getClass) - printClass(anonymousClasses.getClass) - // not accessible via the Java reflection API - printClass("anonymousFunctions$$anonfun$3") - printClass("anonymousFunctions$$anonfun$foo$1") - printClass("anonymousFunctions$bar$$anonfun$4") - printClass("anonymousClasses$$anon$1") -} - -object anonymousFunctions { - //InnerClass: - // public final #_ of #_; //class anonymousFunctions$$anonfun$1 of class InnerClass$ - val twice = (x: Int) => 2*x - - //InnerClass: - // public final #_ of #_; //class anonymousFunctions$$anonfun$2 - List(0).map(x => x+1) - - def foo { - //InnerClass: - // public final #_ of #_; class anonymousFunctions$$anonfun$3 - val square = (x: Int) => x*x - - //InnerClass: - // public final #_ of #_; class anonymousFunctions$$anonfun$foo$1 - Array(1).filter(_ % 2 == 0) - } - - object bar { - //InnerClass: - // public final #_ of #_; class anonymousFunctions$bar$$anonfun$4 of class anonymousFunctions$bar$ - val cube = (x: Int) => x*x*x - - //InnerClass: - // public final #_ of #_; class anonymousFunctions$bar$$anonfun$5 - Set(1, 2, 3).exists(_ == 2) - } -} - -object anonymousClasses { - //InnerClass: - // public abstract #_= #_ of #_; //Foo=class anonymousClasses$Foo of class anonymousClasses$ - // public abstract #_= #_ of #_; //Foo$class=class anonymousClasses$Foo$class of class anonymousClasses$ - trait Foo { - def foo() { println("foo"); } - override def toString = getClass.getName - } - //InnerClass: - // public final #_; //class anonymousClasses$$anon$1 of class anonymousClasses$ - val x = new Foo() { - override def foo() { println("foo (overridden)"); } - def dummy = 0 - } -} - -// Auxiliary functions - -trait Test1 { - private var kind: String = _ - private var mods: String = _ - def printInnerClasses(cls: Class[_]) { - for (c <- cls.getDeclaredClasses) { - mods = AccessFlags.asString(c.getModifiers) - kind = if (c.isInterface) "interface" else "class" - println(" "+mods+kind+" "+c.getName+ - " of class "+c.getEnclosingClass.getName) - } - } - def printClass(cls: Class[_]) { - println("\n{{ "+cls.getName+" }}") - printInnerClasses(cls) - } -} - -trait Test2 { - @throws(classOf[Exception]) - // def printInnerClasses(cls: Class[_]) { - // import java.io._, ch.epfl.lamp.fjbg._ - // val fjbgContext = new FJBGContext(49, 0) - // val outDir = System.getProperty("partest.output", "cf-attributes.obj") - // val fileName = outDir+File.separator+cls.getName+".class" - // val in = new DataInputStream(new FileInputStream(fileName)) - // val jclass = fjbgContext.JClass(in) - // println(jclass.getInnerClasses) - // in.close() - // } - def printClass(name: String) { - try { printClass(Class.forName(name)) } - catch { case e: Exception => println(e) } - } - def printClass(cls: Class[_]) { - println("\n[[ "+cls.getName+" ]]"); - try { printInnerClasses(cls) } - catch { case e: Exception => println(e) } - } -} - -object AccessFlags { - val ACC_PUBLIC = 0x0001 - val ACC_PRIVATE = 0x0002 - val ACC_PROTECTED = 0x0004 - val ACC_STATIC = 0x0008 - val ACC_FINAL = 0x0010 - val ACC_ABSTRACT = 0x0400 - - def asString(accessFlags: Int): String = { - val buf = new StringBuilder() - if ((accessFlags & ACC_PUBLIC) != 0) buf.append("public ") - else if ((accessFlags & ACC_PROTECTED) != 0) buf.append("protected ") - else if ((accessFlags & ACC_PRIVATE) != 0) buf.append("private ") - if ((accessFlags & ACC_ABSTRACT) != 0) buf.append("abstract ") - else if ((accessFlags & ACC_FINAL) != 0) buf.append("final ") - buf.toString - } -} - -/* - implicit def stringToLines(s: String) = new { - def lines(n: Int): String = { - val buf = new StringBuilder(); - var i = 0 - var from = 0 - while (i < n && 0 <= from && from < s.length) { - val pos = s.indexOf('\n', from) - if (pos >= 0) { i += 1; buf.append(s.substring(from, pos + 1)); } - from = pos + 1 - } - buf.toString() - } - } -*/ - diff --git a/test/pending/jvm/constant-optimization/Foo_1.flags b/test/pending/jvm/constant-optimization/Foo_1.flags deleted file mode 100644 index 432f01c02d..0000000000 --- a/test/pending/jvm/constant-optimization/Foo_1.flags +++ /dev/null @@ -1 +0,0 @@ -// constant otimization not there yet, -opt:nullness-tracking not enough. diff --git a/test/pending/jvm/constant-optimization/Foo_1.scala b/test/pending/jvm/constant-optimization/Foo_1.scala deleted file mode 100644 index 6f408044d7..0000000000 --- a/test/pending/jvm/constant-optimization/Foo_1.scala +++ /dev/null @@ -1,9 +0,0 @@ -class Foo_1 { - def foo() { - // constant optimization should eliminate all branches - val i = 1 - val x = if (i != 1) null else "good" - val y = if (x == null) "good" else x + "" - println(y) - } -}
\ No newline at end of file diff --git a/test/pending/jvm/constant-optimization/Test.scala b/test/pending/jvm/constant-optimization/Test.scala deleted file mode 100644 index dc0f8f6103..0000000000 --- a/test/pending/jvm/constant-optimization/Test.scala +++ /dev/null @@ -1,27 +0,0 @@ - -import scala.tools.partest.BytecodeTest -import scala.tools.asm -import asm.tree.InsnList -import scala.collection.JavaConverters._ - -object Test extends BytecodeTest { - val comparisons = Set(asm.Opcodes.IF_ACMPEQ, asm.Opcodes.IF_ACMPNE, asm.Opcodes.IF_ICMPEQ, asm.Opcodes.IF_ICMPGE, asm.Opcodes.IF_ICMPGT, asm.Opcodes.IF_ICMPLE, - asm.Opcodes.IF_ICMPLT, asm.Opcodes.IF_ICMPNE, asm.Opcodes.IFEQ, asm.Opcodes.IFGE, asm.Opcodes.IFGT, asm.Opcodes.IFLE, asm.Opcodes.IFLT, - asm.Opcodes.IFNE, asm.Opcodes.IFNONNULL, asm.Opcodes.IFNULL) - - def show: Unit = { - val classNode = loadClassNode("Foo_1") - val methodNode = getMethod(classNode, "foo") - // after optimization there should be no comparisons left - val expected = 0 - - val got = countComparisons(methodNode.instructions) - assert(got == expected, s"expected $expected but got $got comparisons") - } - - def countComparisons(insnList: InsnList): Int = { - def isComparison(node: asm.tree.AbstractInsnNode): Boolean = - (comparisons contains node.getOpcode) - insnList.iterator.asScala count isComparison - } -}
\ No newline at end of file diff --git a/test/pending/jvm/javasigs.check b/test/pending/jvm/javasigs.check deleted file mode 100644 index 299bec5e08..0000000000 --- a/test/pending/jvm/javasigs.check +++ /dev/null @@ -1,321 +0,0 @@ - -@scala.reflect.ScalaSignature(bytes="\006\001i2A!\001\002\001\013\t\t\021IC\001\004\003\035aT-\0349usz\032\001!\006\002\0079M\031\001aB\b\021\005!iQ\"A\005\013\005)Y\021\001\0027b]\036T\021\001D\001\005U\0064\030-\003\002\017\023\t1qJ\0316fGR\004\"\001E\n\016\003EQ\021AE\001\006g\016\fG.Y\005\003)E\0211bU2bY\006|%M[3di\")a\003\001C\001/\0051A(\0338jiz\"\022\001\007\t\0043\001QR\"\001\002\021\005maB\002\001\003\006;\001\021\rA\b\002\002+F\021qD\t\t\003!\001J!!I\t\003\0179{G\017[5oOB\021\001cI\005\003IE\0211!\0218z\021\0251\003\001\"\001(\003\r\021\027M]\013\003Q)\"\"!\013\027\021\005mQC!B\026&\005\004q\"!\001\"\t\r5*C\0211\001/\003\005A\bc\001\t0S%\021\001\'\005\002\ty\tLh.Y7f}!)!\007\001C\001g\005\031am\\8\026\005Q2DCA\0339!\tYb\007B\0038c\t\007aDA\001D\021\025I\024\0071\0016\003\005\031\007") -public class A<U> implements scala.ScalaObject { - - public <B> B bar(scala.Function0<B> x); - - public <C> C foo(C c$1); - - public A(); -} - -@scala.reflect.ScalaSignature(bytes="\006\001\005;Q!\001\002\t\006\025\t\021A\021\006\002\007\0059A(Z7qift4\001\001\t\003\r\035i\021A\001\004\006\021\tA)!\003\002\002\005N\031qA\003\n\021\005-\001R\"\001\007\013\0055q\021\001\0027b]\036T\021aD\001\005U\0064\030-\003\002\022\031\t1qJ\0316fGR\004\"a\005\f\016\003QQ\021!F\001\006g\016\fG.Y\005\003/Q\0211bU2bY\006|%M[3di\")\021d\002C\0015\0051A(\0338jiz\"\022!\002\005\0069\035!\t!H\001\004E\006\024XC\001\020\")\ty\022\006\005\002!C1\001A!\002\005\034\005\004\021\023CA\022\'!\t\031B%\003\002&)\t9aj\034;iS:<\007CA\n(\023\tACCA\002B]fDaAK\016\005\002\004Y\023!\001=\021\007Mas$\003\002.)\tAAHY=oC6,g\bC\0030\017\021\005\001\'A\002g_>,\"!M\032\025\005I*\004C\001\0214\t\025!dF1\001#\005\005\031\005\"\002\034/\001\004\021\024!A2\007\t!\021\001\001O\n\004o)\021\002\"B\r8\t\003QD#A\036\021\005\0319\004\"B\0308\t\003iT#\001 \021\005My\024B\001!\025\005\021)f.\033;") -public class B implements scala.ScalaObject { - - public static final <B> B bar(scala.Function0<B> arg0); - - public void foo(); - - public B(); -} - -public final class $anonfun$foo$1 extends scala.runtime.AbstractFunction0 implements java.io.Serializable { - public static final long serialVersionUID; - private final java.lang.Object c$1; - - public final C apply(); - - public $anonfun$foo$1(A<U> $outer); -} -package scala.actors; - -@scala.reflect.ScalaSignature(bytes="\006\001\021Eu!B\001\003\021\0139\021!B!di>\024(BA\002\005\003\031\t7\r^8sg*\tQ!A\003tG\006d\027m\001\001\021\005!IQ\"\001\002\007\013)\021\001RA\006\003\013\005\033Go\034:\024\t%aAc\006\t\003\033Ii\021A\004\006\003\037A\tA\001\\1oO*\t\021#\001\003kCZ\f\027BA\n\017\005\031y%M[3diB\021\001\"F\005\003-\t\0211bQ8nE&t\027\r^8sgB\021\001$G\007\002\t%\021!\004\002\002\f\'\016\fG.Y(cU\026\034G\017C\003\035\023\021\005Q$\001\004=S:LGO\020\013\002\017\035)q$\003E\003A\005)1\013^1uKB\021\021EI\007\002\023\031)1%\003E\003I\t)1\013^1uKN\031!%J\f\021\005a1\023BA\024\005\005-)e.^7fe\006$\030n\0348\t\013q\021C\021A\025\025\003\001Bqa\013\022C\002\023\005A&A\002OK^,\022!\f\t\003]=j\021AI\005\003a\031\022QAV1mk\026DaA\r\022!\002\023i\023\001\002(fo\002Bq\001\016\022C\002\023\005A&\001\005Sk:t\027M\0317f\021\0311$\005)A\005[\005I!+\0368oC\ndW\r\t\005\bq\t\022\r\021\"\001-\003%\031Vo\0359f]\022,G\r\003\004;E\001\006I!L\001\013\'V\034\b/\0328eK\022\004\003b\002\037#\005\004%\t\001L\001\017)&lW\rZ*vgB,g\016Z3e\021\031q$\005)A\005[\005yA+[7fIN+8\017]3oI\026$\007\005C\004AE\t\007I\021\001\027\002\017\tcwnY6fI\"1!I\tQ\001\n5\n\001B\0217pG.,G\r\t\005\b\t\n\022\r\021\"\001-\0031!\026.\\3e\0052|7m[3e\021\0311%\005)A\005[\005iA+[7fI\ncwnY6fI\002Bq\001\023\022C\002\023\005A&\001\006UKJl\027N\\1uK\022DaA\023\022!\002\023i\023a\003+fe6Lg.\031;fI\002B\001\002T\005C\002\023\005!!T\001\003i2,\022A\024\t\004\033=\013\026B\001)\017\005-!\006N]3bI2{7-\0317\021\005!\021\026BA*\003\0051\021V\r\0357z%\026\f7\r^8s\021\031)\026\002)A\005\035\006\031A\017\034\021\t\021]K!\031!C\001\005a\013Q\001^5nKJ,\022!\027\t\0035vk\021a\027\006\0039B\tA!\036;jY&\021al\027\002\006)&lWM\035\005\007A&\001\013\021B-\002\rQLW.\032:!\021!\021\027B1A\005\002\t\031\027\001E:vgB,g\016Z#yG\026\004H/[8o+\005!\007C\001\005f\023\t1\'AA\nTkN\004XM\0343BGR|\'oQ8oiJ|G\016\003\004i\023\001\006I\001Z\001\022gV\034\b/\0328e\013b\034W\r\035;j_:\004\003\"\0026\n\t\003Y\027\001B:fY\032,\022\001\034\t\003\02154qA\003\002\021\002\007\005anE\004n\031=\f&/^\f\021\005!\001\030BA9\003\0055\t%m\035;sC\016$\030i\031;peB\021\001b]\005\003i\n\021Q\"Q2u_J\034\025M\034*fa2L\bc\001\005wq&\021qO\001\002\r\023:\004X\017^\"iC:tW\r\034\t\0031eL!A\037\003\003\007\005s\027\020C\003}[\022\005Q0\001\004%S:LG\017\n\013\002}B\021\001d`\005\004\003\003!!\001B+oSRD\021\"!\002n\001\004%I!a\002\002\027%\0348+^:qK:$W\rZ\013\003\003\023\0012\001GA\006\023\r\ti\001\002\002\b\005>|G.Z1o\021%\t\t\"\034a\001\n\023\t\031\"A\bjgN+8\017]3oI\026$w\fJ3r)\rq\030Q\003\005\013\003/\ty!!AA\002\005%\021a\001=%c!A\0211D7!B\023\tI!\001\007jgN+8\017]3oI\026$\007\005\013\003\002\032\005}\001c\001\r\002\"%\031\0211\005\003\003\021Y|G.\031;jY\026D\021\"a\nn\001\004%I!!\013\002\021I,7-Z5wK\022,\"!a\013\021\ta\ti\003_\005\004\003_!!AB(qi&|g\016C\005\00245\004\r\021\"\003\0026\005a!/Z2fSZ,Gm\030\023fcR\031a0a\016\t\025\005]\021\021GA\001\002\004\tY\003\003\005\002<5\004\013\025BA\026\003%\021XmY3jm\026$\007\005\013\003\002:\005}\001\002CA![\022E#!a\021\002\023M\034\007.\0323vY\026\024XCAA#!\rA\021qI\005\004\003\023\022!AC%TG\",G-\0367fe\"A\021QJ7\005B\t\ty%A\006ti\006\024HoU3be\016DG\003CA)\003/\nY&!\032\021\ta\t\031F`\005\004\003+\"!!\003$v]\016$\030n\03481\021\035\tI&a\023A\002a\f1!\\:h\021!\ti&a\023A\002\005}\023a\002:fa2LHk\034\t\005\021\005\005\0040C\002\002d\t\021QbT;uaV$8\t[1o]\026d\007\002CA4\003\027\002\r!!\033\002\017!\fg\016\0327feB)\001$a\033yq&\031\021Q\016\003\003\037A\013\'\017^5bY\032+hn\031;j_:D\001\"!\035n\t\003\022\0211O\001\016g\026\f\'o\0315NC&d\'m\034=\025\017y\f)(a \002\002\"A\021qOA8\001\004\tI(A\005ti\006\024H/\0242pqB!\001\"a\037y\023\r\tiH\001\002\007\033F+X-^3\t\021\005\035\024q\016a\001\003SB\001\"a!\002p\001\007\021\021B\001\023e\026\034X/\\3P]N\013W.\032+ie\026\fG\r\003\005\002\b6$\tEAAE\0031i\027m[3SK\006\034G/[8o)!\tY)!%\002\026\006]\005cA\007\002\016&\031\021q\022\b\003\021I+hN\\1cY\026D\001\"a%\002\006\002\007\021\021K\001\004MVt\007\002CA4\003\013\003\r!!\033\t\017\005e\023Q\021a\001q\"9\0211T7\005\002\005u\025a\002:fG\026Lg/Z\013\005\003?\013)\013\006\003\002\"\006E\006\003BAR\003Kc\001\001\002\005\002(\006e%\031AAU\005\005\021\026cAAVqB\031\001$!,\n\007\005=FAA\004O_RD\027N\\4\t\021\005M\026\021\024a\001\003k\013\021A\032\t\0071\005-\0040!)\t\017\005eV\016\"\001\002<\006i!/Z2fSZ,w+\033;iS:,B!!0\002DR!\021qXAe)\021\t\t-!2\021\t\005\r\0261\031\003\t\003O\0139L1\001\002*\"A\0211WA\\\001\004\t9\r\005\004\031\003WB\030\021\031\005\t\003\027\f9\f1\001\002N\006!Qn]3d!\rA\022qZ\005\004\003#$!\001\002\'p]\036Dq!!6n\t\003\n9.A\003sK\006\034G\017\006\003\002,\006e\007\002CA4\003\'\004\r!a7\021\013a\tY\007\037@\t\017\005}W\016\"\021\002b\006Y!/Z1di^KG\017[5o)\021\t\031/a:\025\t\005-\026Q\035\005\t\003O\ni\0161\001\002\\\"A\0211ZAo\001\004\ti\rC\004\002l6$\t!!<\002\r\021\nX.\031:l+\005A\b\002CAy[\022\005#!a=\002\033M\034\007.\0323vY\026\f5\r^8s)\025q\030Q_A|\021!\t\031,a<A\002\005%\004bBA-\003_\004\r\001_\004\b\003wl\007RBA\177\003\035\021Gn\\2lKJ\004B!a@\003\0025\tQNB\004\003\0045DiA!\002\003\017\tdwnY6feN1!\021\001\007\003\b]\001BA!\003\003\0205\021!1\002\006\004\005\033!\021AC2p]\016,(O]3oi&!!\021\003B\006\0059i\025M\\1hK\022\024En\\2lKJDq\001\bB\001\t\003\021)\002\006\002\002~\"A!\021\004B\001\t\003\021Y\"A\003cY>\0347\016\006\002\002\n!A!q\004B\001\t\003\t9!\001\007jgJ+G.Z1tC\ndW\r\003\004\003$5$I!`\001\rgV\034\b/\0328e\003\016$xN\035\005\007\005OiG\021B?\002\027I,7/^7f\003\016$xN\035\005\t\005WiG\021\t\002\002\b\0059Q\r_5uS:<\007b\002B\030[\022\005#!`\001\bI>\034H/\031:u\021\035\021\031$\034C!\005k\tQa\035;beR$\022\001\034\005\b\005siG\021\tB\036\003!9W\r^*uCR,WC\001B\037!\r\021yd\f\b\004\005\003rbB\001\005\001\021)\021)%\034a\001\n\003\021!qI\001\006Y&t7n]\013\003\005\023\002RAa\023\003\\=tAA!\024\003X9!!q\nB+\033\t\021\tFC\002\003T\031\ta\001\020:p_Rt\024\"A\003\n\007\teC!A\004qC\016\\\027mZ3\n\t\tu#q\f\002\005\031&\034HOC\002\003Z\021A!Ba\031n\001\004%\tA\001B3\003%a\027N\\6t?\022*\027\017F\002\177\005OB!\"a\006\003b\005\005\t\031\001B%\021!\021Y\'\034Q!\n\t%\023A\0027j].\034\b\005C\004\003p5$\tA!\035\002\t1Lgn\033\013\004_\nM\004b\002B;\005[\002\ra\\\001\003i>DqAa\034n\t\003\021I\bF\002m\005wB\021B! \003x\021\005\rAa \002\t\t|G-\037\t\0051\t\005e0C\002\003\004\022\021\001\002\0202z]\006lWM\020\005\t\005\017kG\021\001\002\003\n\0061A.\0338l)>$2A BF\021\035\021)H!\"A\002=DqAa$n\t\003\021\t*\001\004v]2Lgn\033\013\004}\nM\005b\002BK\005\033\003\ra\\\001\005MJ|W\016\003\005\003\0326$\tA\001BN\003))h\016\\5oW\032\023x.\034\013\004}\nu\005b\002BK\005/\003\ra\034\005\n\005Ck\007\031!C\001\003\017\t\001\002\036:ba\026C\030\016\036\005\n\005Kk\007\031!C\001\005O\013A\002\036:ba\026C\030\016^0%KF$2A BU\021)\t9Ba)\002\002\003\007\021\021\002\005\t\005[k\007\025)\003\002\n\005IAO]1q\013bLG\017\t\025\005\005W\013y\002C\005\00346\004\r\021\"\003\0036\006QQ\r_5u%\026\f7o\0348\026\005\t]\006c\001\r\003:&\031!1\030\003\003\r\005s\027PU3g\021%\021y,\034a\001\n\023\021\t-\001\bfq&$(+Z1t_:|F%Z9\025\007y\024\031\r\003\006\002\030\tu\026\021!a\001\005oC\001Ba2nA\003&!qW\001\fKbLGOU3bg>t\007\005\003\006\003L6\004\r\021\"\001\003\003\017\t!b\0355pk2$W\t_5u\021)\021y-\034a\001\n\003\021!\021[\001\017g\"|W\017\0343Fq&$x\fJ3r)\rq(1\033\005\013\003/\021i-!AA\002\005%\001\002\003Bl[\002\006K!!\003\002\027MDw.\0367e\013bLG\017\t\005\t\0057lG\021\003\002\003^\006!Q\r_5u)\021\tYKa8\t\021\t\005(\021\034a\001\005o\013aA]3bg>t\007\002\003Bn[\022E#A!:\025\005\005-\006\002\003Bu[\022\005!Aa;\002\025\025D\030\016\036\'j].,G\r\006\002\002R!A!\021^7\005\002\t\021y\017\006\003\002R\tE\b\002\003Bq\005[\004\rAa.\t\021\tmW\016\"\001\003\005k$RA B|\005sDqA!&\003t\002\007q\016\003\005\003b\nM\b\031\001B\\\021!\021i0\034C\001\005\t}\030aC8o)\026\024X.\0338bi\026$2A`B\001\021%\t\031La?\005\002\004\021y\b\003\007\004\0065\f\t\021!C\005\007\017\031y!A\ttkB,\'\017J:uCJ$8+Z1sG\"$\002\"!\025\004\n\r-1Q\002\005\b\0033\032\031\0011\001y\021!\tifa\001A\002\005}\003\002CA4\007\007\001\r!!\033\n\t\00553\021C\005\004\007\'\021!a\002*fC\016$xN\035\005\r\007/i\027\021!A\005\n\re1QD\001\fgV\004XM\035\023sK\006\034G\017\006\003\002,\016m\001\002CA4\007+\001\r!a7\n\007\005U\'\013\003\007\004\"5\f\t\021!C\005\007G\031Y#A\ttkB,\'\017\n:fC\016$x+\033;iS:$Ba!\n\004*Q!\0211VB\024\021!\t9ga\bA\002\005m\007\002CAf\007?\001\r!!4\n\007\005}\'\013C\006\00405\f\t\021!C\005{\016E\022!D:va\026\024H\005Z8ti\006\024H/\003\003\0030\rE\001\002DB\033[\006\005\t\021\"\003\0048\rm\022aC:va\026\024He\035;beR$\"a!\017\021\t!\031\t\002_\005\005\005g\031\t\002\003\007\004@5\f\t\021!C\005\005w\031\t%\001\btkB,\'\017J4fiN#\030\r^3\n\007\te\"\013\003\007\004F5\f\t\021!C\005\005K\0349%\001\006tkB,\'\017J3ySRLAAa7\004\022!*Qna\023\004RA\031\001d!\024\n\007\r=CA\001\tTKJL\027\r\034,feNLwN\\+J\tzAQ\037\013e\004,[\003}\022K\002n\007+\0022\001GB,\023\r\031I\006\002\002\rg\026\024\030.\0317ju\006\024G.\032\005\bU&!\tAAB/)\ra7q\f\005\t\007C\032Y\0061\001\002F\005)1o\0315fI\"A1QM\005\005\002\t\0319\'A\004sC^\034V\r\0344\026\003EC\001b!\032\n\t\003\02111\016\013\004#\0165\004\002CB1\007S\002\r!!\022\t\017\rE\024\002\"\003\002D\005y\001/\031:f]R\0346\r[3ek2,\'\017C\004\004v%!\taa\036\002\025I,7/\032;Qe>D\0300F\001\177\021\035\031Y(\003C\001\007o\n\021b\0317fCJ\034V\r\0344\t\017\r}\024\002\"\001\004\002\006)\021m\031;peR\031Ana!\t\023\tu4Q\020CA\002\t}\004bBBD\023\021\0051\021R\001\be\026\f7\r^8s)\ra71\022\005\n\005{\032)\t\"a\001\007\033\003R\001\007BA\007\037\003B\001GBI}&\03111\023\003\003\023I+7\017]8oI\026\024\bbBAv\023\021\005\021Q\036\005\b\0037KA\021ABM+\021\031Yja(\025\t\ru51\025\t\005\003G\033y\n\002\005\004\"\016]%\031AAU\005\005\t\005\002CAZ\007/\003\ra!*\021\ra\tY\007_BO\021\035\tI,\003C\001\007S+Baa+\0042R!1QVB\\)\021\031yka-\021\t\005\r6\021\027\003\t\003O\0339K1\001\002*\"A\0211WBT\001\004\031)\f\005\004\031\003WB8q\026\005\t\003\027\0349\0131\001\002N\"9\021Q[\005\005\002\rmF\003BAV\007{C\001\"a-\004:\002\007\0211\034\005\b\003?LA\021ABa)\021\031\031ma2\025\t\005-6Q\031\005\t\003g\033y\f1\001\002\\\"A\0211ZB`\001\004\ti\rC\004\004L&!\ta!4\002\023\0254XM\034;m_>\004H\003BAV\007\037D\001\"a-\004J\002\007\0211\034\004\007\007\'LAa!6\003+I+7-\036:tSZ,\007K]8ys\"\013g\016\0327feN11\021\033\007\002\\^A!b!7\004R\n\005\t\025!\003R\003\005\t\007bCAZ\007#\024\t\021)A\005\0037Dq\001HBi\t\003\031y\016\006\004\004b\016\r8Q\035\t\004C\rE\007bBBm\007;\004\r!\025\005\t\003g\033i\0161\001\002\\\"A1\021^Bi\t\003\031Y/A\006jg\022+g-\0338fI\006#H\003BA\005\007[Dqaa<\004h\002\007\0010A\001n\021!\031\031p!5\005\002\rU\030!B1qa2LHc\001@\004x\"91q^By\001\004A\bbBB~\023\021\0051Q`\001\007g\026tG-\032:\026\005\005}\003b\002C\001\023\021\005A1A\001\006e\026\004H.\037\013\004}\022\025\001bBA-\007\177\004\r\001\037\005\007\t\003IA\021A?\t\017\021-\021\002\"\001\005\016\005YQ.Y5mE>D8+\033>f+\t!y\001E\002\031\t#I1\001b\005\005\005\rIe\016\036\005\b\t/IA\021\001C\r\003%\021Xm\0359p]\022|e.\006\004\005\034\021\035B1\006\013\005\t;!\t\004E\004\031\t?!\031\003b\f\n\007\021\005BAA\005Gk:\034G/[8ocA9\001$a\033\005&\021%\002\003BAR\tO!\001b!)\005\026\t\007\021\021\026\t\005\003G#Y\003\002\005\005.\021U!\031AAU\005\005\021\005#\002\r\004\022\022%\002\002CAJ\t+\001\r\001b\r\021\017a!y\002\"\016\002,B1\001$a\033\005&y4!\002\"\017\n!\003\r\nA\001C\036\005\021\021u\016Z=\026\t\021uB1K\n\004\toa\001\002\003C!\to1\t\001b\021\002\017\005tG\r\0265f]V!AQ\tC()\rqHq\t\005\n\t\023\"y\004\"a\001\t\027\nQa\034;iKJ\004R\001\007BA\t\033\002B!a)\005P\021AA\021\013C \005\004\tIKA\001c\t!!)\006b\016C\002\005%&!A1\t\017\021e\023\002b\001\005\\\0051Qn\033\"pIf,B\001\"\030\005jQ!Aq\fC6%\025!\t\007\004C3\r\035!\031\007b\026\001\t?\022A\002\020:fM&tW-\\3oiz\002R!\tC\034\tO\002B!a)\005j\021AAQ\013C,\005\004\tI\013C\005\003~\021]C\0211\001\005nA)\001D!!\005h!9!qN\005\005\002\021EDcA8\005t!9!Q\017C8\001\004y\007b\002B8\023\021\005Aq\017\013\004Y\022e\004\"\003B?\tk\"\t\031\001B@\021\035\021y)\003C\001\t{\"2A C@\021\035\021)\nb\037A\002=DqAa7\n\t\003!\031\t\006\003\002,\022\025\005\002\003Bq\t\003\003\rAa.\t\017\tm\027\002\"\001\003f\"QA1R\005\005\002\003%\t\002\"$\002\027I,\027\r\032*fg>dg/\032\013\002\031!\032\021b!\026") -public interface Actor extends scala.actors.AbstractActor, scala.actors.ReplyReactor, scala.actors.ActorCanReply, scala.actors.InputChannel<java.lang.Object>, scala.ScalaObject { - - public static interface Body<a> { - - <b> void andThen(scala.Function0<b> arg0); - } - - public static class RecursiveProxyHandler implements scala.PartialFunction<java.lang.Object,java.lang.Object>, scala.ScalaObject { - private final scala.actors.ReplyReactor a; - private final scala.PartialFunction<java.lang.Object,java.lang.Object> f; - - public <A1B1> scala.PartialFunction<A1,B1> orElse(scala.PartialFunction<A1,B1> that); - - public <C> scala.PartialFunction<java.lang.Object,C> andThen(scala.Function1<java.lang.Object,C> k); - - public scala.Function1<java.lang.Object,scala.Option<java.lang.Object>> lift(); - - public void apply$mcVI$sp(int v1); - - public boolean apply$mcZI$sp(int v1); - - public int apply$mcII$sp(int v1); - - public float apply$mcFI$sp(int v1); - - public long apply$mcJI$sp(int v1); - - public double apply$mcDI$sp(int v1); - - public void apply$mcVJ$sp(long v1); - - public boolean apply$mcZJ$sp(long v1); - - public int apply$mcIJ$sp(long v1); - - public float apply$mcFJ$sp(long v1); - - public long apply$mcJJ$sp(long v1); - - public double apply$mcDJ$sp(long v1); - - public void apply$mcVF$sp(float v1); - - public boolean apply$mcZF$sp(float v1); - - public int apply$mcIF$sp(float v1); - - public float apply$mcFF$sp(float v1); - - public long apply$mcJF$sp(float v1); - - public double apply$mcDF$sp(float v1); - - public void apply$mcVD$sp(double v1); - - public boolean apply$mcZD$sp(double v1); - - public int apply$mcID$sp(double v1); - - public float apply$mcFD$sp(double v1); - - public long apply$mcJD$sp(double v1); - - public double apply$mcDD$sp(double v1); - - public java.lang.String toString(); - - public <A> scala.Function1<A,java.lang.Object> compose(scala.Function1<A,java.lang.Object> g); - - public <A> scala.Function1<A,java.lang.Object> compose$mcVI$sp(scala.Function1<A,java.lang.Integer> g); - - public <A> scala.Function1<A,java.lang.Boolean> compose$mcZI$sp(scala.Function1<A,java.lang.Integer> g); - - public <A> scala.Function1<A,java.lang.Integer> compose$mcII$sp(scala.Function1<A,java.lang.Integer> g); - - public <A> scala.Function1<A,java.lang.Float> compose$mcFI$sp(scala.Function1<A,java.lang.Integer> g); - - public <A> scala.Function1<A,java.lang.Long> compose$mcJI$sp(scala.Function1<A,java.lang.Integer> g); - - public <A> scala.Function1<A,java.lang.Double> compose$mcDI$sp(scala.Function1<A,java.lang.Integer> g); - - public <A> scala.Function1<A,java.lang.Object> compose$mcVJ$sp(scala.Function1<A,java.lang.Long> g); - - public <A> scala.Function1<A,java.lang.Boolean> compose$mcZJ$sp(scala.Function1<A,java.lang.Long> g); - - public <A> scala.Function1<A,java.lang.Integer> compose$mcIJ$sp(scala.Function1<A,java.lang.Long> g); - - public <A> scala.Function1<A,java.lang.Float> compose$mcFJ$sp(scala.Function1<A,java.lang.Long> g); - - public <A> scala.Function1<A,java.lang.Long> compose$mcJJ$sp(scala.Function1<A,java.lang.Long> g); - - public <A> scala.Function1<A,java.lang.Double> compose$mcDJ$sp(scala.Function1<A,java.lang.Long> g); - - public <A> scala.Function1<A,java.lang.Object> compose$mcVF$sp(scala.Function1<A,java.lang.Float> g); - - public <A> scala.Function1<A,java.lang.Boolean> compose$mcZF$sp(scala.Function1<A,java.lang.Float> g); - - public <A> scala.Function1<A,java.lang.Integer> compose$mcIF$sp(scala.Function1<A,java.lang.Float> g); - - public <A> scala.Function1<A,java.lang.Float> compose$mcFF$sp(scala.Function1<A,java.lang.Float> g); - - public <A> scala.Function1<A,java.lang.Long> compose$mcJF$sp(scala.Function1<A,java.lang.Float> g); - - public <A> scala.Function1<A,java.lang.Double> compose$mcDF$sp(scala.Function1<A,java.lang.Float> g); - - public <A> scala.Function1<A,java.lang.Object> compose$mcVD$sp(scala.Function1<A,java.lang.Double> g); - - public <A> scala.Function1<A,java.lang.Boolean> compose$mcZD$sp(scala.Function1<A,java.lang.Double> g); - - public <A> scala.Function1<A,java.lang.Integer> compose$mcID$sp(scala.Function1<A,java.lang.Double> g); - - public <A> scala.Function1<A,java.lang.Float> compose$mcFD$sp(scala.Function1<A,java.lang.Double> g); - - public <A> scala.Function1<A,java.lang.Long> compose$mcJD$sp(scala.Function1<A,java.lang.Double> g); - - public <A> scala.Function1<A,java.lang.Double> compose$mcDD$sp(scala.Function1<A,java.lang.Double> g); - - public <A> scala.Function1<java.lang.Integer,A> andThen$mcVI$sp(scala.Function1<java.lang.Object,A> g); - - public <A> scala.Function1<java.lang.Integer,A> andThen$mcZI$sp(scala.Function1<java.lang.Boolean,A> g); - - public <A> scala.Function1<java.lang.Integer,A> andThen$mcII$sp(scala.Function1<java.lang.Integer,A> g); - - public <A> scala.Function1<java.lang.Integer,A> andThen$mcFI$sp(scala.Function1<java.lang.Float,A> g); - - public <A> scala.Function1<java.lang.Integer,A> andThen$mcJI$sp(scala.Function1<java.lang.Long,A> g); - - public <A> scala.Function1<java.lang.Integer,A> andThen$mcDI$sp(scala.Function1<java.lang.Double,A> g); - - public <A> scala.Function1<java.lang.Long,A> andThen$mcVJ$sp(scala.Function1<java.lang.Object,A> g); - - public <A> scala.Function1<java.lang.Long,A> andThen$mcZJ$sp(scala.Function1<java.lang.Boolean,A> g); - - public <A> scala.Function1<java.lang.Long,A> andThen$mcIJ$sp(scala.Function1<java.lang.Integer,A> g); - - public <A> scala.Function1<java.lang.Long,A> andThen$mcFJ$sp(scala.Function1<java.lang.Float,A> g); - - public <A> scala.Function1<java.lang.Long,A> andThen$mcJJ$sp(scala.Function1<java.lang.Long,A> g); - - public <A> scala.Function1<java.lang.Long,A> andThen$mcDJ$sp(scala.Function1<java.lang.Double,A> g); - - public <A> scala.Function1<java.lang.Float,A> andThen$mcVF$sp(scala.Function1<java.lang.Object,A> g); - - public <A> scala.Function1<java.lang.Float,A> andThen$mcZF$sp(scala.Function1<java.lang.Boolean,A> g); - - public <A> scala.Function1<java.lang.Float,A> andThen$mcIF$sp(scala.Function1<java.lang.Integer,A> g); - - public <A> scala.Function1<java.lang.Float,A> andThen$mcFF$sp(scala.Function1<java.lang.Float,A> g); - - public <A> scala.Function1<java.lang.Float,A> andThen$mcJF$sp(scala.Function1<java.lang.Long,A> g); - - public <A> scala.Function1<java.lang.Float,A> andThen$mcDF$sp(scala.Function1<java.lang.Double,A> g); - - public <A> scala.Function1<java.lang.Double,A> andThen$mcVD$sp(scala.Function1<java.lang.Object,A> g); - - public <A> scala.Function1<java.lang.Double,A> andThen$mcZD$sp(scala.Function1<java.lang.Boolean,A> g); - - public <A> scala.Function1<java.lang.Double,A> andThen$mcID$sp(scala.Function1<java.lang.Integer,A> g); - - public <A> scala.Function1<java.lang.Double,A> andThen$mcFD$sp(scala.Function1<java.lang.Float,A> g); - - public <A> scala.Function1<java.lang.Double,A> andThen$mcJD$sp(scala.Function1<java.lang.Long,A> g); - - public <A> scala.Function1<java.lang.Double,A> andThen$mcDD$sp(scala.Function1<java.lang.Double,A> g); - - public <R1> scala.PartialFunction<java.lang.Object,R1> unlift(scala.Predef.$less$colon$less<java.lang.Object,scala.Option<R1>> ev); - - public boolean isDefinedAt(java.lang.Object m); - - public void apply(java.lang.Object m); - - public scala.Function1 andThen(scala.Function1 g); - - public java.lang.Object apply(java.lang.Object v1); - - public RecursiveProxyHandler(scala.actors.ReplyReactor a, - scala.PartialFunction<java.lang.Object,java.lang.Object> f); - } - long serialVersionUID; - - scala.Function0<java.lang.Object> scala$actors$Actor$$super$startSearch(java.lang.Object arg0, - scala.actors.OutputChannel<java.lang.Object> arg1, - scala.PartialFunction<java.lang.Object,java.lang.Object> arg2); - - scala.runtime.Nothing$ scala$actors$Actor$$super$react(scala.PartialFunction<java.lang.Object,java.lang.Object> arg0); - - scala.runtime.Nothing$ scala$actors$Actor$$super$reactWithin(long arg0, - scala.PartialFunction<java.lang.Object,java.lang.Object> arg1); - - void scala$actors$Actor$$super$dostart(); - - scala.actors.Reactor<java.lang.Object> scala$actors$Actor$$super$start(); - - scala.Enumeration.Value scala$actors$Actor$$super$getState(); - - scala.runtime.Nothing$ scala$actors$Actor$$super$exit(); - - boolean scala$actors$Actor$$isSuspended(); - - @scala.runtime.TraitSetter - void scala$actors$Actor$$isSuspended_$eq(boolean arg0); - - scala.Option<java.lang.Object> scala$actors$Actor$$received(); - - @scala.runtime.TraitSetter - void scala$actors$Actor$$received_$eq(scala.Option<java.lang.Object> arg0); - - scala.actors.IScheduler scheduler(); - - scala.Function0<java.lang.Object> startSearch(java.lang.Object arg0, - scala.actors.OutputChannel<java.lang.Object> arg1, - scala.PartialFunction<java.lang.Object,java.lang.Object> arg2); - - void searchMailbox(scala.actors.MQueue<java.lang.Object> arg0, - scala.PartialFunction<java.lang.Object,java.lang.Object> arg1, - boolean arg2); - - java.lang.Runnable makeReaction(scala.Function0<java.lang.Object> arg0, - scala.PartialFunction<java.lang.Object,java.lang.Object> arg1, - java.lang.Object arg2); - - <R> R receive(scala.PartialFunction<java.lang.Object,R> arg0); - - <R> R receiveWithin(long arg0, - scala.PartialFunction<java.lang.Object,R> arg1); - - scala.runtime.Nothing$ react(scala.PartialFunction<java.lang.Object,java.lang.Object> arg0); - - scala.runtime.Nothing$ reactWithin(long arg0, - scala.PartialFunction<java.lang.Object,java.lang.Object> arg1); - - java.lang.Object $qmark(); - - void scheduleActor(scala.PartialFunction<java.lang.Object,java.lang.Object> arg0, - java.lang.Object arg1); - - scala.actors.Actor$blocker$ scala$actors$Actor$$blocker(); - - boolean exiting(); - - void dostart(); - - scala.actors.Actor start(); - - scala.Enumeration.Value getState(); - - scala.collection.immutable.List<scala.actors.AbstractActor> links(); - - @scala.runtime.TraitSetter - void links_$eq(scala.collection.immutable.List<scala.actors.AbstractActor> arg0); - - scala.actors.AbstractActor link(scala.actors.AbstractActor arg0); - - scala.actors.Actor link(scala.Function0<java.lang.Object> arg0); - - void linkTo(scala.actors.AbstractActor arg0); - - void unlink(scala.actors.AbstractActor arg0); - - void unlinkFrom(scala.actors.AbstractActor arg0); - - boolean trapExit(); - - @scala.runtime.TraitSetter - void trapExit_$eq(boolean arg0); - - java.lang.Object scala$actors$Actor$$exitReason(); - - @scala.runtime.TraitSetter - void scala$actors$Actor$$exitReason_$eq(java.lang.Object arg0); - - boolean shouldExit(); - - @scala.runtime.TraitSetter - void shouldExit_$eq(boolean arg0); - - scala.runtime.Nothing$ exit(java.lang.Object arg0); - - scala.runtime.Nothing$ exit(); - - scala.Function0<java.lang.Object> exitLinked(); - - scala.Function0<java.lang.Object> exitLinked(java.lang.Object arg0); - - void exit(scala.actors.AbstractActor arg0, - java.lang.Object arg1); - - void onTerminate(scala.Function0<java.lang.Object> arg0); -} diff --git a/test/pending/jvm/javasigs.scala b/test/pending/jvm/javasigs.scala deleted file mode 100644 index d18a4e6fb5..0000000000 --- a/test/pending/jvm/javasigs.scala +++ /dev/null @@ -1,78 +0,0 @@ -import java.io._ - -object Scalatest { - val outputdir = System.getProperty("partest.output", "inner.obj") - val scalalib = System.getProperty("partest.lib", "") - val classpath = outputdir + File.pathSeparator + scalalib - val javacmd = System.getProperty("javacmd", "java") - val javac = System.getProperty("javaccmd", "javac") - - def javac(src: String, opts: String, fname: String) { - val tmpfilename = outputdir + File.separator + fname - val tmpfile = new FileWriter(tmpfilename) - tmpfile.write(src) - tmpfile.close - exec(javac + " -d " + outputdir + " -classpath " + classpath + " " + opts + tmpfilename) - } - - def java(cname: String) = - exec(javacmd + " -cp " + classpath + " " + cname) - - class Slurp(in: BufferedReader) extends Thread("slurper") { - var done = false - override def run() { - while (!done) if (in.ready) println(in.readLine()) - } - } - - def slurp(in: BufferedReader): Slurp = { - val s = new Slurp(in) - s.start() - s - } - - - /** Execute cmd, wait for the process to end and pipe its output to stdout */ - def exec(cmd: String) { - val proc = Runtime.getRuntime().exec(cmd) - val inp = new BufferedReader(new InputStreamReader(proc.getInputStream)) - val errp = new BufferedReader(new InputStreamReader(proc.getErrorStream)) - val t1 = slurp(inp) - val t2 = slurp(errp) - proc.waitFor() - t1.done = true - t2.done = true - t1.join() - t2.join() - } -} - -// Test correct java signatures for anonymous classes. Enclosing method attributes should -// allow javac to see the type parameters in foo. See #3249. - -class A[U] { - def bar[B](x : => B) = x - def foo[C](c : C) : C = bar(c) -} - -object B { - def bar[B](x : => B) = x - def foo[C](c : C) : C = { - class InnerB(x: C) - c - } -} - -class B { - def foo {} -} - -object Test { - def main(args: Array[String]) { - import Scalatest._ - exec("%s -Xprint -cp %s A".format(javac, classpath)) - exec("%s -Xprint -cp %s B".format(javac, classpath)) - exec("%s -Xprint -cp %s A$$anonfun$foo$1".format(javac, classpath)) - exec("%s -Xprint -cp %s scala.actors.Actor".format(javac, classpath)) - } -} diff --git a/test/pending/jvm/t2705/GenericInterface.java b/test/pending/jvm/t2705/GenericInterface.java deleted file mode 100644 index ff4ecd403d..0000000000 --- a/test/pending/jvm/t2705/GenericInterface.java +++ /dev/null @@ -1 +0,0 @@ -public interface GenericInterface<T> { } diff --git a/test/pending/jvm/t2705/Methods.java b/test/pending/jvm/t2705/Methods.java deleted file mode 100644 index 00eed6c595..0000000000 --- a/test/pending/jvm/t2705/Methods.java +++ /dev/null @@ -1,4 +0,0 @@ -public class Methods { - public static <T> GenericInterface<T> getGenericInterface() { return null; } - public static <T> void acceptGenericInterface(GenericInterface<? super T> gi) { } -}
\ No newline at end of file diff --git a/test/pending/jvm/t2705/t2705.scala b/test/pending/jvm/t2705/t2705.scala deleted file mode 100644 index cc3cfd9faf..0000000000 --- a/test/pending/jvm/t2705/t2705.scala +++ /dev/null @@ -1,5 +0,0 @@ -class GenericsCompilerCrashTest { - def test() { - Methods.acceptGenericInterface(Methods.getGenericInterface()) - } -}
\ No newline at end of file diff --git a/test/pending/neg/dot-classpath.flags b/test/pending/neg/dot-classpath.flags deleted file mode 100644 index 5af7a81156..0000000000 --- a/test/pending/neg/dot-classpath.flags +++ /dev/null @@ -1 +0,0 @@ --Ylog-classpath
\ No newline at end of file diff --git a/test/pending/neg/dot-classpath/S_1.scala b/test/pending/neg/dot-classpath/S_1.scala deleted file mode 100644 index f8bd12404c..0000000000 --- a/test/pending/neg/dot-classpath/S_1.scala +++ /dev/null @@ -1,3 +0,0 @@ -package foo { - class Bippy -} diff --git a/test/pending/neg/dot-classpath/S_2.scala b/test/pending/neg/dot-classpath/S_2.scala deleted file mode 100644 index e44c1a5bb8..0000000000 --- a/test/pending/neg/dot-classpath/S_2.scala +++ /dev/null @@ -1,3 +0,0 @@ -class A { - def f = new foo.Bippy -}
\ No newline at end of file diff --git a/test/pending/neg/macro-invalidusage-badbounds-b.check b/test/pending/neg/macro-invalidusage-badbounds-b.check deleted file mode 100644 index 277f407d38..0000000000 --- a/test/pending/neg/macro-invalidusage-badbounds-b.check +++ /dev/null @@ -1,4 +0,0 @@ -Macros_Test_2.scala:7: error: type arguments [Int] do not conform to macro method foo's type parameter bounds [U <: String] - foo[Int] - ^ -one error found diff --git a/test/pending/neg/macro-invalidusage-badbounds-b.flags b/test/pending/neg/macro-invalidusage-badbounds-b.flags deleted file mode 100644 index cd66464f2f..0000000000 --- a/test/pending/neg/macro-invalidusage-badbounds-b.flags +++ /dev/null @@ -1 +0,0 @@ --language:experimental.macros
\ No newline at end of file diff --git a/test/pending/neg/macro-invalidusage-badbounds-b/Impls_1.scala b/test/pending/neg/macro-invalidusage-badbounds-b/Impls_1.scala deleted file mode 100644 index be47d5cec4..0000000000 --- a/test/pending/neg/macro-invalidusage-badbounds-b/Impls_1.scala +++ /dev/null @@ -1,5 +0,0 @@ -import scala.reflect.macros.blackbox.Context - -object Impls { - def foo[U <: String](c: Context) = ??? -} diff --git a/test/pending/neg/macro-invalidusage-badbounds-b/Macros_Test_2.scala b/test/pending/neg/macro-invalidusage-badbounds-b/Macros_Test_2.scala deleted file mode 100644 index 3139599108..0000000000 --- a/test/pending/neg/macro-invalidusage-badbounds-b/Macros_Test_2.scala +++ /dev/null @@ -1,8 +0,0 @@ -object Macros { - def foo[U <: String] = macro Impls.foo[U] -} - -object Test extends App { - import Macros._ - foo[Int] -}
\ No newline at end of file diff --git a/test/pending/neg/reify_packed.check b/test/pending/neg/reify_packed.check deleted file mode 100644 index f26b902896..0000000000 --- a/test/pending/neg/reify_packed.check +++ /dev/null @@ -1,4 +0,0 @@ -reify_packed.scala:6: error: implementation restriction: cannot reify block of type List[_$1] that involves a type declared inside the block being reified. consider casting the return value to a suitable type. - reify { - ^ -one error found diff --git a/test/pending/neg/reify_packed.scala b/test/pending/neg/reify_packed.scala deleted file mode 100644 index 7bdaa41915..0000000000 --- a/test/pending/neg/reify_packed.scala +++ /dev/null @@ -1,15 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.reflect.runtime.{universe => ru} -import scala.reflect.runtime.{currentMirror => cm} -import scala.tools.reflect.ToolBox - -object Test extends App { - reify { - class C { override def toString() = "C" } - val ret = List((new C, new C)) - ret.asInstanceOf[List[_]] - }; - - val toolbox = cm.mkToolBox() - println(toolbox.eval(code.tree)) -}
\ No newline at end of file diff --git a/test/pending/neg/t0653.scala b/test/pending/neg/t0653.scala deleted file mode 100644 index 26204a8b40..0000000000 --- a/test/pending/neg/t0653.scala +++ /dev/null @@ -1,30 +0,0 @@ -// What is this test in place to test for? -// -class One[A] -class Two[A, B] -class Fix[Op[A]](x : Op[Fix[Op]]) - -class FixTest { - // works - // val zero = new Fix[One](new One) - - // don't work: - val two = new Fix(new Two) // this was what I found here - val zero = new Fix(new One) // this seems like something which could plausibly work - - // neg/t0653.scala:12: error: no type parameters for constructor Fix: (x: Op[Fix[Op[A]]])Fix[Op[A]] exist so that it can be applied to arguments (Two[Nothing,Nothing]) - // --- because --- - // argument expression's type is not compatible with formal parameter type; - // found : Two[Nothing,Nothing] - // required: ?Op[ Fix[?Op[ A ]] ] - // val two = new Fix(new Two) // this was what I found here - // ^ - // neg/t0653.scala:13: error: no type parameters for constructor Fix: (x: Op[Fix[Op[A]]])Fix[Op[A]] exist so that it can be applied to arguments (One[Nothing]) - // --- because --- - // argument expression's type is not compatible with formal parameter type; - // found : One[Nothing] - // required: ?Op[ Fix[?Op[ A ]] ] - // val zero = new Fix(new One) // this seems like something which could plausibly work - // ^ - // two errors found -} diff --git a/test/pending/neg/t1557.scala b/test/pending/neg/t1557.scala deleted file mode 100644 index ba93b45fad..0000000000 --- a/test/pending/neg/t1557.scala +++ /dev/null @@ -1,18 +0,0 @@ -object Test extends App { - trait A - trait B extends A - - trait C { - trait D { type T >: B <: A } - val y: (D with this.type)#T = new B { } - } - - class D extends C { - trait E - type T = E - def frob(arg : E) : E = arg - frob(y) - } - - new D -}
\ No newline at end of file diff --git a/test/pending/neg/t1800.scala b/test/pending/neg/t1800.scala deleted file mode 100644 index eebbbad9c7..0000000000 --- a/test/pending/neg/t1800.scala +++ /dev/null @@ -1,28 +0,0 @@ -object ObjectHolder { - private[ObjectHolder] class PrivateObject - def getPrivateObject = new PrivateObject -} - -object Test { - def main(args: Array[String]) { - // compiler error: class PrivateObject cannot be accessed - // in object test.ObjectHolder - val a: ObjectHolder.PrivateObject = ObjectHolder.getPrivateObject - - // works fine - val b = ObjectHolder.getPrivateObject - println(b.getClass) - } -} -/* -When declaring objects as private[package/object] or protected[package/object] it is possible to leak out references to these objects into the public api (can be desirable, this in itself is not a problem). - -When users of the api receive such private object via a function call, they can create a variable to reference the private object using inferred typing: - -val b = getPrivateObject() - -However they cannot create such variable using declared typing: - -val a: PrivateObject? = getPrivateObject() - -The line above will generate a compiler error: "class PrivateObject? cannot be accessed". Which makes sense, because PrivateObject? was declared private. But in this case inferred typing should not work either, otherwise the behaviors of inferred typing and declared typing become inconsistent. */ diff --git a/test/pending/neg/t2080.scala b/test/pending/neg/t2080.scala deleted file mode 100644 index 3f4306c091..0000000000 --- a/test/pending/neg/t2080.scala +++ /dev/null @@ -1,17 +0,0 @@ -trait A { - type T - def f(x : T) : T -} - -trait B extends A { - trait T { } - override def f(x : T) : T = x -} - -object C extends B { - override trait T { - def g { } - } - override def f(x : T) : T = { x.g; x } -} -//It compiles without errors, but T in B and T in C are completely unrelated types. diff --git a/test/pending/neg/t3152.scala b/test/pending/neg/t3152.scala deleted file mode 100644 index 3abc772076..0000000000 --- a/test/pending/neg/t3152.scala +++ /dev/null @@ -1,8 +0,0 @@ -package test - -object NotEnclosing { - def main(args : Array[String]) : Unit = {} - def compare[T](x: Ordered[T], y: Ordered[T]) = error("") - def mkEx: Ordered[_] = error("") - compare(mkEx, mkEx) -} diff --git a/test/pending/neg/t3633/test/Test.scala b/test/pending/neg/t3633/test/Test.scala deleted file mode 100644 index 395a6be6f4..0000000000 --- a/test/pending/neg/t3633/test/Test.scala +++ /dev/null @@ -1,23 +0,0 @@ -package test - -final class Test extends PackageProtected { - def bar = foo -} - -package another { - object Main { - def t1(t: Test) { - // Can always be replicated. - println(t.foo) - } - def t2(t: Test) { - // Conditions to replicate: must use -optimise, class Test must be final - println(t.bar) - //@noinline is a usable workaround - } - def main(args: Array[String]) { - t1(new Test) - t2(new Test) - } - } -} diff --git a/test/pending/neg/t5008.scala b/test/pending/neg/t5008.scala deleted file mode 100644 index 2b20bcfe12..0000000000 --- a/test/pending/neg/t5008.scala +++ /dev/null @@ -1,165 +0,0 @@ -// These are members of class bar.C, completely unrelated to class foo.A. -// The types shown below include types defined within foo.A which are: -// -// - qualified private -// - qualified protected -// - object protected -// -// val a : foo.A = { /* compiled code */ } -// val xprot1 : java.lang.Object with foo.A.FooProt1 = { /* compiled code */ } -// val xprot2 : java.lang.Object with foo.A.FooProt2 = { /* compiled code */ } -// val xprot3 : java.lang.Object with foo.A.FooProt3 = { /* compiled code */ } -// val xprot4 : java.lang.Object with foo.A.FooProt4 = { /* compiled code */ } -// val xpriv3 : java.lang.Object with foo.A.FooPriv3 = { /* compiled code */ } -// val xpriv4 : java.lang.Object with foo.A.FooPriv4 = { /* compiled code */ } -// -// Indeed it will tell me a type which I cannot access: -// -// scala> new bar.C -// res0: bar.C = bar.C@1339a0dc -// -// scala> res0.xpriv3 -// res1: java.lang.Object with res0.a.FooPriv3 = bar.C$$anon$29@39556aec -// -// scala> new res0.a.FooPriv3 -// <console>:9: error: trait FooPriv3 in class A cannot be accessed in foo.A -// new res0.a.FooPriv3 -// ^ -// Looking at how the compiler prints the types of those vals, one -// develops a suspicion how some of it is being allowed: -// -// val xpriv4: C.this.a.FooPriv4 -// val xpriv3: C.this.a.FooPriv3 -// val xprot4: C.this.a.FooProt4 -// val xprot3: C.this.a.FooProt3 -// val xprot2: C.this.a.FooProt2 -// val xprot1: C.this.a.FooProt1 -// -// That is, "this" is in the prefix somewhere, it's just not a "this" -// which has any bearing. - -package foo { - class A { - trait Foo - - protected trait FooProt1 - protected[this] trait FooProt2 - protected[foo] trait FooProt3 - protected[A] trait FooProt4 - - private trait FooPriv1 - private[this] trait FooPriv2 - private[foo] trait FooPriv3 - private[A] trait FooPriv4 - - type BarProt1 = FooProt1 - type BarProt2 = FooProt2 - type BarProt3 = FooProt3 - type BarProt4 = FooProt4 - - // type BarPriv1 = FooPriv1 - // type BarPriv2 = FooPriv2 - type BarPriv3 = FooPriv3 - type BarPriv4 = FooPriv4 - - def fprot1(x: FooProt1) = x - def fprot2(x: FooProt2) = x - def fprot3(x: FooProt3) = x - def fprot4(x: FooProt4) = x - - // def fpriv1(x: FooPriv1) = x - // def fpriv2(x: FooPriv2) = x - def fpriv3(x: FooPriv3) = x - def fpriv4(x: FooPriv4) = x - - val yprot1 = new FooProt1 { } - val yprot2 = new FooProt2 { } - val yprot3 = new FooProt3 { } - val yprot4 = new FooProt4 { } - - // val ypriv1 = new FooPriv1 { } - // val ypriv2 = new FooPriv2 { } - val ypriv3 = new FooPriv3 { } - val ypriv4 = new FooPriv4 { } - - def fpriv_alt1(x: FooPriv1) = 0 // !!! isn't the private type now in the signature of the (public) method? - def fpriv_alt2(x: FooPriv2) = 0 // !!! isn't the private[this] type now in the signature of the (public) method? - } - // Same package, subclass - class B extends A { - val xprot1 = new BarProt1 { } - val xprot2 = new BarProt2 { } - val xprot3 = new BarProt3 { } - val xprot4 = new BarProt4 { } - - // val xpriv1 = new BarPriv1 { } - // val xpriv2 = new BarPriv2 { } - val xpriv3 = new BarPriv3 { } - val xpriv4 = new BarPriv4 { } - - override def fprot1(x: BarProt1) = x - override def fprot2(x: BarProt2) = x - override def fprot3(x: BarProt3) = x - override def fprot4(x: BarProt4) = x - - // override def fpriv1(x: BarPriv1) = x - // override def fpriv2(x: BarPriv2) = x - override def fpriv3(x: BarPriv3) = x - override def fpriv4(x: BarPriv4) = x - } - // Same package, unrelated class - class C { - val a = new A - import a._ - - val xprot1 = new BarProt1 { } - val xprot2 = new BarProt2 { } - val xprot3 = new BarProt3 { } - val xprot4 = new BarProt4 { } - - // val xpriv1 = new BarPriv1 { } - // val xpriv2 = new BarPriv2 { } - val xpriv3 = new BarPriv3 { } - val xpriv4 = new BarPriv4 { } - } -} - -package bar { - // Different package, subclass - class B extends foo.A { - val xprot1 = new BarProt1 { } - val xprot2 = new BarProt2 { } - val xprot3 = new BarProt3 { } - val xprot4 = new BarProt4 { } - - // val xpriv1 = new BarPriv1 { } - // val xpriv2 = new BarPriv2 { } - val xpriv3 = new BarPriv3 { } - val xpriv4 = new BarPriv4 { } - - override def fprot1(x: BarProt1) = x - override def fprot2(x: BarProt2) = x - override def fprot3(x: BarProt3) = x - override def fprot4(x: BarProt4) = x - - // override def fpriv1(x: BarPriv1) = x - // override def fpriv2(x: BarPriv2) = x - override def fpriv3(x: BarPriv3) = x - override def fpriv4(x: BarPriv4) = x - } - // Different package, unrelated class - class C { - val a = new foo.A - import a._ - - val xprot1 = new BarProt1 { } - val xprot2 = new BarProt2 { } - val xprot3 = new BarProt3 { } - val xprot4 = new BarProt4 { } - - // val xpriv1 = new BarPriv1 { } - // val xpriv2 = new BarPriv2 { } - val xpriv3 = new BarPriv3 { } - val xpriv4 = new BarPriv4 { } - } -} diff --git a/test/pending/neg/t5589neg.check b/test/pending/neg/t5589neg.check deleted file mode 100644 index f1dad94df3..0000000000 --- a/test/pending/neg/t5589neg.check +++ /dev/null @@ -1,37 +0,0 @@ -t5589neg.scala:2: warning: `withFilter' method does not yet exist on scala.util.Either.RightProjection[Int,String], using `filter' method instead - def f5(x: Either[Int, String]) = for ((y1, y2: String) <- x.right) yield ((y1, y2)) - ^ -t5589neg.scala:2: error: constructor cannot be instantiated to expected type; - found : (T1, T2) - required: String - def f5(x: Either[Int, String]) = for ((y1, y2: String) <- x.right) yield ((y1, y2)) - ^ -t5589neg.scala:3: warning: `withFilter' method does not yet exist on scala.util.Either.RightProjection[Int,String], using `filter' method instead - def f6(x: Either[Int, String]) = for ((y1, y2: Any) <- x.right) yield ((y1, y2)) - ^ -t5589neg.scala:3: error: constructor cannot be instantiated to expected type; - found : (T1, T2) - required: String - def f6(x: Either[Int, String]) = for ((y1, y2: Any) <- x.right) yield ((y1, y2)) - ^ -t5589neg.scala:4: error: constructor cannot be instantiated to expected type; - found : (T1,) - required: (String, Int) - def f7(x: Either[Int, (String, Int)]) = for (y1 @ Tuple1(y2) <- x.right) yield ((y1, y2)) - ^ -t5589neg.scala:4: error: not found: value y2 - def f7(x: Either[Int, (String, Int)]) = for (y1 @ Tuple1(y2) <- x.right) yield ((y1, y2)) - ^ -t5589neg.scala:5: error: constructor cannot be instantiated to expected type; - found : (T1, T2, T3) - required: (String, Int) - def f8(x: Either[Int, (String, Int)]) = for ((y1, y2, y3) <- x.right) yield ((y1, y2)) - ^ -t5589neg.scala:5: error: not found: value y1 - def f8(x: Either[Int, (String, Int)]) = for ((y1, y2, y3) <- x.right) yield ((y1, y2)) - ^ -t5589neg.scala:5: error: not found: value y2 - def f8(x: Either[Int, (String, Int)]) = for ((y1, y2, y3) <- x.right) yield ((y1, y2)) - ^ -two warnings found -7 errors found diff --git a/test/pending/neg/t5589neg.flags b/test/pending/neg/t5589neg.flags deleted file mode 100644 index dcc59ebe32..0000000000 --- a/test/pending/neg/t5589neg.flags +++ /dev/null @@ -1 +0,0 @@ --deprecation diff --git a/test/pending/neg/t5589neg.scala b/test/pending/neg/t5589neg.scala deleted file mode 100644 index 31ff2c3693..0000000000 --- a/test/pending/neg/t5589neg.scala +++ /dev/null @@ -1,6 +0,0 @@ -class A { - def f5(x: Either[Int, String]) = for ((y1, y2: String) <- x.right) yield ((y1, y2)) - def f6(x: Either[Int, String]) = for ((y1, y2: Any) <- x.right) yield ((y1, y2)) - def f7(x: Either[Int, (String, Int)]) = for (y1 @ Tuple1(y2) <- x.right) yield ((y1, y2)) - def f8(x: Either[Int, (String, Int)]) = for ((y1, y2, y3) <- x.right) yield ((y1, y2)) -} diff --git a/test/pending/neg/t5589neg2.check b/test/pending/neg/t5589neg2.check deleted file mode 100644 index 6af4955a83..0000000000 --- a/test/pending/neg/t5589neg2.check +++ /dev/null @@ -1,9 +0,0 @@ -t5589neg2.scala:7: error: constructor cannot be instantiated to expected type; - found : (T1, T2) - required: String - for (((((a, (b, (c, (d1, d2)))), es), fs), gs) <- x) yield (d :: es).mkString(", ") // not ok - ^ -t5589neg2.scala:7: error: not found: value d - for (((((a, (b, (c, (d1, d2)))), es), fs), gs) <- x) yield (d :: es).mkString(", ") // not ok - ^ -two errors found diff --git a/test/pending/neg/t5589neg2.scala b/test/pending/neg/t5589neg2.scala deleted file mode 100644 index b7c7ab7218..0000000000 --- a/test/pending/neg/t5589neg2.scala +++ /dev/null @@ -1,13 +0,0 @@ -class A { - def f1(x: List[((((Int, (Double, (Float, String))), List[String]), List[Int]), List[Float])]) = { - for (((((a, (b, (c, d))), es), fs), gs) <- x) yield (d :: es).mkString(", ") // ok - } - - def f2(x: List[((((Int, (Double, (Float, String))), List[String]), List[Int]), List[Float])]) = { - for (((((a, (b, (c, (d1, d2)))), es), fs), gs) <- x) yield (d :: es).mkString(", ") // not ok - } - - def f3(x: List[((((Int, (Double, (Float, String))), List[String]), List[Int]), List[Float])]) = { - for (((((a, (b, _)), es), fs), gs) <- x) yield (es ::: fs).mkString(", ") // ok - } -}
\ No newline at end of file diff --git a/test/pending/neg/t5618.check b/test/pending/neg/t5618.check deleted file mode 100644 index 118e812ae4..0000000000 --- a/test/pending/neg/t5618.check +++ /dev/null @@ -1,7 +0,0 @@ -t5618.scala:12: error: could not find implicit value for parameter class1: Class1 - val class2 = new Class2 - ^ -t5618.scala:18: error: could not find implicit value for parameter class1: Class1 - val class2 = new Class2 - ^ -two errors found
\ No newline at end of file diff --git a/test/pending/neg/t5618.scala b/test/pending/neg/t5618.scala deleted file mode 100644 index 66e06787f1..0000000000 --- a/test/pending/neg/t5618.scala +++ /dev/null @@ -1,27 +0,0 @@ - - - - -case class Class1 - - -case class Class2(implicit class1: Class1) - - -object Test1 { - val class2 = new Class2 - implicit val class1 = new Class1 -} - - -object Test2 { - val class2 = new Class2 - implicit val class1: Class1 = new Class1 -} - - -object Test3 { - implicit val class1 = new Class1 - val class2 = new Class2 -} - diff --git a/test/pending/neg/t5729.check b/test/pending/neg/t5729.check deleted file mode 100644 index 10c13db8b6..0000000000 --- a/test/pending/neg/t5729.check +++ /dev/null @@ -1,7 +0,0 @@ -t5729.scala:5: error: ambiguous reference to overloaded definition, -both method join in object Test of type [S](in: Seq[T[S]])String -and method join in object Test of type (in: Seq[T[_]])Int -match argument types (Seq[T[_]]) - join(null: Seq[T[_]]) - ^ -one error found diff --git a/test/pending/neg/t5729.scala b/test/pending/neg/t5729.scala deleted file mode 100644 index 9fd9c9ffbb..0000000000 --- a/test/pending/neg/t5729.scala +++ /dev/null @@ -1,6 +0,0 @@ -trait T[X] -object Test { - def join(in: Seq[T[_]]): Int = ??? - def join[S](in: Seq[T[S]]): String = ??? - join(null: Seq[T[_]]) -}
\ No newline at end of file diff --git a/test/pending/neg/t6375.check b/test/pending/neg/t6375.check deleted file mode 100644 index 89d7d8060f..0000000000 --- a/test/pending/neg/t6375.check +++ /dev/null @@ -1,27 +0,0 @@ -t6375.scala:6: warning: no valid targets for annotation on value x1 - it is discarded unused. You may specify targets with meta-annotations, e.g. @(Bippy @getter) - @Bippy val x1: Int // warn - ^ -t6375.scala:7: warning: no valid targets for annotation on value x2 - it is discarded unused. You may specify targets with meta-annotations, e.g. @(Bippy @scala.annotation.meta.field @getter) - @(Bippy @field) val x2: Int // warn - ^ -t6375.scala:9: warning: no valid targets for annotation on value x4 - it is discarded unused. You may specify targets with meta-annotations, e.g. @(Bippy @scala.annotation.meta.setter @getter) - @(Bippy @setter) val x4: Int // warn - ^ -t6375.scala:10: warning: no valid targets for annotation on value x5 - it is discarded unused. You may specify targets with meta-annotations, e.g. @(Bippy @scala.annotation.meta.param @getter) - @(Bippy @param) val x5: Int // warn - ^ -t6375.scala:20: warning: no valid targets for annotation on value q1 - it is discarded unused. You may specify targets with meta-annotations, e.g. @(Bippy @scala.annotation.meta.getter @field) - @(Bippy @getter) private[this] val q1: Int = 1 // warn - ^ -t6375.scala:40: warning: no valid targets for annotation on value p2 - it is discarded unused. You may specify targets with meta-annotations, e.g. @(Bippy @scala.annotation.meta.getter @param) - @(Bippy @getter) p2: Int, // warn - ^ -t6375.scala:41: warning: no valid targets for annotation on value p3 - it is discarded unused. You may specify targets with meta-annotations, e.g. @(Bippy @scala.annotation.meta.setter @param) - @(Bippy @setter) p3: Int, // warn - ^ -t6375.scala:42: warning: no valid targets for annotation on value p4 - it is discarded unused. You may specify targets with meta-annotations, e.g. @(Bippy @scala.annotation.meta.field @param) - @(Bippy @field) p4: Int // warn - ^ -error: No warnings can be incurred under -Xfatal-warnings. -8 warnings found -one error found diff --git a/test/pending/neg/t6375.flags b/test/pending/neg/t6375.flags deleted file mode 100644 index 85d8eb2ba2..0000000000 --- a/test/pending/neg/t6375.flags +++ /dev/null @@ -1 +0,0 @@ --Xfatal-warnings diff --git a/test/pending/neg/t6375.scala b/test/pending/neg/t6375.scala deleted file mode 100644 index 21634df688..0000000000 --- a/test/pending/neg/t6375.scala +++ /dev/null @@ -1,67 +0,0 @@ -import scala.annotation.meta._ - -class Bippy extends scala.annotation.StaticAnnotation - -abstract class Foo { - @Bippy val x1: Int // warn - @(Bippy @field) val x2: Int // warn - @(Bippy @getter) val x3: Int // no warn - @(Bippy @setter) val x4: Int // warn - @(Bippy @param) val x5: Int // warn -} - -object Bar extends Foo { - val x1 = 1 - val x2 = 2 - val x3 = 3 - val x4 = 4 - val x5 = 5 - - @(Bippy @getter) private[this] val q1: Int = 1 // warn - @(Bippy @getter) private val q2: Int = 1 // no warn - - def f1(@(Bippy @param) x: Int): Int = 0 // no warn - def f2(@(Bippy @getter) x: Int): Int = 0 // warn - todo - def f3(@(Bippy @setter) x: Int): Int = 0 // warn - todo - def f4(@(Bippy @field) x: Int): Int = 0 // warn - todo - def f5(@Bippy x: Int): Int = 0 // no warn - - @(Bippy @companionClass) def g1(x: Int): Int = 0 // warn - todo - @(Bippy @companionObject) def g2(x: Int): Int = 0 // warn - todo - @(Bippy @companionMethod) def g3(x: Int): Int = 0 // no warn - @Bippy def g4(x: Int): Int = 0 // no warn - - @(Bippy @companionObject @companionMethod) def g5(x: Int): Int = 0 // no warn -} - -class Dingo( - @Bippy p0: Int, // no warn - @(Bippy @param) p1: Int, // no warn - @(Bippy @getter) p2: Int, // warn - @(Bippy @setter) p3: Int, // warn - @(Bippy @field) p4: Int // warn -) - -class ValDingo( - @Bippy val p0: Int, // no warn - @(Bippy @param) val p1: Int, // no warn - @(Bippy @getter) val p2: Int, // no warn - @(Bippy @setter) val p3: Int, // warn - todo - @(Bippy @field) val p4: Int // no warn -) - -class VarDingo( - @Bippy var p0: Int, // no warn - @(Bippy @param) var p1: Int, // no warn - @(Bippy @getter) var p2: Int, // no warn - @(Bippy @setter) var p3: Int, // no warn - @(Bippy @field) var p4: Int // no warn -) - -case class CaseDingo( - @Bippy p0: Int, // no warn - @(Bippy @param) p1: Int, // no warn - @(Bippy @getter) p2: Int, // no warn - @(Bippy @setter) p3: Int, // warn - todo - @(Bippy @field) p4: Int // no warn -) diff --git a/test/pending/neg/t7441.check b/test/pending/neg/t7441.check deleted file mode 100644 index f259457197..0000000000 --- a/test/pending/neg/t7441.check +++ /dev/null @@ -1,6 +0,0 @@ -t7441.scala:4: error: type mismatch; - found : Int(1) - required: List[Any] - def test = apply(1) - ^ -one error found diff --git a/test/pending/neg/t7441.scala b/test/pending/neg/t7441.scala deleted file mode 100644 index dad7421e3f..0000000000 --- a/test/pending/neg/t7441.scala +++ /dev/null @@ -1,7 +0,0 @@ -object Test { - object Bar { - def apply(xs: List[Any]): Int = 0 - def test = apply(1) - } - implicit def foo = 1 -} diff --git a/test/pending/neg/t7886.scala b/test/pending/neg/t7886.scala deleted file mode 100644 index 55d80a0a43..0000000000 --- a/test/pending/neg/t7886.scala +++ /dev/null @@ -1,22 +0,0 @@ -trait Covariant[+A] -trait Contra[-A] { def accept(p: A): Unit } -trait Invariant[A] extends Covariant[A] with Contra[A] - -case class Unravel[A](m: Contra[A], msg: A) - -object Test extends Covariant[Any] { - def g(m: Contra[Any]): Unit = m accept 5 - def f(x: Any): Unit = x match { - case Unravel(m, msg) => g(m) - case _ => - } - def main(args: Array[String]) { - f(Unravel[String](new Contra[String] { def accept(x: String) = x.length }, "")) - } -} -// java.lang.ClassCastException: java.lang.Integer cannot be cast to java.lang.String -// at Test$$anon$1.accept(a.scala:18) -// at Test$.g(a.scala:13) -// at Test$.f(a.scala:15) -// at Test$.main(a.scala:18) -// at Test.main(a.scala) diff --git a/test/pending/neg/t7886b.scala b/test/pending/neg/t7886b.scala deleted file mode 100644 index 1db8be9821..0000000000 --- a/test/pending/neg/t7886b.scala +++ /dev/null @@ -1,23 +0,0 @@ -trait Covariant[+A] -trait Contra[-A] { def accept(p: A): Unit } -trait Invariant[A] extends Covariant[A] with Contra[A] - -trait T -case class Unravel[A](m: Contra[A], msg: A) extends T - -object Test extends Covariant[Any] { - def g(m: Contra[Any]): Unit = m accept 5 - def f(x: T): Unit = x match { - case Unravel(m, msg) => g(m) - case _ => - } - def main(args: Array[String]) { - f(Unravel[String](new Contra[String] { def accept(x: String) = x.length }, "")) - } -} -// java.lang.ClassCastException: java.lang.Integer cannot be cast to java.lang.String -// at Test$$anon$1.accept(a.scala:18) -// at Test$.g(a.scala:13) -// at Test$.f(a.scala:15) -// at Test$.main(a.scala:18) -// at Test.main(a.scala) diff --git a/test/pending/neg/t8079d.check b/test/pending/neg/t8079d.check deleted file mode 100644 index f63f4902f8..0000000000 --- a/test/pending/neg/t8079d.check +++ /dev/null @@ -1,4 +0,0 @@ -t8079d.scala:3: error: contravariant type I occurs in covariant position in type C.this.X of value b - def f2(b: X): Unit - ^ -one error found diff --git a/test/pending/neg/t8079d.scala b/test/pending/neg/t8079d.scala deleted file mode 100644 index ad420b99e3..0000000000 --- a/test/pending/neg/t8079d.scala +++ /dev/null @@ -1,4 +0,0 @@ -trait C[-I] { - protected[this] type X = C[I] - def f2(b: X): Unit -} diff --git a/test/pending/neg/tcpoly_typealias_eta.scala b/test/pending/neg/tcpoly_typealias_eta.scala deleted file mode 100644 index 033c911f7c..0000000000 --- a/test/pending/neg/tcpoly_typealias_eta.scala +++ /dev/null @@ -1,46 +0,0 @@ -trait A { - type m[+x] -} - -trait A2 { - type m[+x <: String] -} - -trait A3 { - type m[x] -} - -trait FooCov[+x] -trait FooCon[-x] -trait FooBound[+x <: String] - -trait BOk1 extends A { - type m/*[+x]*/ = FooCov/*[x]*/ -} - -trait BOk2 extends A2 { - type m/*[+x <: String]*/ = FooBound/*[x]*/ -} - -trait BOk3 extends A2 { - type m/*[+x]*/ = FooCov/*[x]*/ // weaker bound -} - -trait BOk4 extends A3 { - type m/*[+x]*/ = FooCov/*[x]*/ // weaker variance -} - -// there are two aspects to check: - // does type alias signature (not considering RHS) correspond to abstract type member in super class - // does RHS correspond to the type alias sig -trait BInv extends A{ - type m/*[x]*/ = FooCov/*[x]*/ // error: invariant x in alias def -} - -trait BCon extends A{ - type m/*[-x]*/ = FooCon/*[x]*/ // error: contravariant x -} - -trait BBound extends A{ - type m/*[+x <: String]*/ = FooBound/*[x]*/ // error: x with stricter bound -} diff --git a/test/pending/neg/tcpoly_variance_enforce_getter_setter.scala b/test/pending/neg/tcpoly_variance_enforce_getter_setter.scala deleted file mode 100644 index deafba8d8a..0000000000 --- a/test/pending/neg/tcpoly_variance_enforce_getter_setter.scala +++ /dev/null @@ -1,12 +0,0 @@ -trait coll[+m[+x]] - -class FooInvar[x] -class FooContra[-x] -class FooCov[+x] - -object test { - var ok: coll[FooCov] = _ - - var x: coll[FooInvar] = _ // TODO: error should be reported only once instead of separately for getter and setter - var y: coll[FooContra] = _ -} diff --git a/test/pending/neg/type-diagnostics.scala b/test/pending/neg/type-diagnostics.scala deleted file mode 100644 index a3a9172bb2..0000000000 --- a/test/pending/neg/type-diagnostics.scala +++ /dev/null @@ -1,11 +0,0 @@ -object TooManyParens { - def f = Map(1 -> 2).keySet() - // - // Confusion reigns! - // - // work/a.scala:27: error: not enough arguments for method apply: (elem: Int)Boolean in trait SetLike. - // Unspecified value parameter elem. - // def f = Map(1 -> 2).keySet() - // ^ - -} diff --git a/test/pending/pos/bug4704.scala b/test/pending/pos/bug4704.scala deleted file mode 100644 index 6af719adf7..0000000000 --- a/test/pending/pos/bug4704.scala +++ /dev/null @@ -1,36 +0,0 @@ -trait Bar { - def f1 = super.hashCode - def f2 = super[Object].hashCode - def f3 = super[ScalaObject].hashCode - - override def hashCode = 1 -} -trait Barzoo { - def g1 = super.hashCode - def g2 = super[Object].hashCode - def g3 = super[ScalaObject].hashCode - - override def hashCode = 2 -} - -trait Foo extends Bar with Barzoo { - def f4 = super.hashCode - def f5 = super[Object].hashCode - def f6 = super[ScalaObject].hashCode - def f6b = super[Bar].hashCode - def g4 = super[Barzoo].hashCode - - override def hashCode = super[Bar].hashCode + super[Barzoo].hashCode -} - -class Quux extends Foo { - override def hashCode = super.hashCode + super[Object].hashCode + super[ScalaObject].hashCode + super[Foo].hashCode -} - -trait Borp extends Quux { - def f12 = super.hashCode - def f14 = super[ScalaObject].hashCode - def f15 = super[Quux].hashCode - override def hashCode = super[Quux].hashCode -} - diff --git a/test/pending/pos/inference.scala b/test/pending/pos/inference.scala deleted file mode 100644 index ee462b6bcc..0000000000 --- a/test/pending/pos/inference.scala +++ /dev/null @@ -1,41 +0,0 @@ -import scala.reflect.runtime.universe._ - -// inference illuminator -object Test { - class D1[T1 : TypeTag, T2 <: T1 : TypeTag](x: T1) { println(typeOf[(T1, T2)]) } - class D2[T1 : TypeTag, T2 >: T1 : TypeTag](x: T1) { println(typeOf[(T1, T2)]) } - class D3[+T1 : TypeTag, T2 <: T1 : TypeTag](x: T1) { println(typeOf[(T1, T2)]) } - class D4[-T1 : TypeTag, T2 >: T1 : TypeTag](x: T1) { println(typeOf[(T1, T2)]) } - - class E1[T1 : TypeTag, T2 <: T1 : TypeTag](x: D1[T1, T2]) { println(typeOf[(T1, T2)]) } - class E2[T1 : TypeTag, T2 >: T1 : TypeTag](x: D2[T1, T2]) { println(typeOf[(T1, T2)]) } - class E3[+T1 : TypeTag, T2 <: T1 : TypeTag](x: D3[T1, T2]) { println(typeOf[(T1, T2)]) } - class E4[-T1 : TypeTag, T2 >: T1 : TypeTag](x: D4[T1, T2]) { println(typeOf[(T1, T2)]) } - - def main(args: Array[String]): Unit = { - // WHY YOU NO LIKE NOTHING SO MUCH SCALAC? - val d1 = new D1(5) - val d2 = new D2(5) - val d3 = new D3(5) - val d4 = new D4(5) - - new E1(d1) // fails - new E2(d2) - new E3(d3) // fails - new E4(d4) - } - // found : Test.D1[Int,Nothing] - // required: Test.D1[Int,T2] - // Note: Nothing <: T2, but class D1 is invariant in type T2. - // You may wish to define T2 as +T2 instead. (SLS 4.5) - // new E1(d1) - // ^ - // test/pending/pos/inference.scala:22: error: type mismatch; - // found : Test.D3[Int,Nothing] - // required: Test.D3[Int,T2] - // Note: Nothing <: T2, but class D3 is invariant in type T2. - // You may wish to define T2 as +T2 instead. (SLS 4.5) - // new E3(d3) - // ^ - // two errors found -}
\ No newline at end of file diff --git a/test/pending/pos/misc/A.java b/test/pending/pos/misc/A.java deleted file mode 100644 index 8eaa341151..0000000000 --- a/test/pending/pos/misc/A.java +++ /dev/null @@ -1,13 +0,0 @@ -package test; - -import static test.A.STATE.UNDEF; - -class A { - - public STATE state = UNDEF; - - protected static enum STATE { - UNDEF - } - -} diff --git a/test/pending/pos/misc/B.scala b/test/pending/pos/misc/B.scala deleted file mode 100644 index afc30944f5..0000000000 --- a/test/pending/pos/misc/B.scala +++ /dev/null @@ -1,7 +0,0 @@ -package test - -class B { - - def myA = new A() - -} diff --git a/test/pending/pos/misc/J.java b/test/pending/pos/misc/J.java deleted file mode 100644 index 4805791154..0000000000 --- a/test/pending/pos/misc/J.java +++ /dev/null @@ -1,4 +0,0 @@ -class J { - void f (@Override{ name = value } int x) {} - void g (String ... x) {} -} diff --git a/test/pending/pos/misc/S.scala b/test/pending/pos/misc/S.scala deleted file mode 100644 index c5bfb26f18..0000000000 --- a/test/pending/pos/misc/S.scala +++ /dev/null @@ -1,4 +0,0 @@ -object Test extends J { - def h(xs: String*) {} - g("a", "b", "c") -} diff --git a/test/pending/pos/no-widen-locals.flags b/test/pending/pos/no-widen-locals.flags deleted file mode 100644 index 85d8eb2ba2..0000000000 --- a/test/pending/pos/no-widen-locals.flags +++ /dev/null @@ -1 +0,0 @@ --Xfatal-warnings diff --git a/test/pending/pos/no-widen-locals.scala b/test/pending/pos/no-widen-locals.scala deleted file mode 100644 index 013e63f0a2..0000000000 --- a/test/pending/pos/no-widen-locals.scala +++ /dev/null @@ -1,19 +0,0 @@ -// Worked from r23262 until that was reverted somewhere -// around r25016. -import annotation.switch - -object Test { - def f(x: Int) = { - val X1 = 5 - val X2 = 10 - val X3 = 15 - val X4 = 20 - - (x: @switch) match { - case X1 => 1 - case X2 => 2 - case X3 => 3 - case X4 => 4 - } - } -} diff --git a/test/pending/pos/nothing.scala b/test/pending/pos/nothing.scala deleted file mode 100644 index f76017fb16..0000000000 --- a/test/pending/pos/nothing.scala +++ /dev/null @@ -1,24 +0,0 @@ -// More shoddy treatment for nothing. -class A { - class Q3A[+T1, T2 <: T1](x: T1) - class Q3B[+T1, T2 <: T1](x: Q3A[T1, T2]) - - val x1 = new Q3B(new Q3A("a")) - val x2 = new Q3B(new Q3A[String, Nothing]("a")) - val x3 = new Q3B(new Q3A[String, Null]("a")) - // test/pending/pos/nothing.scala:5: error: type mismatch; - // found : A.this.Q3A[String,Nothing] - // required: A.this.Q3A[String,T2] - // Note: Nothing <: T2, but class Q3A is invariant in type T2. - // You may wish to define T2 as +T2 instead. (SLS 4.5) - // val x1 = new Q3B(new Q3A("a")) - // ^ - // test/pending/pos/nothing.scala:6: error: type mismatch; - // found : A.this.Q3A[String,Nothing] - // required: A.this.Q3A[String,T2] - // Note: Nothing <: T2, but class Q3A is invariant in type T2. - // You may wish to define T2 as +T2 instead. (SLS 4.5) - // val x2 = new Q3B(new Q3A[String, Nothing]("a")) - // ^ - // two errors found -} diff --git a/test/pending/pos/overloading-boundaries.scala b/test/pending/pos/overloading-boundaries.scala deleted file mode 100644 index d2e9fdbb12..0000000000 --- a/test/pending/pos/overloading-boundaries.scala +++ /dev/null @@ -1,37 +0,0 @@ -package bar { - object bippy extends (Double => String) { - def apply(x: Double): String = "Double" - } -} - -package object bar { - def bippy(x: Int, y: Int, z: Int) = "(Int, Int, Int)" -} - -object Test { - def main(args: Array[String]): Unit = { - println(bar.bippy(5.5d)) - println(bar.bippy(1, 2, 3)) - } -} - -/**** - -% scalac3 a.scala -a.scala:13: error: not enough arguments for method bippy: (x: Int, y: Int, z: Int)String. -Unspecified value parameters y, z. - println(bar.bippy(5.5d)) - ^ -one error found - -# Comment out the call to bar.bippy(5.5d) - compiles -% scalac3 a.scala - -# Compiles only from pure source though - if classes are present, fails. -% scalac3 a.scala -a.scala:2: error: bippy is already defined as method bippy in package object bar - object bippy extends (Double => String) { - ^ -one error found - -****/ diff --git a/test/pending/pos/pattern-typing.scala b/test/pending/pos/pattern-typing.scala deleted file mode 100644 index 7286cc38af..0000000000 --- a/test/pending/pos/pattern-typing.scala +++ /dev/null @@ -1,29 +0,0 @@ -import scala.language.higherKinds - -trait Bound[B] - -package p1 { - case class Sub[B <: Bound[B]](p: B) - object Test { - def g[A](x: Bound[A]) = () - def f(x: Any) = x match { case Sub(p) => g(p) } - } -} - -package p2 { - trait Traversable[+A] { def head: A = ??? } - trait Seq[+A] extends Traversable[A] { def length: Int = ??? } - - case class SubHK[B <: Bound[B], CC[X] <: Traversable[X]](xs: CC[B]) - class MyBound extends Bound[MyBound] - class MySeq extends Seq[MyBound] - - object Test { - def g[B](x: Bound[B]) = () - - def f1(x: Any) = x match { case SubHK(xs) => xs } - def f2[B <: Bound[B], CC[X] <: Traversable[X]](sub: SubHK[B, CC]): CC[B] = sub match { case SubHK(xs) => xs } - def f3 = g(f1(SubHK(new MySeq)).head) - def f4 = g(f2(SubHK(new MySeq)).head) - } -} diff --git a/test/pending/pos/sig/sigs.java b/test/pending/pos/sig/sigs.java deleted file mode 100644 index ddf8ec45b0..0000000000 --- a/test/pending/pos/sig/sigs.java +++ /dev/null @@ -1,6 +0,0 @@ -package test; -class Test extends T { - Inner i = new Inner(); - String x = foo("abc"); - String y = i.bar("abc"); -} diff --git a/test/pending/pos/sig/sigs.scala b/test/pending/pos/sig/sigs.scala deleted file mode 100644 index bdb72a09bb..0000000000 --- a/test/pending/pos/sig/sigs.scala +++ /dev/null @@ -1,10 +0,0 @@ -package test -class T { - def foo[T <: String](x: T): T = x - def bar[T](x: T): T = x - class Inner { - def foo[T](x: T): T = x - def bar[T](x: T): T = x - } -} - diff --git a/test/pending/pos/sig/sigtest.scala b/test/pending/pos/sig/sigtest.scala deleted file mode 100644 index 1d091390f7..0000000000 --- a/test/pending/pos/sig/sigtest.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test extends T with Application { - val x: String = foo("abc") -} diff --git a/test/pending/pos/t0621.scala b/test/pending/pos/t0621.scala deleted file mode 100644 index 1d2531c4bd..0000000000 --- a/test/pending/pos/t0621.scala +++ /dev/null @@ -1,7 +0,0 @@ -object Test { - val x1 : List[T] forSome { type T } = List(42) - val w1 = x1 match { case y : List[u] => ((z : u) => z)(y.head) } - - val x2 : T forSome { type T } = 42 - val w2 = x2 match { case y : u => ((z : u) => z)(y) } -} diff --git a/test/pending/pos/t1336.scala b/test/pending/pos/t1336.scala deleted file mode 100644 index 63967985c7..0000000000 --- a/test/pending/pos/t1336.scala +++ /dev/null @@ -1,10 +0,0 @@ -object Foo { - def foreach( f : ((Int,Int)) => Unit ) { - println("foreach") - f(1,2) - } - - for( (a,b) <- this ) { - println((a,b)) - } -} diff --git a/test/pending/pos/t1476.scala b/test/pending/pos/t1476.scala deleted file mode 100644 index 1f8e95c28f..0000000000 --- a/test/pending/pos/t1476.scala +++ /dev/null @@ -1,23 +0,0 @@ -abstract class Module { - def moduleDemands(): List[Module] -} - -object Test { - new Module { owner: Module => - def moduleDemands() = Nil - - val a = new Module { def moduleDemands(): List[Module] = Nil } - val b = new Module { def moduleDemands(): List[Module] = owner :: c :: Nil } - val c = new Module { def moduleDemands(): List[Module] = owner :: a :: Nil } - } -} - -object Test2 { - new Module { owner => - def moduleDemands() = Nil - - val a = new Module { def moduleDemands(): List[Module] = Nil } - val b = new Module { def moduleDemands(): List[Module] = owner :: c :: Nil } - val c = new Module { def moduleDemands(): List[Module] = owner :: a :: Nil } - } -} diff --git a/test/pending/pos/t1786.scala b/test/pending/pos/t1786.scala deleted file mode 100644 index 16ce4301bc..0000000000 --- a/test/pending/pos/t1786.scala +++ /dev/null @@ -1,27 +0,0 @@ -/** This a consequence of the current type checking algorithm, where bounds are checked only after variables are instantiated. - * I believe this will change once we go to constraint-based type inference. - * Alternatively, we can pursue a more extensive fix to SI-6169 - * - * The below code shows a compiler flaw in that the wildcard "_" as value for a bounded type parameter either - * breaks the boundary - as it result in Any - or doesn't evaluate to the boundary (as I'd hoped it to be). -*/ - -class SomeClass(val intValue:Int) -class MyClass[T <: SomeClass](val myValue:T) -class Flooz[A >: Null <: SomeClass, T >: Null <: A](var value: T) - -class A { - def f1(i:MyClass[_]) = i.myValue.intValue - def f2(i:MyClass[_ <: SomeClass]) = i.myValue.intValue - // def f3[T](i: MyClass[T]) = i.myValue.intValue - def f4[T <: SomeClass](i: MyClass[T]) = i.myValue.intValue - // def f5[T >: Null](i: MyClass[T]) = i.myValue.intValue - // def f6[T >: Null <: String](i: MyClass[T]) = i.myValue.intValue + i.myValue.charAt(0) - - // def g1[A, T](x: Flooz[A, T]) = { x.value = null ; x.value.intValue } - def g2(x: Flooz[_, _]) = { x.value = null ; x.value.intValue } - - class MyClass2(x: MyClass[_]) { val p = x.myValue.intValue } - // class MyClass3[T <: String](x: MyClass[T]) { val p = x.myValue.intValue + x.myValue.length } - // class MyClass4[T >: Null](x: MyClass[T]) { val p = x.myValue.intValue } -} diff --git a/test/pending/pos/t2071.scala b/test/pending/pos/t2071.scala deleted file mode 100644 index a384cdfd3b..0000000000 --- a/test/pending/pos/t2071.scala +++ /dev/null @@ -1,21 +0,0 @@ -/** - * We still have to evaluate whether we will permit existentials - * with cross type dependencies. My current reaction would be no. - * Ticket stays open until a decision is made. - */ -trait Iterable[+S] -trait Box[U] - -trait A { - type T <: Iterable[S] forSome { type S <: Box[U]; type U } -} - -trait B extends A { - type T <: Iterable[S] forSome { type S <: Box[U]; type U } -} -/* -But according to SLS, 3.5.1 Type Equivalence: Two existential types (§3.2.10) are equivalent if they have the same number of quantifiers, and, after renaming one list of type quantifiers by another, the quantified types as well as lower and upper bounds of corresponding quantifiers are equivalent. - -So, every existential type must be equivalent to (and conform to) itself. -Attachments -*/ diff --git a/test/pending/pos/t2173.scala b/test/pending/pos/t2173.scala deleted file mode 100644 index cf1913d88b..0000000000 --- a/test/pending/pos/t2173.scala +++ /dev/null @@ -1,12 +0,0 @@ -class A[+U >: Null] { - type R[+X >: Null] = X - type O[+X] = A[R[X]] -} - -// with the following error: -// -// type arguments [A.this.R[X]] do not conform to class A's type parameter bounds [+U >: Null] -// -// However, because type R[+X>:Null] is identical to X, it should carry X bounds and R[X] lower bound should be known to be X's lower bound, i.e. Null. -// -// The same problem occurs with upper bounds. diff --git a/test/pending/pos/t3943/Outer_1.java b/test/pending/pos/t3943/Outer_1.java deleted file mode 100644 index 56c8cc7f85..0000000000 --- a/test/pending/pos/t3943/Outer_1.java +++ /dev/null @@ -1,14 +0,0 @@ -public class Outer_1<E> { - abstract class Inner { - abstract public void foo(E e); - } -} - -class Child extends Outer_1<String> { - // the implicit prefix for Inner is Outer<E> instead of Outer<String> - public Inner getInner() { - return new Inner() { - public void foo(String e) { System.out.println("meh "+e); } - }; - } -} diff --git a/test/pending/pos/t3943/test_2.scala b/test/pending/pos/t3943/test_2.scala deleted file mode 100644 index a19db8b226..0000000000 --- a/test/pending/pos/t3943/test_2.scala +++ /dev/null @@ -1,8 +0,0 @@ -object Test extends App { - val x: Child = new Child - x.getInner.foo("meh") -// ^ -// error: type mismatch; -// found : java.lang.String("meh") -// required: E -} diff --git a/test/pending/pos/t4012.scala b/test/pending/pos/t4012.scala deleted file mode 100644 index 9b8a1b0dbe..0000000000 --- a/test/pending/pos/t4012.scala +++ /dev/null @@ -1,7 +0,0 @@ -trait C1[+A] { - def head: A = sys.error("") -} -trait C2[@specialized +A] extends C1[A] { - override def head: A = super.head -} -class C3 extends C2[Char]
\ No newline at end of file diff --git a/test/pending/pos/t4123.scala b/test/pending/pos/t4123.scala deleted file mode 100644 index 82ab16b4e4..0000000000 --- a/test/pending/pos/t4123.scala +++ /dev/null @@ -1,14 +0,0 @@ -// /scala/trac/4123/a.scala -// Sun Feb 19 00:08:53 PST 2012 - -trait Iter[@specialized(Byte) +A] extends Iterator[A] { - self => - - override def map[B](f: (A) => B) = super.map(f) -} - -class ByteIter extends Iter[Byte] { - var i = 0 - def hasNext = i < 3 - def next = { i += 1 ; i.toByte } -}
\ No newline at end of file diff --git a/test/pending/pos/t4436.scala b/test/pending/pos/t4436.scala deleted file mode 100644 index acbf0beae6..0000000000 --- a/test/pending/pos/t4436.scala +++ /dev/null @@ -1,3 +0,0 @@ -trait Chunk[@specialized +A] { - def bippy[@specialized B >: A](e: B): Chunk[B] -}
\ No newline at end of file diff --git a/test/pending/pos/t4541.scala b/test/pending/pos/t4541.scala deleted file mode 100644 index c6d9672cc5..0000000000 --- a/test/pending/pos/t4541.scala +++ /dev/null @@ -1,10 +0,0 @@ -@SerialVersionUID(1L) -final class SparseArray[@specialized T](private var data : Array[T]) extends Serializable { - def use(inData : Array[T]) = { - data = inData; - } - - def set(that : SparseArray[T]) = { - use(that.data.clone) - } -}
\ No newline at end of file diff --git a/test/pending/pos/t4606.scala b/test/pending/pos/t4606.scala deleted file mode 100644 index f4e5058483..0000000000 --- a/test/pending/pos/t4606.scala +++ /dev/null @@ -1,29 +0,0 @@ -object t4606 { - class A(var x: Int) - class B(x: Int) extends A(x) - trait C { self: B => - def foo = x - def bar = self.x - def baz = { - val b: B = self - b.x - } - } - - object Toto extends App { - val x = new B(10) with C - println(x.foo) // 10 - println(x.bar) // 10 - println(x.baz) // 10 - println(x.x) // 10 - } -} - -object t3194 { - class A(var x: Int) - class B(x: Int) extends A(x) { - self: A => - - def update(z: Int) = this.x = z - } -}
\ No newline at end of file diff --git a/test/pending/pos/t4612.scala b/test/pending/pos/t4612.scala deleted file mode 100644 index a93c12ef01..0000000000 --- a/test/pending/pos/t4612.scala +++ /dev/null @@ -1,15 +0,0 @@ -class CyclicReferenceCompilerBug { - trait Trait[A] { - def foo: A - } - - class Class extends Trait[Class] { - def foo = new Class - - trait OtherTrait extends Trait[OtherTrait] { - self: Class => - - def foo = new Class - } - } -} diff --git a/test/pending/pos/t4683.scala b/test/pending/pos/t4683.scala deleted file mode 100644 index 7af7024159..0000000000 --- a/test/pending/pos/t4683.scala +++ /dev/null @@ -1,11 +0,0 @@ - - - - -class DelayedInitTest { - def a = () - class B extends DelayedInit { - a - def delayedInit(body: => Unit) = () - } -} diff --git a/test/pending/pos/t4695/T_1.scala b/test/pending/pos/t4695/T_1.scala deleted file mode 100644 index 70fb1a7f21..0000000000 --- a/test/pending/pos/t4695/T_1.scala +++ /dev/null @@ -1,4 +0,0 @@ -package foo - -class Bar { } -package object Bar { } diff --git a/test/pending/pos/t4695/T_2.scala b/test/pending/pos/t4695/T_2.scala deleted file mode 100644 index 70fb1a7f21..0000000000 --- a/test/pending/pos/t4695/T_2.scala +++ /dev/null @@ -1,4 +0,0 @@ -package foo - -class Bar { } -package object Bar { } diff --git a/test/pending/pos/t4787.scala b/test/pending/pos/t4787.scala deleted file mode 100644 index cf3fe93c50..0000000000 --- a/test/pending/pos/t4787.scala +++ /dev/null @@ -1,4 +0,0 @@ -trait MatrixImpl[@specialized A, @specialized B] { - def mapTo[ A2, B2, That <: MatrixImpl[A2, B2]](that: That)(f: A => A2) { - } -} diff --git a/test/pending/pos/t4790.scala b/test/pending/pos/t4790.scala deleted file mode 100644 index e451fe80ab..0000000000 --- a/test/pending/pos/t4790.scala +++ /dev/null @@ -1,4 +0,0 @@ -package spectest { - class Sp[@specialized A, B](val a: A, val b: B) { } - class Fsp[@specialized A, B](a: A, b: B) extends Sp(a,b) { def ab = (a,b) } -} diff --git a/test/pending/pos/t5082.scala b/test/pending/pos/t5082.scala deleted file mode 100644 index 20a6cfc55f..0000000000 --- a/test/pending/pos/t5082.scala +++ /dev/null @@ -1,8 +0,0 @@ -object Test { - sealed trait A - case object A1 extends A -} - -trait Something[T] - -case class Test() extends Something[Test.A] diff --git a/test/pending/pos/t5231.scala b/test/pending/pos/t5231.scala deleted file mode 100644 index 77e6631ebb..0000000000 --- a/test/pending/pos/t5231.scala +++ /dev/null @@ -1,18 +0,0 @@ -object Client { - sealed trait ConfigLike { - def clientID: Int - } - - object Config { - def apply() : ConfigBuilder = new ConfigBuilder() - implicit def build( cb: ConfigBuilder ) : Config = cb.build - } - - final class Config private[Client]( val clientID: Int ) - extends ConfigLike - - final class ConfigBuilder private () extends ConfigLike { - var clientID: Int = 0 - def build : Config = new Config( clientID ) - } -} diff --git a/test/pending/pos/t5265.scala b/test/pending/pos/t5265.scala deleted file mode 100644 index 3be7d2187e..0000000000 --- a/test/pending/pos/t5265.scala +++ /dev/null @@ -1,21 +0,0 @@ -import java.util.Date - -trait TDate - -trait TT[A1,T1] - -trait TTFactory[F,G] { - def create(f: F) : TT[F,G] - def sample: F -} - -object Impls { - - // If the c1 is declared before c2, it compiles fine - implicit def c2(s: Date) = c1.create(s) - - implicit val c1 = new TTFactory[Date,TDate] { - def create(v: Date): TT[Date,TDate] = sys.error("") - def sample = new Date - } -}
\ No newline at end of file diff --git a/test/pending/pos/t5400.scala b/test/pending/pos/t5400.scala deleted file mode 100644 index cb4be4bde5..0000000000 --- a/test/pending/pos/t5400.scala +++ /dev/null @@ -1,14 +0,0 @@ -trait TFn1B { - type In - type Out - type Apply[T <: In] <: Out -} - -trait TFn1[I, O] extends TFn1B { - type In = I - type Out = O -} - -trait >>[F1 <: TFn1[_, _], F2 <: TFn1[_, _]] extends TFn1[F1#In, F2#Out] { - type Apply[T] = F2#Apply[F1#Apply[T]] -} diff --git a/test/pending/pos/t5459.scala b/test/pending/pos/t5459.scala deleted file mode 100644 index 971e6f896d..0000000000 --- a/test/pending/pos/t5459.scala +++ /dev/null @@ -1,48 +0,0 @@ -trait A1 -trait A2 -trait A3 -trait L1 extends A1 with A2 with A3 - -object Test { - trait T1[-A <: A1] - trait T2[-A >: L1] - trait T3[ A <: A1] - trait T4[ A >: L1] - trait T5[+A <: A1] - trait T6[+A >: L1] - - def f1(x: T1[_]) = x - def f2(x: T2[_]) = x - def f3(x: T3[_]) = x - def f4(x: T4[_]) = x - def f5(x: T5[_]) = x - def f6(x: T6[_]) = x - // a.scala:22: error: type arguments [Any] do not conform to trait T5's type parameter bounds [+A <: A1] - // def f5(x: T5[_]) = x - // ^ - - def g1(x: T1[_ <: A1]) = x - def g2(x: T2[_ >: L1]) = x - def g3(x: T3[_ <: A1]) = x - def g4(x: T4[_ >: L1]) = x - def g5(x: T5[_ <: A1]) = x - def g6(x: T6[_ >: L1]) = x - - def q1(x: T1[_ >: L1]) = x - def q2(x: T2[_ <: A1]) = x - def q3(x: T3[_ >: L1]) = x - def q4(x: T4[_ <: A1]) = x - def q5(x: T5[_ >: L1]) = x - def q6(x: T6[_ <: A1]) = x - // a.scala:41: error: type arguments [Any] do not conform to trait T5's type parameter bounds [+A <: A1] - // def q5(x: T5[_ >: L1]) = x - // ^ - // two errors found - - def h1(x: T1[_ >: L1 <: A1]) = x - def h2(x: T2[_ >: L1 <: A1]) = x - def h3(x: T3[_ >: L1 <: A1]) = x - def h4(x: T4[_ >: L1 <: A1]) = x - def h5(x: T5[_ >: L1 <: A1]) = x - def h6(x: T6[_ >: L1 <: A1]) = x -} diff --git a/test/pending/pos/t5503.flags b/test/pending/pos/t5503.flags deleted file mode 100644 index e8fb65d50c..0000000000 --- a/test/pending/pos/t5503.flags +++ /dev/null @@ -1 +0,0 @@ --Xfatal-warnings
\ No newline at end of file diff --git a/test/pending/pos/t5503.scala b/test/pending/pos/t5503.scala deleted file mode 100644 index 8a1925df1f..0000000000 --- a/test/pending/pos/t5503.scala +++ /dev/null @@ -1,18 +0,0 @@ -trait A { - type Type - type MethodType <: Type - - val MethodType: MethodTypeExtractor = null - - abstract class MethodTypeExtractor { - def unapply(tpe: MethodType): Option[(Any, Any)] - } -} - -object Test { - val a: A = null - - def foo(tpe: a.Type) = tpe match { - case a.MethodType(_, _) => - } -}
\ No newline at end of file diff --git a/test/pending/pos/t5521.scala b/test/pending/pos/t5521.scala deleted file mode 100644 index dc025d0945..0000000000 --- a/test/pending/pos/t5521.scala +++ /dev/null @@ -1,3 +0,0 @@ -class Foo { type Bar } - -class Quux(val foo: Foo)(val bar: foo.Bar)
\ No newline at end of file diff --git a/test/pending/pos/t5534.scala b/test/pending/pos/t5534.scala deleted file mode 100644 index 834c4fd68d..0000000000 --- a/test/pending/pos/t5534.scala +++ /dev/null @@ -1,11 +0,0 @@ -object Phrase extends Enumeration { - type Phrase = Value - val PHRASE1 = Value("My phrase 1") - val PHRASE2 = Value("My phrase 2") -} - -class Entity(text:String) - -object Test { - val myMapWithPhrases = Phrase.values.map(p => (p -> new Entity(p.toString))).toMap -}
\ No newline at end of file diff --git a/test/pending/pos/t5559.scala b/test/pending/pos/t5559.scala deleted file mode 100644 index 586e52cd4f..0000000000 --- a/test/pending/pos/t5559.scala +++ /dev/null @@ -1,23 +0,0 @@ - - - - -object Test { - - class Inv[T] - - def foo[S](interface: Inv[_ >: S], implementation: Inv[S]) {} - - def bar[R, T <: R](interface: Inv[R], impl: Inv[T]) { - //foo[T](interface, impl) - foo(interface, impl) // Compilation Error - // Inv[R] <: Inv[_ >: S] - // Inv[T] <: Inv[S] - // ---------------------- - // R >: S - // T == S - } - -} - - diff --git a/test/pending/pos/t5564.scala b/test/pending/pos/t5564.scala deleted file mode 100644 index 1783a903ed..0000000000 --- a/test/pending/pos/t5564.scala +++ /dev/null @@ -1,5 +0,0 @@ -trait C - -class Foo[@specialized(Int) T, A] { - def bar[B >: A <: C]: T = ??? -} diff --git a/test/pending/pos/t5579.scala b/test/pending/pos/t5579.scala deleted file mode 100644 index a1ee077fe7..0000000000 --- a/test/pending/pos/t5579.scala +++ /dev/null @@ -1,29 +0,0 @@ -import language.existentials - -class Result[+A] - -case class Success[A](x: A) extends Result[A] - -class Apply[A] - -object Apply { - def apply[A](f: Int => Result[A]): Apply[A] = new Apply[A] -} - -object TestUnit { - //Error is here: - def goo = Apply { i => - i match { - case 1 => Success(Some(1)) - case _ => Success(None) - } - } - - //If type is defined explicitly (which I wanted from compiler to infer), then all is ok - def foo = Apply[t forSome { type t >: Some[Int] with None.type <: Option[Int] }] { i => - i match { - case 1 => Success(Some(1)) - case _ => Success(None) - } - } -} diff --git a/test/pending/pos/t5585.scala b/test/pending/pos/t5585.scala deleted file mode 100644 index 5d3eb86111..0000000000 --- a/test/pending/pos/t5585.scala +++ /dev/null @@ -1,18 +0,0 @@ -class Result[+A] - -case class Success[A](x: A) extends Result[A] - -class Apply[A] - -object Apply { - def apply[A](f: Int => Result[A]): Apply[A] = new Apply[A] -} - -object TestUnit { - def goo : Apply[Option[Int]] = Apply { i => - val p = i match { - case 1 => Success(Some(1)) - case _ => Success(None) - } - } -}
\ No newline at end of file diff --git a/test/pending/pos/t5589.scala b/test/pending/pos/t5589.scala deleted file mode 100644 index 69cbb20391..0000000000 --- a/test/pending/pos/t5589.scala +++ /dev/null @@ -1,22 +0,0 @@ -class A { - // First three compile. - def f1(x: Either[Int, String]) = x.right map (y => y) - def f2(x: Either[Int, String]) = for (y <- x.right) yield y - def f3(x: Either[Int, (String, Int)]) = x.right map { case (y1, y2) => (y1, y2) } - // Last one fails. - def f4(x: Either[Int, (String, Int)]) = for ((y1, y2) <- x.right) yield ((y1, y2)) -/** -./a.scala:5: error: constructor cannot be instantiated to expected type; - found : (T1, T2) - required: Either[Nothing,(String, Int)] - def f4(x: Either[Int, (String, Int)]) = for ((y1, y2) <- x.right) yield ((y1, y2)) - ^ -./a.scala:5: error: not found: value y1 - def f4(x: Either[Int, (String, Int)]) = for ((y1, y2) <- x.right) yield ((y1, y2)) - ^ -./a.scala:5: error: not found: value y2 - def f4(x: Either[Int, (String, Int)]) = for ((y1, y2) <- x.right) yield ((y1, y2)) - ^ -three errors found -**/ -} diff --git a/test/pending/pos/t5712.scala b/test/pending/pos/t5712.scala deleted file mode 100644 index 31f365028a..0000000000 --- a/test/pending/pos/t5712.scala +++ /dev/null @@ -1,14 +0,0 @@ -import scala.tools.nsc._ - -object Test { - - // works - def mkReifier(global: Global)(typer: global.analyzer.Typer) = typer - -/* -<console>:10: error: not found: value global - class Reifier(global: Global)(typer: global.analyzer.Typer) { } -*/ - class Reifier(global: Global)(typer: global.analyzer.Typer) { } - -} diff --git a/test/pending/pos/t5877.scala b/test/pending/pos/t5877.scala deleted file mode 100644 index b77605f7f2..0000000000 --- a/test/pending/pos/t5877.scala +++ /dev/null @@ -1,5 +0,0 @@ -package foo { } - -package object foo { - implicit class Foo(val s: String) { } -} diff --git a/test/pending/pos/t5954/T_1.scala b/test/pending/pos/t5954/T_1.scala deleted file mode 100644 index 0064c596b6..0000000000 --- a/test/pending/pos/t5954/T_1.scala +++ /dev/null @@ -1,8 +0,0 @@ -package p { - package base { - class X - } - package object base { - case class B() - } -} diff --git a/test/pending/pos/t5954/T_2.scala b/test/pending/pos/t5954/T_2.scala deleted file mode 100644 index 0064c596b6..0000000000 --- a/test/pending/pos/t5954/T_2.scala +++ /dev/null @@ -1,8 +0,0 @@ -package p { - package base { - class X - } - package object base { - case class B() - } -} diff --git a/test/pending/pos/t5954/T_3.scala b/test/pending/pos/t5954/T_3.scala deleted file mode 100644 index 0064c596b6..0000000000 --- a/test/pending/pos/t5954/T_3.scala +++ /dev/null @@ -1,8 +0,0 @@ -package p { - package base { - class X - } - package object base { - case class B() - } -} diff --git a/test/pending/pos/t6225.scala b/test/pending/pos/t6225.scala deleted file mode 100644 index d7dff3c419..0000000000 --- a/test/pending/pos/t6225.scala +++ /dev/null @@ -1,11 +0,0 @@ -package library.x { - class X { - class Foo - implicit val foo = new Foo - } -} -package library { package object x extends X } -package app { - import library.x._ - object App { implicitly[Foo] } -} diff --git a/test/pending/pos/t7234.scala b/test/pending/pos/t7234.scala deleted file mode 100644 index 59a233d835..0000000000 --- a/test/pending/pos/t7234.scala +++ /dev/null @@ -1,15 +0,0 @@ -trait Main { - trait A { - type B - } - trait C { - def c(a: A, x: Int = 0)(b: a.B) - } - def c: C - def d(a: A, x: Int = 0)(b: a.B) - - def ok1(a: A)(b: a.B) = c.c(a, 42)(b) - def ok2(a: A)(b: a.B) = d(a)(b) - - def fail(a: A)(b: a.B) = c.c(a)(b) -} diff --git a/test/pending/pos/t7234b.scala b/test/pending/pos/t7234b.scala deleted file mode 100644 index fee98e87a8..0000000000 --- a/test/pending/pos/t7234b.scala +++ /dev/null @@ -1,20 +0,0 @@ -trait Main { - trait A { - type B - def b: B - } - trait C { - def c(a: A, x: Int = 0)(b: => a.B, bs: a.B*) - def d(a: A = null, x: Int = 0)(b1: => a.B = a.b, b2: a.B = a.b) - } - def c: C - def ok(a: A)(b: a.B) = c.c(a, 42)(b) - def fail(a: A)(b: a.B) = c.c(a)(b) - def fail2(a: A)(b: a.B) = c.c(a)(b, b) - def fail3(a: A)(b: a.B) = c.c(a)(b, Seq[a.B](b): _*) - - def fail4(a: A)(b: a.B) = c.d(a)() - def fail5(a: A)(b: a.B) = c.d(a)(b1 = a.b) - def fail6(a: A)(b: a.B) = c.d(a)(b2 = a.b) - def fail7(a: A)(b: a.B) = c.d()() -} diff --git a/test/pending/pos/t7778/Foo_1.java b/test/pending/pos/t7778/Foo_1.java deleted file mode 100644 index 65431ffd46..0000000000 --- a/test/pending/pos/t7778/Foo_1.java +++ /dev/null @@ -1,6 +0,0 @@ -import java.util.concurrent.Callable; - -public abstract class Foo_1<T> implements Callable<Foo_1<Object>.Inner> { - public abstract class Inner { - } -} diff --git a/test/pending/pos/t7778/Test_2.scala b/test/pending/pos/t7778/Test_2.scala deleted file mode 100644 index 306303a99e..0000000000 --- a/test/pending/pos/t7778/Test_2.scala +++ /dev/null @@ -1,3 +0,0 @@ -class Test { - null: Foo_1[_] -} diff --git a/test/pending/pos/t8079c.scala b/test/pending/pos/t8079c.scala deleted file mode 100644 index ae7f37e2bf..0000000000 --- a/test/pending/pos/t8079c.scala +++ /dev/null @@ -1,7 +0,0 @@ -trait F1[/* - */T, /* + */ R] - -object Test { - import scala.annotation.unchecked._ - private[this] type VariantF1[-T, +R] = F1[T @uncheckedVariance, R @uncheckedVariance] - trait C[+T] { def foo: VariantF1[Any, T] } -} diff --git a/test/pending/pos/t8128b.scala b/test/pending/pos/t8128b.scala deleted file mode 100644 index dd44a25a90..0000000000 --- a/test/pending/pos/t8128b.scala +++ /dev/null @@ -1,18 +0,0 @@ -class Optiony[X] { def isEmpty = true; def get: X = ??? } -class Seqy[X] { def head: X = ???; def length = 0; def apply(i: Int): X = ??? } - -object G { - def unapply(m: Any): Optiony[_] = ??? -} - -object H { - def unapplySeq(m: Any): Optiony[Seqy[_]] = ??? -} - -object Test { - (0: Any) match { - case G(v) => v - case H(v) => v - case _ => - } -} diff --git a/test/pending/pos/t8363b.scala b/test/pending/pos/t8363b.scala deleted file mode 100644 index 393e2a0237..0000000000 --- a/test/pending/pos/t8363b.scala +++ /dev/null @@ -1,7 +0,0 @@ -class C(a: Any) -class Test { - def foo: Any = { - def form = 0 - class C1 extends C({def x = form; ()}) - } -} diff --git a/test/pending/pos/those-kinds-are-high.scala b/test/pending/pos/those-kinds-are-high.scala deleted file mode 100644 index 78367cb746..0000000000 --- a/test/pending/pos/those-kinds-are-high.scala +++ /dev/null @@ -1,96 +0,0 @@ -class A { - trait Container[+T] - trait Template[+CC[X] <: Container[X]] - - class C1[T] extends Template[C1] with Container[T] - class C2[T] extends Template[C2] with Container[T] - - /** Target expression: - * List(new C1[String], new C2[String]) - */ - - // Here's what would ideally be inferred. - // - // scala> :type List[Template[Container] with Container[String]](new C1[String], new C2[String]) - // List[Template[Container] with Container[java.lang.String]] - // - // Here's what it does infer. - // - // scala> :type List(new C1[String], new C2[String]) - // <console>:8: error: type mismatch; - // found : C1[String] - // required: Container[String] with Template[Container[Any] with Template[Container[Any] with Template[Any] with ScalaObject] with ScalaObject] with ScalaObject - // List(new C1[String], new C2[String]) - // ^ - // - // Simplified, the inferred type is: - // - // List[Container[String] with Template[Container[Any] with Template[Container[Any] with Template[Any]]] - // - // *** Update 2/24/2012 - // - // Hey, now there are polytypes in the inferred type. - // Not sure if that is progress or regress. - // - // test/pending/pos/those-kinds-are-high.scala:36: error: type mismatch; - // found : C1[String] - // required: ScalaObject with Container[String] with Template[ScalaObject with Container with Template[ScalaObject with Container with Template[[X]Container[X]]]] - // def fFail = List(new C1[String], new C2[String]) - // ^ - // test/pending/pos/those-kinds-are-high.scala:36: error: type mismatch; - // found : C2[String] - // required: ScalaObject with Container[String] with Template[ScalaObject with Container with Template[ScalaObject with Container with Template[[X]Container[X]]]] - // def fFail = List(new C1[String], new C2[String]) - // ^ - // two errors found - - /** Working version explicitly typed. - */ - def fExplicit = List[Template[Container] with Container[String]](new C1[String], new C2[String]) - - // nope - def fFail = List(new C1[String], new C2[String]) -} - - -trait Other { - trait GenBar[+A] - trait Bar[+A] extends GenBar[A] - trait Templ[+A, +CC[X] <: GenBar[X]] - - abstract class CC1[+A] extends Templ[A, CC1] with Bar[A] - abstract class CC2[+A] extends Templ[A, CC2] with Bar[A] - - // Compiles - class A1 { - abstract class BarFactory[CC[X] <: Bar[X]] - - def f(x: Boolean) = if (x) (null: BarFactory[CC1]) else (null: BarFactory[CC2]) - } - - // Fails - only difference is CC covariant. - class A2 { - abstract class BarFactory[+CC[X] <: Bar[X]] - - def f(x: Boolean) = if (x) (null: BarFactory[CC1]) else (null: BarFactory[CC2]) - // c.scala:23: error: kinds of the type arguments (Bar with Templ[Any,Bar]) do not conform to the expected kinds of the type parameters (type CC) in class BarFactory. - // Bar with Templ[Any,Bar]'s type parameters do not match type CC's expected parameters: - // <empty> has no type parameters, but type CC has one - // def f(x: Boolean) = if (x) (null: BarFactory[CC1]) else (null: BarFactory[CC2]) - // ^ - // one error found - } - - // Compiles - CC contravariant. - class A3 { - abstract class BarFactory[-CC[X] <: Bar[X]] // with Templ[X, CC]] - - def f(x: Boolean) = if (x) (null: BarFactory[CC1]) else (null: BarFactory[CC2]) - // c.scala:23: error: kinds of the type arguments (Bar with Templ[Any,Bar]) do not conform to the expected kinds of the type parameters (type CC) in class BarFactory. - // Bar with Templ[Any,Bar]'s type parameters do not match type CC's expected parameters: - // <empty> has no type parameters, but type CC has one - // def f(x: Boolean) = if (x) (null: BarFactory[CC1]) else (null: BarFactory[CC2]) - // ^ - // one error found - } -} diff --git a/test/pending/pos/treecheckers.flags b/test/pending/pos/treecheckers.flags deleted file mode 100644 index 5319681590..0000000000 --- a/test/pending/pos/treecheckers.flags +++ /dev/null @@ -1 +0,0 @@ --Ycheck:all
\ No newline at end of file diff --git a/test/pending/pos/treecheckers/c1.scala b/test/pending/pos/treecheckers/c1.scala deleted file mode 100644 index b936839039..0000000000 --- a/test/pending/pos/treecheckers/c1.scala +++ /dev/null @@ -1,12 +0,0 @@ -object Test1 { - def f[T](xs: Array[T]): Array[T] = xs match { case xs => xs } - // [check: patmat] The symbol, tpe or info of tree `(x) : Array[T]` refers to a out-of-scope symbol, type T. tree.symbol.ownerChain: value x - // [check: patmat] The symbol, tpe or info of tree `(x) : Array[T]` refers to a out-of-scope symbol, type T. tree.symbol.ownerChain: value x - - def g[T](xs: Array[T]): Array[T] = { - val x1: Array[T] = xs - def case4() = matchEnd3(x1) - def matchEnd3(x: Array[T]) = x - case4() - } -} diff --git a/test/pending/pos/treecheckers/c2.scala b/test/pending/pos/treecheckers/c2.scala deleted file mode 100644 index c893a5c922..0000000000 --- a/test/pending/pos/treecheckers/c2.scala +++ /dev/null @@ -1 +0,0 @@ -class Test2(val valueVal: Int) extends AnyVal diff --git a/test/pending/pos/treecheckers/c3.scala b/test/pending/pos/treecheckers/c3.scala deleted file mode 100644 index e480bbfb08..0000000000 --- a/test/pending/pos/treecheckers/c3.scala +++ /dev/null @@ -1,8 +0,0 @@ -import scala.collection.mutable.ArrayOps - -object Test3 { - implicit def genericArrayOps[T](xs: Array[T]): ArrayOps[T] = (xs match { - case x: Array[AnyRef] => refArrayOps[AnyRef](x) - case x: Array[Boolean] => booleanArrayOps(x) - }).asInstanceOf[ArrayOps[T]] -} diff --git a/test/pending/pos/treecheckers/c4.scala b/test/pending/pos/treecheckers/c4.scala deleted file mode 100644 index 2328131770..0000000000 --- a/test/pending/pos/treecheckers/c4.scala +++ /dev/null @@ -1,9 +0,0 @@ -sealed trait Message[+A] -class Script[A] extends Message[A] { - def iterator: Iterator[Message[A]] = ??? -} - -trait Test4[A] { - def f(cmd: Message[A]): Iterator[A] = cmd match { case s: Script[t] => s.iterator flatMap f } - def g(cmd: Message[A]) = cmd match { case s: Script[t] => s } -} diff --git a/test/pending/pos/treecheckers/c5.scala b/test/pending/pos/treecheckers/c5.scala deleted file mode 100644 index 43cbb65d74..0000000000 --- a/test/pending/pos/treecheckers/c5.scala +++ /dev/null @@ -1,3 +0,0 @@ -trait Factory[CC[X] <: Traversable[X]] - -object Test5 extends Factory[Traversable] diff --git a/test/pending/pos/treecheckers/c6.scala b/test/pending/pos/treecheckers/c6.scala deleted file mode 100644 index 8283655f3a..0000000000 --- a/test/pending/pos/treecheckers/c6.scala +++ /dev/null @@ -1,4 +0,0 @@ -object Test6 { - import scala.reflect.ClassTag - def f[T: ClassTag] = implicitly[ClassTag[T]].runtimeClass match { case x => x } -} diff --git a/test/pending/pos/unappgadteval.scala b/test/pending/pos/unappgadteval.scala deleted file mode 100644 index 89f6cabc43..0000000000 --- a/test/pending/pos/unappgadteval.scala +++ /dev/null @@ -1,77 +0,0 @@ -/** Cleaned up in october 2010 by paulp. - * Hey, we should get this working. - */ - -// Class hierarchy -trait Term[a] - -object Var{ def unapply[a](x:Var[a]) = Some(x.name) } -class Var[a] (val name : String) extends Term[a] - -object Num{ def unapply(x:Num) = Some(x.value) } -class Num (val value : Int) extends Term[Int] - -object Lam{ def unapply[b,c](l: Lam[b,c]) = Some(l.x, l.e) } -class Lam[b, c](val x : Var[b], val e : Term[c]) extends Term[b => c] - -object App{ def unapply[b,c](a: App[b,c]) = Some(a.f, a.e) } -class App[b, c] (val f : Term[b => c], val e : Term[b]) extends Term[c] - -object Suc { def unapply(a: Suc) = true } -class Suc() extends Term[Int => Int] - -// Environments : -abstract class Env { - def apply[a](v: Var[a]): a - def extend[a](v: Var[a], x : a) = new Env { - def apply[b](w: Var[b]): b = w match { - case _ : v.type => x // v eq w, hence a = b - case _ => Env.this.apply(w) - }} -} - -object empty extends Env { - def apply[a](x: Var[a]): a = throw new Error("not found : "+x.name) -} - -object Test { - val v1 = new Var[util.Random]("random") - val v2 = new Var[Int]("Int") - val v3 = new Var[List[String]]("list") - - val anEnv = (empty - .extend(v1, new util.Random) - .extend(v2, 58) - .extend(v3, Nil) - ) - - def eval[a](t: Term[a], env : Env): a = t match { - // First three work - case v : Var[b] => env(v) // a = b - case n @ Num(value) => value // a = Int - case a @ App(f,e) => eval(f, env)(eval(e, env)) // a = c - - // Next one fails like: - // - // found : (Int) => Int - // required: a - case i @ Suc() => { (y: Int) => y + 1 } // a = Int => Int - - // Next one fails like: - // - // error: '=>' expected but '[' found. - // case f @ Lam[b,c](x, e) => { (y: b) => eval(e, env.extend(x, y)) } // a = b=>c - // ^ - case f @ Lam[b,c](x, e) => { (y: b) => eval(e, env.extend(x, y)) } // a = b=>c - } - - val f1 = () => eval(v1, anEnv) - val f2 = () => eval(v2, anEnv) - val f3 = () => eval(v3, anEnv) - - def main(args: Array[String]): Unit = { - println(f1()) - println(f2()) - println(f3()) - } -} diff --git a/test/pending/pos/virt.scala b/test/pending/pos/virt.scala deleted file mode 100644 index 99dcd747b2..0000000000 --- a/test/pending/pos/virt.scala +++ /dev/null @@ -1,9 +0,0 @@ -object Virt extends Application { - class Foo { - trait Inner <: { val x : Int = 3 } - } - - class Bar extends Foo { - trait Inner <: { val y : Int = x } - } -} diff --git a/test/pending/presentation/context-bounds1.check b/test/pending/presentation/context-bounds1.check deleted file mode 100644 index b444de59a4..0000000000 --- a/test/pending/presentation/context-bounds1.check +++ /dev/null @@ -1,51 +0,0 @@ -reload: ContextBounds.scala - -askHyperlinkPos for `Blubb` at (2,23) ContextBounds.scala -================================================================================ -[response] found askHyperlinkPos for `Blubb` at (13,7) ContextBounds.scala -================================================================================ - -askHyperlinkPos for `Foo` at (4,17) ContextBounds.scala -================================================================================ -[response] found askHyperlinkPos for `Foo` at (9,7) ContextBounds.scala -================================================================================ - -askHyperlinkPos for `Blubb` at (4,32) ContextBounds.scala -================================================================================ -[response] found askHyperlinkPos for `Blubb` at (13,7) ContextBounds.scala -================================================================================ - -askHyperlinkPos for `A` at (4,42) ContextBounds.scala -================================================================================ -[response] found askHyperlinkPos for `A` at (4,12) ContextBounds.scala -================================================================================ - -askHyperlinkPos for `A` at (4,51) ContextBounds.scala -================================================================================ -[response] found askHyperlinkPos for `A` at (4,12) ContextBounds.scala -================================================================================ - -askHyperlinkPos for `blubb` at (4,66) ContextBounds.scala -================================================================================ -[response] found askHyperlinkPos for `blubb` at (2,7) ContextBounds.scala -================================================================================ - -askHyperlinkPos for `Foo` at (5,18) ContextBounds.scala -================================================================================ -[response] found askHyperlinkPos for `Foo` at (9,7) ContextBounds.scala -================================================================================ - -askHyperlinkPos for `A` at (5,25) ContextBounds.scala -================================================================================ -[response] found askHyperlinkPos for `A` at (4,12) ContextBounds.scala -================================================================================ - -askHyperlinkPos for `foo` at (5,36) ContextBounds.scala -================================================================================ -[response] found askHyperlinkPos for `foo` at (10,7) ContextBounds.scala -================================================================================ - -askHyperlinkPos for `A` at (10,14) ContextBounds.scala -================================================================================ -[response] found askHyperlinkPos for `A` at (9,11) ContextBounds.scala -================================================================================ diff --git a/test/pending/presentation/context-bounds1/Test.scala b/test/pending/presentation/context-bounds1/Test.scala deleted file mode 100644 index bec1131c4c..0000000000 --- a/test/pending/presentation/context-bounds1/Test.scala +++ /dev/null @@ -1,3 +0,0 @@ -import scala.tools.nsc.interactive.tests.InteractiveTest - -object Test extends InteractiveTest
\ No newline at end of file diff --git a/test/pending/presentation/context-bounds1/src/ContextBounds.scala b/test/pending/presentation/context-bounds1/src/ContextBounds.scala deleted file mode 100644 index 72a8f694a3..0000000000 --- a/test/pending/presentation/context-bounds1/src/ContextBounds.scala +++ /dev/null @@ -1,13 +0,0 @@ -object ContextBound { - val blubb = new Blubb/*#*/ - - def work[A: Foo/*#*/](f: Blubb/*#*/ => A/*#*/): A/*#*/ = f(blubb/*#*/) ensuring { - implicitly[Foo/*#*/[A/*#*/]].foo/*#*/(_) >= 42 - } -} - -trait Foo[A] { - def foo(a: A/*#*/): Int -} - -class Blubb
\ No newline at end of file diff --git a/test/pending/reify_typeof.check b/test/pending/reify_typeof.check deleted file mode 100644 index 670f76faa4..0000000000 --- a/test/pending/reify_typeof.check +++ /dev/null @@ -1,10 +0,0 @@ -Expr[Unit]({ - val ru = `package`.universe; - val tpe1: ru.Type = ru.typeOf[`package`.List[Int]]; - Predef.println(tpe1); - val tpe2: ru.Type = ru.typeOf(List.apply(1, 2, 3)); - Predef.println(tpe2) -}) -scala.List[Int] -List[Int] -() diff --git a/test/pending/reify_typeof.scala b/test/pending/reify_typeof.scala deleted file mode 100644 index 985c57b9ab..0000000000 --- a/test/pending/reify_typeof.scala +++ /dev/null @@ -1,14 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.tools.reflect.Eval - -object Test extends App { - val reified = reify { - val ru = scala.reflect.runtime.universe - val tpe1: ru.Type = ru.typeOf[List[Int]] - println(tpe1) - val tpe2: ru.Type = ru.typeOf(List(1, 2, 3)) - println(tpe2) - } - println(reified) - println(reified.eval) -}
\ No newline at end of file diff --git a/test/pending/run/TestFlatMap.scala b/test/pending/run/TestFlatMap.scala deleted file mode 100644 index dd5a0a0c2f..0000000000 --- a/test/pending/run/TestFlatMap.scala +++ /dev/null @@ -1,29 +0,0 @@ -import scala.collection.parallel.{ ParMap => PMap } -import scala.collection.parallel.mutable.{ ParHashSet => PMHashSet, ParHashMap => PMHashMap, ParArray } -import scala.util.Random -import scala.collection.parallel.CompositeThrowable - -object Test { - - def main(args: Array[String]) { - val N = 1500 - val M = 1500 - var unmatchedLeft = new PMHashSet[Int] - var unmatchedRight = new PMHashSet[Int] - Range(0, N).foreach{ x => unmatchedLeft += x} - Range(0, M).foreach{ x => unmatchedRight += x} - - try { - val matches = unmatchedLeft.flatMap{ lind: Int => - val dists = unmatchedRight.seq.map{ rind: Int => - val dist = Random.nextInt - (rind, dist) - } - dists - } - } catch { - case c: CompositeThrowable => for (t <- c.throwables) println("\n%s\n%s".format(t, t.getStackTrace.mkString("\n"))) - } - } - -} diff --git a/test/pending/run/bug4704run.scala b/test/pending/run/bug4704run.scala deleted file mode 100644 index af488a56c7..0000000000 --- a/test/pending/run/bug4704run.scala +++ /dev/null @@ -1,10 +0,0 @@ -trait MM { - protected def method = "bip" -} -trait NN { - protected def method = "bop" -} -trait OOOOO extends MM with NN { - override protected def method = super[MM].method + super[NN].method - override def hashCode = super[MM].hashCode + super[NN].hashCode -} diff --git a/test/pending/run/delambdafy-lambdametafactory.scala b/test/pending/run/delambdafy-lambdametafactory.scala deleted file mode 100644 index daea8a39fe..0000000000 --- a/test/pending/run/delambdafy-lambdametafactory.scala +++ /dev/null @@ -1,50 +0,0 @@ -// -// Tests that the static accessor method for lambda bodies -// (generated under -Ydelambdafy:method) are compatible with -// Java 8's LambdaMetafactory. -// -import java.lang.invoke._ - -class C { - def test1: Unit = { - (x: String) => x.reverse - } - def test2: Unit = { - val capture1 = "capture1" - (x: String) => capture1 + " " + x.reverse - } - def test3: Unit = { - (x: String) => C.this + " " + x.reverse - } -} -trait T { - def test4: Unit = { - (x: String) => x.reverse - } -} - -// A functional interface. Function1 contains abstract methods that are filled in by mixin -trait Function1ish[A, B] { - def apply(a: A): B -} - -object Test { - def lambdaFactory[A, B](hostClass: Class[_], instantiatedParam: Class[A], instantiatedRet: Class[B], accessorName: String, - capturedParams: Array[(Class[_], AnyRef)] = Array()) = { - val caller = MethodHandles.lookup - val methodType = MethodType.methodType(classOf[AnyRef], Array[Class[_]](classOf[AnyRef])) - val instantiatedMethodType = MethodType.methodType(instantiatedRet, Array[Class[_]](instantiatedParam)) - val (capturedParamTypes, captured) = capturedParams.unzip - val targetMethodType = MethodType.methodType(instantiatedRet, capturedParamTypes :+ instantiatedParam) - val invokedType = MethodType.methodType(classOf[Function1ish[_, _]], capturedParamTypes) - val target = caller.findStatic(hostClass, accessorName, targetMethodType) - val site = LambdaMetafactory.metafactory(caller, "apply", invokedType, methodType, target, instantiatedMethodType) - site.getTarget.invokeWithArguments(captured: _*).asInstanceOf[Function1ish[A, B]] - } - def main(args: Array[String]) { - println(lambdaFactory(classOf[C], classOf[String], classOf[String], "accessor$1").apply("abc")) - println(lambdaFactory(classOf[C], classOf[String], classOf[String], "accessor$2", Array(classOf[String] -> "capture1")).apply("abc")) - println(lambdaFactory(classOf[C], classOf[String], classOf[String], "accessor$3", Array(classOf[C] -> new C)).apply("abc")) - println(lambdaFactory(Class.forName("T$class"), classOf[String], classOf[String], "accessor$4", Array(classOf[T] -> new T{})).apply("abc")) - } -} diff --git a/test/pending/run/hk-lub-fail.scala b/test/pending/run/hk-lub-fail.scala deleted file mode 100644 index 0ac4fdd841..0000000000 --- a/test/pending/run/hk-lub-fail.scala +++ /dev/null @@ -1,37 +0,0 @@ -// Tue Jul 12 16:38:23 PDT 2011 - -class Bip[T1] -class Foo[T2] extends Bip[T2] -class Bar[T3] extends Bip[T3] - -abstract class Factory[CC[X] <: Bip[X]] { } - -object Quux1 extends Factory[Foo] -object Quux2 extends Factory[Bar] - -object Test { - // FAIL - val xs = List(Quux1, Quux2) - // error: type mismatch; - // found : Quux1.type (with underlying type object Quux1) - // required: Factory[_ >: Bar with Foo <: Bip] - // ^^ ^^ ^^ ^^ <-- QUIZ: what is missing from these types? - - // The type it should figure out, come on scalac - type F = Factory[CC] forSome { type X ; type CC[X] >: Bar[X] with Foo[X] <: Bip[X] } - - // No problem - val ys = List[F](Quux1, Quux2) - - // A repl session to get you started. -/* - val quux1 = EmptyPackageClass.tpe.member(TermName("Quux1")) - val quux2 = EmptyPackageClass.tpe.member(TermName("Quux2")) - val tps = List(quux1, quux2) map (_.tpe) - val test = EmptyPackageClass.tpe.member(TermName("Test")) - val f = test.tpe.member(TypeName("F")).tpe - - val fn = f.normalize.asInstanceOf[ExistentialType] - val fn2 = fn.underlying.asInstanceOf[TypeRef] -*/ -} diff --git a/test/pending/run/idempotency-partial-functions.scala b/test/pending/run/idempotency-partial-functions.scala deleted file mode 100644 index c9d650ca89..0000000000 --- a/test/pending/run/idempotency-partial-functions.scala +++ /dev/null @@ -1,28 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.reflect.runtime.{currentMirror => cm} -import scala.tools.reflect.{ToolBox, ToolBoxError} -import scala.tools.reflect.Eval - -// Related to SI-6187 -// -// Moved to pending as we are currently blocked by the inability -// to reify the parent types of the anonymous function class, -// which are not part of the tree, but rather only part of the -// ClassInfoType. -object Test extends App { - val partials = reify { - List((false,true)) collect { case (x,true) => x } - } - println(Seq(show(partials), showRaw(partials)).mkString("\n\n")) - try { - println(partials.eval) - } catch { - case e: ToolBoxError => println(e) - } - val tb = cm.mkToolBox() - val tpartials = tb.typecheck(partials.tree) - println(tpartials) - val rtpartials = tb.untypecheck(tpartials) - println(tb.eval(rtpartials)) -} -Test.main(null)
\ No newline at end of file diff --git a/test/pending/run/implicit-classes.scala b/test/pending/run/implicit-classes.scala deleted file mode 100644 index 02b74de2b0..0000000000 --- a/test/pending/run/implicit-classes.scala +++ /dev/null @@ -1,17 +0,0 @@ -object O { - implicit class C(s: String) { - def twice = s + s - } -} - -/** -// -// We'd like to augment object O in Namers so that it also has an implicit method -object O { - implicit class C(s: String) { - def twice = s + s - } - implicit def C(s: String): C = new C(s) -} - -**/ diff --git a/test/pending/run/inline-ex-handlers.check b/test/pending/run/inline-ex-handlers.check deleted file mode 100644 index fce32771b4..0000000000 --- a/test/pending/run/inline-ex-handlers.check +++ /dev/null @@ -1,491 +0,0 @@ ---- a -+++ b -@@ -171,5 +171,5 @@ - def productElement(x$1: Int (INT)): Object { -- locals: value x$1, value x1 -+ locals: value x$1, value x1, variable boxed1 - startBlock: 1 -- blocks: [1,2,3,4] -+ blocks: [1,3,4] - -@@ -186,2 +186,4 @@ - 92 LOAD_LOCAL(value x$1) -+ 92 STORE_LOCAL(variable boxed1) -+ 92 LOAD_LOCAL(variable boxed1) - 92 BOX INT -@@ -194,5 +196,2 @@ - 92 CALL_METHOD MyException.message (dynamic) -- 92 JUMP 2 -- -- 2: - 92 RETURN(REF(class Object)) -@@ -246,3 +245,3 @@ - startBlock: 1 -- blocks: [1,2,3,4,5,6,7,8,11,12,13,14,15,16,17,18] -+ blocks: [1,2,3,4,5,6,8,11,12,13,14,15,16,17,18] - -@@ -257,5 +256,2 @@ - 92 SCOPE_ENTER value x1 -- 92 JUMP 7 -- -- 7: - 92 LOAD_LOCAL(value x1) -@@ -408,5 +404,5 @@ - def main(args: Array[String] (ARRAY[REF(class String)])): Unit { -- locals: value args, variable result, value ex6, value x4, value x5, value message, value x -+ locals: value args, variable result, value ex6, value x4, value x5, value x - startBlock: 1 -- blocks: [1,2,3,4,5,8,10,11,13] -+ blocks: [1,2,3,5,8,10,11,13,14] - -@@ -434,4 +430,13 @@ - 103 CALL_METHOD MyException.<init> (static-instance) -- 103 THROW(MyException) -+ ? STORE_LOCAL(value ex6) -+ ? JUMP 14 - -+ 14: -+ 101 LOAD_LOCAL(value ex6) -+ 101 STORE_LOCAL(value x4) -+ 101 SCOPE_ENTER value x4 -+ 106 LOAD_LOCAL(value x4) -+ 106 IS_INSTANCE REF(class MyException) -+ 106 CZJUMP (BOOL)NE ? 5 : 8 -+ - 13: -@@ -447,5 +452,2 @@ - 101 SCOPE_ENTER value x4 -- 101 JUMP 4 -- -- 4: - 106 LOAD_LOCAL(value x4) -@@ -459,8 +461,5 @@ - 106 SCOPE_ENTER value x5 -- 106 LOAD_LOCAL(value x5) -- 106 CALL_METHOD MyException.message (dynamic) -- 106 STORE_LOCAL(value message) -- 106 SCOPE_ENTER value message - 106 LOAD_MODULE object Predef -- 106 LOAD_LOCAL(value message) -+ ? LOAD_LOCAL(value x5) -+ 106 CALL_METHOD MyException.message (dynamic) - 106 CALL_METHOD scala.Predef.println (dynamic) -@@ -536,3 +535,3 @@ - startBlock: 1 -- blocks: [1,2,3,4,6,7,9,10] -+ blocks: [1,3,4,6,7,9,10,11,12,13] - -@@ -565,4 +564,9 @@ - 306 CALL_METHOD MyException.<init> (static-instance) -- 306 THROW(MyException) -+ ? JUMP 11 - -+ 11: -+ ? LOAD_LOCAL(variable monitor4) -+ 305 MONITOR_EXIT -+ ? JUMP 12 -+ - 9: -@@ -571,3 +575,3 @@ - 305 MONITOR_EXIT -- ? THROW(Throwable) -+ ? JUMP 12 - -@@ -577,4 +581,11 @@ - 304 MONITOR_EXIT -- ? THROW(Throwable) -+ ? STORE_LOCAL(value t) -+ ? JUMP 13 - -+ 12: -+ ? LOAD_LOCAL(variable monitor3) -+ 304 MONITOR_EXIT -+ ? STORE_LOCAL(value t) -+ ? JUMP 13 -+ - 3: -@@ -591,5 +602,14 @@ - 310 CALL_METHOD scala.Predef.println (dynamic) -- 310 JUMP 2 -+ 300 RETURN(UNIT) - -- 2: -+ 13: -+ 310 LOAD_MODULE object Predef -+ 310 CALL_PRIMITIVE(StartConcat) -+ 310 CONSTANT("Caught crash: ") -+ 310 CALL_PRIMITIVE(StringConcat(REF(class String))) -+ 310 LOAD_LOCAL(value t) -+ 310 CALL_METHOD java.lang.Throwable.toString (dynamic) -+ 310 CALL_PRIMITIVE(StringConcat(REF(class String))) -+ 310 CALL_PRIMITIVE(EndConcat) -+ 310 CALL_METHOD scala.Predef.println (dynamic) - 300 RETURN(UNIT) -@@ -601,6 +621,6 @@ - with finalizer: null -- catch (Throwable) in Vector(7, 9, 10) starting at: 6 -+ catch (Throwable) in Vector(7, 9, 10, 11) starting at: 6 - consisting of blocks: List(6) - with finalizer: null -- catch (Throwable) in Vector(4, 6, 7, 9, 10) starting at: 3 -+ catch (Throwable) in Vector(4, 6, 7, 9, 10, 11, 12) starting at: 3 - consisting of blocks: List(3) -@@ -636,3 +656,3 @@ - startBlock: 1 -- blocks: [1,3,4,5,6,8,9] -+ blocks: [1,3,4,5,6,8,9,10,11] - -@@ -660,4 +680,10 @@ - 78 CALL_METHOD java.lang.IllegalArgumentException.<init> (static-instance) -- 78 THROW(IllegalArgumentException) -+ ? STORE_LOCAL(value e) -+ ? JUMP 10 - -+ 10: -+ 81 LOAD_LOCAL(value e) -+ ? STORE_LOCAL(variable exc1) -+ ? JUMP 11 -+ - 8: -@@ -686,3 +712,4 @@ - 81 LOAD_LOCAL(value e) -- 81 THROW(Exception) -+ ? STORE_LOCAL(variable exc1) -+ ? JUMP 11 - -@@ -703,2 +730,15 @@ - -+ 11: -+ 83 LOAD_MODULE object Predef -+ 83 CONSTANT("finally") -+ 83 CALL_METHOD scala.Predef.println (dynamic) -+ 84 LOAD_LOCAL(variable result) -+ 84 CONSTANT(1) -+ 84 CALL_PRIMITIVE(Arithmetic(SUB,INT)) -+ 84 CONSTANT(2) -+ 84 CALL_PRIMITIVE(Arithmetic(DIV,INT)) -+ 84 STORE_LOCAL(variable result) -+ 84 LOAD_LOCAL(variable exc1) -+ 84 THROW(Throwable) -+ - } -@@ -708,3 +748,3 @@ - with finalizer: null -- catch (<none>) in Vector(4, 5, 6, 8) starting at: 3 -+ catch (<none>) in Vector(4, 5, 6, 8, 10) starting at: 3 - consisting of blocks: List(3) -@@ -732,5 +772,5 @@ - def main(args: Array[String] (ARRAY[REF(class String)])): Unit { -- locals: value args, variable result, value ex6, variable exc2, value x4, value x5, value message, value x, value ex6, value x4, value x5, value message, value x -+ locals: value args, variable result, value ex6, variable exc2, value x4, value x5, value x, value ex6, value x4, value x5, value x - startBlock: 1 -- blocks: [1,3,4,5,6,9,13,14,15,18,20,21,23,24] -+ blocks: [1,3,4,5,6,9,13,14,15,18,20,21,23,24,25,26,27] - -@@ -758,4 +798,11 @@ - 172 CALL_METHOD MyException.<init> (static-instance) -- 172 THROW(MyException) -+ ? STORE_LOCAL(value ex6) -+ ? JUMP 25 - -+ 25: -+ 170 LOAD_LOCAL(value ex6) -+ 170 STORE_LOCAL(value x4) -+ 170 SCOPE_ENTER value x4 -+ 170 JUMP 14 -+ - 23: -@@ -798,8 +845,5 @@ - 175 SCOPE_ENTER value x5 -- 175 LOAD_LOCAL(value x5) -- 175 CALL_METHOD MyException.message (dynamic) -- 175 STORE_LOCAL(value message) -- 175 SCOPE_ENTER value message - 176 LOAD_MODULE object Predef -- 176 LOAD_LOCAL(value message) -+ ? LOAD_LOCAL(value x5) -+ 176 CALL_METHOD MyException.message (dynamic) - 176 CALL_METHOD scala.Predef.println (dynamic) -@@ -807,5 +851,7 @@ - 177 DUP(REF(class MyException)) -- 177 LOAD_LOCAL(value message) -+ ? LOAD_LOCAL(value x5) -+ 177 CALL_METHOD MyException.message (dynamic) - 177 CALL_METHOD MyException.<init> (static-instance) -- 177 THROW(MyException) -+ ? STORE_LOCAL(value ex6) -+ ? JUMP 26 - -@@ -813,3 +859,4 @@ - 170 LOAD_LOCAL(value ex6) -- 170 THROW(Throwable) -+ ? STORE_LOCAL(value ex6) -+ ? JUMP 26 - -@@ -823,2 +870,8 @@ - -+ 26: -+ 169 LOAD_LOCAL(value ex6) -+ 169 STORE_LOCAL(value x4) -+ 169 SCOPE_ENTER value x4 -+ 169 JUMP 5 -+ - 5: -@@ -833,8 +886,5 @@ - 180 SCOPE_ENTER value x5 -- 180 LOAD_LOCAL(value x5) -- 180 CALL_METHOD MyException.message (dynamic) -- 180 STORE_LOCAL(value message) -- 180 SCOPE_ENTER value message - 181 LOAD_MODULE object Predef -- 181 LOAD_LOCAL(value message) -+ ? LOAD_LOCAL(value x5) -+ 181 CALL_METHOD MyException.message (dynamic) - 181 CALL_METHOD scala.Predef.println (dynamic) -@@ -842,5 +892,7 @@ - 182 DUP(REF(class MyException)) -- 182 LOAD_LOCAL(value message) -+ ? LOAD_LOCAL(value x5) -+ 182 CALL_METHOD MyException.message (dynamic) - 182 CALL_METHOD MyException.<init> (static-instance) -- 182 THROW(MyException) -+ ? STORE_LOCAL(variable exc2) -+ ? JUMP 27 - -@@ -848,3 +900,4 @@ - 169 LOAD_LOCAL(value ex6) -- 169 THROW(Throwable) -+ ? STORE_LOCAL(variable exc2) -+ ? JUMP 27 - -@@ -865,2 +918,15 @@ - -+ 27: -+ 184 LOAD_MODULE object Predef -+ 184 CONSTANT("finally") -+ 184 CALL_METHOD scala.Predef.println (dynamic) -+ 185 LOAD_LOCAL(variable result) -+ 185 CONSTANT(1) -+ 185 CALL_PRIMITIVE(Arithmetic(SUB,INT)) -+ 185 CONSTANT(2) -+ 185 CALL_PRIMITIVE(Arithmetic(DIV,INT)) -+ 185 STORE_LOCAL(variable result) -+ 185 LOAD_LOCAL(variable exc2) -+ 185 THROW(Throwable) -+ - } -@@ -870,6 +936,6 @@ - with finalizer: null -- catch (Throwable) in Vector(13, 14, 15, 18, 20, 21, 23) starting at: 4 -+ catch (Throwable) in Vector(13, 14, 15, 18, 20, 21, 23, 25) starting at: 4 - consisting of blocks: List(9, 8, 6, 5, 4) - with finalizer: null -- catch (<none>) in Vector(4, 5, 6, 9, 13, 14, 15, 18, 20, 21, 23) starting at: 3 -+ catch (<none>) in Vector(4, 5, 6, 9, 13, 14, 15, 18, 20, 21, 23, 25, 26) starting at: 3 - consisting of blocks: List(3) -@@ -897,5 +963,5 @@ - def main(args: Array[String] (ARRAY[REF(class String)])): Unit { -- locals: value args, variable result, value e, value ex6, value x4, value x5, value message, value x -+ locals: value args, variable result, value e, value ex6, value x4, value x5, value x - startBlock: 1 -- blocks: [1,2,3,6,7,8,11,13,14,16] -+ blocks: [1,2,3,6,7,8,11,13,14,16,17] - -@@ -923,4 +989,11 @@ - 124 CALL_METHOD MyException.<init> (static-instance) -- 124 THROW(MyException) -+ ? STORE_LOCAL(value ex6) -+ ? JUMP 17 - -+ 17: -+ 122 LOAD_LOCAL(value ex6) -+ 122 STORE_LOCAL(value x4) -+ 122 SCOPE_ENTER value x4 -+ 122 JUMP 7 -+ - 16: -@@ -948,8 +1021,5 @@ - 127 SCOPE_ENTER value x5 -- 127 LOAD_LOCAL(value x5) -- 127 CALL_METHOD MyException.message (dynamic) -- 127 STORE_LOCAL(value message) -- 127 SCOPE_ENTER value message - 127 LOAD_MODULE object Predef -- 127 LOAD_LOCAL(value message) -+ ? LOAD_LOCAL(value x5) -+ 127 CALL_METHOD MyException.message (dynamic) - 127 CALL_METHOD scala.Predef.println (dynamic) -@@ -982,3 +1052,3 @@ - with finalizer: null -- catch (IllegalArgumentException) in Vector(6, 7, 8, 11, 13, 14, 16) starting at: 3 -+ catch (IllegalArgumentException) in Vector(6, 7, 8, 11, 13, 14, 16, 17) starting at: 3 - consisting of blocks: List(3) -@@ -1006,5 +1076,5 @@ - def main(args: Array[String] (ARRAY[REF(class String)])): Unit { -- locals: value args, variable result, value ex6, value x4, value x5, value message, value x, value e -+ locals: value args, variable result, value ex6, value x4, value x5, value x, value e - startBlock: 1 -- blocks: [1,2,3,4,5,8,12,13,14,16] -+ blocks: [1,2,3,5,8,12,13,14,16,17] - -@@ -1032,4 +1102,13 @@ - 148 CALL_METHOD MyException.<init> (static-instance) -- 148 THROW(MyException) -+ ? STORE_LOCAL(value ex6) -+ ? JUMP 17 - -+ 17: -+ 145 LOAD_LOCAL(value ex6) -+ 145 STORE_LOCAL(value x4) -+ 145 SCOPE_ENTER value x4 -+ 154 LOAD_LOCAL(value x4) -+ 154 IS_INSTANCE REF(class MyException) -+ 154 CZJUMP (BOOL)NE ? 5 : 8 -+ - 16: -@@ -1053,5 +1132,2 @@ - 145 SCOPE_ENTER value x4 -- 145 JUMP 4 -- -- 4: - 154 LOAD_LOCAL(value x4) -@@ -1065,8 +1141,5 @@ - 154 SCOPE_ENTER value x5 -- 154 LOAD_LOCAL(value x5) -- 154 CALL_METHOD MyException.message (dynamic) -- 154 STORE_LOCAL(value message) -- 154 SCOPE_ENTER value message - 154 LOAD_MODULE object Predef -- 154 LOAD_LOCAL(value message) -+ ? LOAD_LOCAL(value x5) -+ 154 CALL_METHOD MyException.message (dynamic) - 154 CALL_METHOD scala.Predef.println (dynamic) -@@ -1287,3 +1360,3 @@ - startBlock: 1 -- blocks: [1,2,3,4,5,7] -+ blocks: [1,2,3,4,5,7,8] - -@@ -1311,4 +1384,11 @@ - 38 CALL_METHOD java.lang.IllegalArgumentException.<init> (static-instance) -- 38 THROW(IllegalArgumentException) -+ ? STORE_LOCAL(value e) -+ ? JUMP 8 - -+ 8: -+ 42 LOAD_MODULE object Predef -+ 42 CONSTANT("IllegalArgumentException") -+ 42 CALL_METHOD scala.Predef.println (dynamic) -+ 42 JUMP 2 -+ - 7: -@@ -1358,5 +1438,5 @@ - def main(args: Array[String] (ARRAY[REF(class String)])): Unit { -- locals: value args, variable result, value ex6, value x4, value x5, value message, value x -+ locals: value args, variable result, value ex6, value x4, value x5, value x - startBlock: 1 -- blocks: [1,2,3,4,5,8,10,11,13,14,16] -+ blocks: [1,2,3,5,8,10,11,13,14,16,17] - -@@ -1384,3 +1464,4 @@ - 203 CALL_METHOD MyException.<init> (static-instance) -- 203 THROW(MyException) -+ ? STORE_LOCAL(value ex6) -+ ? JUMP 17 - -@@ -1404,4 +1485,13 @@ - 209 CALL_METHOD MyException.<init> (static-instance) -- 209 THROW(MyException) -+ ? STORE_LOCAL(value ex6) -+ ? JUMP 17 - -+ 17: -+ 200 LOAD_LOCAL(value ex6) -+ 200 STORE_LOCAL(value x4) -+ 200 SCOPE_ENTER value x4 -+ 212 LOAD_LOCAL(value x4) -+ 212 IS_INSTANCE REF(class MyException) -+ 212 CZJUMP (BOOL)NE ? 5 : 8 -+ - 16: -@@ -1417,5 +1507,2 @@ - 200 SCOPE_ENTER value x4 -- 200 JUMP 4 -- -- 4: - 212 LOAD_LOCAL(value x4) -@@ -1429,8 +1516,5 @@ - 212 SCOPE_ENTER value x5 -- 212 LOAD_LOCAL(value x5) -- 212 CALL_METHOD MyException.message (dynamic) -- 212 STORE_LOCAL(value message) -- 212 SCOPE_ENTER value message - 213 LOAD_MODULE object Predef -- 213 LOAD_LOCAL(value message) -+ ? LOAD_LOCAL(value x5) -+ 213 CALL_METHOD MyException.message (dynamic) - 213 CALL_METHOD scala.Predef.println (dynamic) -@@ -1478,3 +1562,3 @@ - startBlock: 1 -- blocks: [1,2,3,4,5,7] -+ blocks: [1,2,3,4,5,7,8] - -@@ -1502,4 +1586,11 @@ - 58 CALL_METHOD java.lang.IllegalArgumentException.<init> (static-instance) -- 58 THROW(IllegalArgumentException) -+ ? STORE_LOCAL(value e) -+ ? JUMP 8 - -+ 8: -+ 62 LOAD_MODULE object Predef -+ 62 CONSTANT("RuntimeException") -+ 62 CALL_METHOD scala.Predef.println (dynamic) -+ 62 JUMP 2 -+ - 7: -@@ -1551,3 +1642,3 @@ - startBlock: 1 -- blocks: [1,3,4] -+ blocks: [1,3,4,5] - -@@ -1571,4 +1662,9 @@ - 229 CALL_METHOD MyException.<init> (static-instance) -- 229 THROW(MyException) -+ ? JUMP 5 - -+ 5: -+ ? LOAD_LOCAL(variable monitor1) -+ 228 MONITOR_EXIT -+ 228 THROW(Throwable) -+ - 3: -@@ -1577,3 +1673,3 @@ - 228 MONITOR_EXIT -- ? THROW(Throwable) -+ 228 THROW(Throwable) - -@@ -1605,5 +1701,5 @@ - def main(args: Array[String] (ARRAY[REF(class String)])): Unit { -- locals: value args, variable result, variable monitor2, variable monitorResult1 -+ locals: value exception$1, value args, variable result, variable monitor2, variable monitorResult1 - startBlock: 1 -- blocks: [1,3,4] -+ blocks: [1,3,4,5] - -@@ -1630,4 +1726,12 @@ - 245 CALL_METHOD MyException.<init> (static-instance) -- 245 THROW(MyException) -+ ? STORE_LOCAL(value exception$1) -+ ? DROP ConcatClass -+ ? LOAD_LOCAL(value exception$1) -+ ? JUMP 5 - -+ 5: -+ ? LOAD_LOCAL(variable monitor2) -+ 244 MONITOR_EXIT -+ 244 THROW(Throwable) -+ - 3: -@@ -1636,3 +1740,3 @@ - 244 MONITOR_EXIT -- ? THROW(Throwable) -+ 244 THROW(Throwable) diff --git a/test/pending/run/inline-ex-handlers.scala b/test/pending/run/inline-ex-handlers.scala deleted file mode 100644 index 964594d258..0000000000 --- a/test/pending/run/inline-ex-handlers.scala +++ /dev/null @@ -1,329 +0,0 @@ -import scala.tools.partest.IcodeComparison - -object Test extends IcodeComparison { - override def printIcodeAfterPhase = "inlinehandlers" -} - -import scala.util.Random._ - -/** There should be no inlining taking place in this class */ -object TestInlineHandlersNoInline { - - def main(args: Array[String]): Unit = { - println("TestInlineHandlersNoInline") - var result = -1 - - try { - if (nextInt % 2 == 0) - throw new IllegalArgumentException("something") - result = 1 - } catch { - case e: StackOverflowError => - println("Stack overflow") - } - - result - } -} - -/** Just a simple inlining should take place in this class */ -object TestInlineHandlersSimpleInline { - - def main(args: Array[String]): Unit = { - println("TestInlineHandlersSimpleInline") - var result = -1 - - try { - if (nextInt % 2 == 0) - throw new IllegalArgumentException("something") - result = 1 - } catch { - case e: IllegalArgumentException => - println("IllegalArgumentException") - } - - result - } -} - -/** Inlining should take place because the handler is taking a superclass of the exception thrown */ -object TestInlineHandlersSubclassInline { - - def main(args: Array[String]): Unit = { - println("TestInlineHandlersSubclassInline") - var result = -1 - - try { - if (nextInt % 2 == 0) - throw new IllegalArgumentException("something") - result = 1 - } catch { - case e: RuntimeException => - println("RuntimeException") - } - - result - } -} - -/** For this class, the finally handler should be inlined */ -object TestInlineHandlersFinallyInline { - - def main(args: Array[String]): Unit = { - println("TestInlineHandlersFinallyInline") - var result = -1 - - try { - if (nextInt % 2 == 0) - throw new IllegalArgumentException("something") - result = 1 - } catch { - case e: Exception => throw e - } finally { - println("finally") - result = (result - 1) / 2 - } - - result - } -} - - -case class MyException(message: String) extends RuntimeException(message) - -/** For this class, we test inlining for a case class error */ -object TestInlineHandlersCaseClassExceptionInline { - - def main(args: Array[String]): Unit = { - println("TestInlineHandlersCaseClassExceptionInline") - var result = -1 - - try { - if (nextInt % 2 == 0) - throw new MyException("something") - result = 1 - } catch { - case MyException(message) => println(message) - } - - result - } -} - - -/** For this class, inline should take place in the inner handler */ -object TestInlineHandlersNestedHandlerInnerInline { - - def main(args: Array[String]): Unit = { - println("TestInlineHandlersNestedHandlersInnerInline") - var result = -1 - - try { - try { - if (nextInt % 2 == 0) - throw new MyException("something") - result = 1 - } catch { - case MyException(message) => println(message) - } - } catch { - case e: IllegalArgumentException => println("IllegalArgumentException") - } - - result - } -} - - -/** For this class, inline should take place in the outer handler */ -object TestInlineHandlersNestedHandlerOuterInline { - - def main(args: Array[String]): Unit = { - println("TestInlineHandlersNestedHandlersOuterInline") - var result = -1 - - try { - try { - if (nextInt % 2 == 0) - throw new MyException("something") - result = 1 - } catch { - case e: IllegalArgumentException => println("IllegalArgumentException") - } - } catch { - case MyException(message) => println(message) - } - - result - } -} - - -/** For this class, inline should take place in the all handlers (inner, outer and finally) */ -object TestInlineHandlersNestedHandlerAllInline { - - def main(args: Array[String]): Unit = { - println("TestInlineHandlersNestedHandlersOuterInline") - var result = -1 - - try { - try { - if (nextInt % 2 == 0) - throw new MyException("something") - result = 1 - } catch { - case MyException(message) => - println(message) - throw MyException(message) - } - } catch { - case MyException(message) => - println(message) - throw MyException(message) - } finally { - println("finally") - result = (result - 1) / 2 - } - - result - } -} - - -/** This class is meant to test whether the inline handler is copied only once for multiple inlines */ -object TestInlineHandlersSingleCopy { - - def main(args: Array[String]): Unit = { - println("TestInlineHandlersSingleCopy") - var result = -1 - - try { - - if (nextInt % 2 == 0) - throw new MyException("something") - - println("A side effect in the middle") - result = 3 // another one - - if (nextInt % 3 == 2) - throw new MyException("something else") - result = 1 - } catch { - case MyException(message) => - println(message) - } - - result - } -} - -/** This should test the special exception handler for synchronized blocks */ -object TestInlineHandlersSynchronized { - - def main(args: Array[String]): Unit = { - println("TestInlineHandlersSynchronized") - var result = "hello" - - // any exception thrown here will be caught by a default handler that does MONTIOR_EXIT on result :) - result.synchronized { - throw MyException(result) - } - - result.length - } -} - -/** This should test the special exception handler for synchronized blocks with stack */ -object TestInlineHandlersSynchronizedWithStack { - - def main(args: Array[String]): Unit = { - println("TestInlineHandlersSynchronizedWithStack") - var result = "hello" - - // any exception thrown here will be caught by a default handler that does MONTIOR_EXIT on result :) - result = "abc" + result.synchronized { - throw MyException(result) - } - - result.length - } -} - -/** This test should trigger a bug in the dead code elimination phase - it actually crashes ICodeCheckers -object TestInlineHandlersSynchronizedWithStackDoubleThrow { - - def main(args: Array[String]): Unit = { - println("TestInlineHandlersSynchronizedWithStackDoubleThrow") - var result = "a" - - // any exception thrown here will be caught by a default handler that does MONTIOR_EXIT on result :) - result += result.synchronized { throw MyException(result) } - result += result.synchronized { throw MyException(result) } - - result.length - } -} -*/ - -/** This test should check the preciseness of the inliner: it should not do any inlining here -* as it is not able to discern between the different exceptions -*/ -object TestInlineHandlersPreciseness { - - def main(args: Array[String]): Unit = { - println("TestInlineHandlersCorrectHandler") - - try { - val exception: Throwable = - if (scala.util.Random.nextInt % 2 == 0) - new IllegalArgumentException("even") - else - new StackOverflowError("odd") - throw exception - } catch { - case e: IllegalArgumentException => - println("Correct, IllegalArgumentException") - case e: StackOverflowError => - println("Correct, StackOverflowException") - case t: Throwable => - println("WROOOONG, not Throwable!") - } - } -} - -/** This check should verify that the double no-local exception handler is duplicated correctly */ -object TestInlineHandlersDoubleNoLocal { - - val a1: String = "a" - val a2: String = "b" - - def main(args: Array[String]): Unit = { - println("TestInlineHandlersDoubleNoLocal") - - try { - a1.synchronized { - a2. synchronized { - throw new MyException("crash") - } - } - } catch { - case t: Throwable => println("Caught crash: " + t.toString) - } - - /* try { - val exception: Throwable = - if (scala.util.Random.nextInt % 2 == 0) - new IllegalArgumentException("even") - else - new StackOverflowError("odd") - throw exception - } catch { - case e: IllegalArgumentException => - println("Correct, IllegalArgumentException") - case e: StackOverflowError => - println("Correct, StackOverflowException") - case t: Throwable => - println("WROOOONG, not Throwable!") - }*/ - } -} diff --git a/test/pending/run/instanceOfAndTypeMatching.scala b/test/pending/run/instanceOfAndTypeMatching.scala deleted file mode 100644 index e04ae13585..0000000000 --- a/test/pending/run/instanceOfAndTypeMatching.scala +++ /dev/null @@ -1,192 +0,0 @@ -// Summary of incorrect or questionable behavior. -// Full code and successful parts follow. - -object Summary { - class Outer { - class Inner { } - def f() = { class MethodInner ; new MethodInner } - } - - // 1 static issue: - // - // Given method in MethodInner: def g(other: MethodInner) = () - // method1.g(method1) fails to compile with type error. - // - // Note that this cannot be worked around by widening the return type - // of f() because MethodInner is declared inside of f. So there is no way - // I see for a class declared inside a method to receive members of its - // own declared type -- not only the narrow type of those from this - // instance, but ANY members, because there is no Foo#Bar syntax which will - // traverse a method. - // - // 4 runtime issues: - // - // From the outside: inner1.isInstanceOf[outer2.Inner] is true, should (maybe) be false - // From inside inner1: inner2.isInstanceOf[Outer.this.Inner] is true, should (maybe) be false - // From the outside: inner1 match { case _: outer2.Inner => true ... } is true, should definitely be false - // From inside method1: method2 match { case _: MethodInner => true ... } is true, should definitely be false - // - // Note that the fact that every test returns true on instances of MethodInner means - // that it is impossible to draw any type distinction between instances. As far as one - // can tell, they are all of the same type regardless not only of whether they were - // created on the same method invocation but whether they are contained in the same - // instance of Outer. - // - // WRT "same method invocation", see Iterator.duplicate for an example of this. -} - -// Tests - -class Outer { - class Inner { - def passOuter(other: Outer) = () // pass any Outer - def passThisType(other: Outer.this.type) = () // pass only this Outer instance - def passInner(other: Inner) = () // pass only Inners from this Outer instance - def passInner2(other: Outer.this.Inner) = () // same as above - def passInnerSharp(other: Outer#Inner) = () // pass any Inner - - def compareSimpleWithTypeMatch(other: Any) = other match { - case _: Inner => true - case _ => false - } - def compareSimpleWithInstanceOf(other: Any) = other.isInstanceOf[Inner] - - def compareSharpWithTypeMatch(other: Any) = { - other match { - case _: Outer#Inner => true - case _ => false - } - } - def compareSharpWithInstanceOf(other: Any) = other.isInstanceOf[Outer#Inner] - - def comparePathWithTypeMatch(other: Any) = other match { - case _: Outer.this.Inner => true - case _ => false - } - def comparePathWithInstanceOf(other: Any) = other.isInstanceOf[Outer.this.Inner] - } - - def f() = { - class MethodInner { - def passOuter(other: Outer) = () // pass any Outer - def passThisType(other: Outer.this.type) = () // pass only this Outer instance - def passInner(other: Inner) = () // pass only Inners from this Outer instance - def passInner2(other: Outer.this.Inner) = () // same as above - def passInnerSharp(other: Outer#Inner) = () // pass any Inner - def passMethodInner(other: MethodInner) = () // pass only MethodInners from this Outer instance - // is there any way to refer to Outer#MethodInner? Not that there should be. - - def compareWithInstanceOf(other: Any) = other.isInstanceOf[MethodInner] - def compareWithTypeMatch(other: Any) = other match { - case _: MethodInner => true - case _ => false - } - } - - new MethodInner - } -} - -object Test { - val outer1 = new Outer - val outer2 = new Outer - val inner1 = new outer1.Inner - val inner2 = new outer2.Inner - val method1 = outer1.f() - val method2 = outer2.f() - - def testInnerStatic = { - // these should all work - inner1.passOuter(outer1) - inner1.passOuter(outer2) - inner1.passThisType(outer1) - inner1.passInner(inner1) - inner1.passInner2(inner1) - inner1.passInnerSharp(inner1) - inner1.passInnerSharp(inner2) - - // these should all fail to compile, and do - // - // inner1.passThisType(outer2) - // inner1.passInner(inner2) - // inner1.passInner2(inner2) - } - def testInnerRuntime = { - println("testInnerRuntime\n") - - List("These should be true under any scenario: ", - inner1.isInstanceOf[outer1.Inner] , - inner1.isInstanceOf[Outer#Inner] , - (inner1: Any) match { case _: Outer#Inner => true ; case _ => false } , - (inner1: Any) match { case _: outer1.Inner => true ; case _ => false } , - inner1.compareSharpWithTypeMatch(inner2) , - inner1.compareSharpWithInstanceOf(inner2) - ) foreach println - - List("These should be true under current proposal: ", - inner1.compareSimpleWithInstanceOf(inner2) - ) foreach println - - List("These should be false under current proposal: ", - inner1.compareSimpleWithTypeMatch(inner2) , - inner1.comparePathWithTypeMatch(inner2) - ) foreach println - - List("These return true but I think should return false: ", - inner1.isInstanceOf[outer2.Inner] , // true - inner1.comparePathWithInstanceOf(inner2) // true - ) foreach println - - List("These are doing the wrong thing under current proposal", - (inner1: Any) match { case _: outer2.Inner => true ; case _ => false } // should be false - ) foreach println - } - - def testMethodInnerStatic = { - // these should all work - method1.passOuter(outer1) - method1.passOuter(outer2) - method1.passThisType(outer1) - method1.passInner(inner1) - method1.passInner2(inner1) - method1.passInnerSharp(inner1) - method1.passInnerSharp(inner2) - // This fails with: - // - // a.scala:114: error: type mismatch; - // found : Test.method1.type (with underlying type MethodInner forSome { type MethodInner <: java.lang.Object with ScalaObject{def passOuter(other: Outer): Unit; def passThisType(other: Test.outer1.type): Unit; def passInner(other: Test.outer1.Inner): Unit; def passInner2(other: Test.outer1.Inner): Unit; def passInnerSharp(other: Outer#Inner): Unit; def passMethodInner(other: MethodInner): Unit} }) - // required: MethodInner where type MethodInner <: java.lang.Object with ScalaObject{def passOuter(other: Outer): Unit; def passThisType(other: Test.outer1.type): Unit; def passInner(other: Test.outer1.Inner): Unit; def passInner2(other: Test.outer1.Inner): Unit; def passInnerSharp(other: Outer#Inner): Unit; def passMethodInner(other: MethodInner): Unit} - // method1.passMethodInner(method1) - // ^ - method1.passMethodInner(method1) - - // these should all fail to compile, and do - // - // method1.passThisType(outer2) - // method1.passInner(inner2) - // method1.passInner2(inner2) - // method1.passMethodInner(method2) - } - - def testMethodInnerRuntime = { - println("\ntestMethodInnerRuntime\n") - - List("These should be true under any scenario: ", - method1.compareWithInstanceOf(method1) , - method1.compareWithTypeMatch(method1) - ) foreach println - - List("These should be true under current proposal: ", - method1.compareWithInstanceOf(method2) - ) foreach println - - List("These are doing the wrong thing under current proposal", - method1.compareWithTypeMatch(method2) // should be false - ) foreach println - } - - def main(args: Array[String]): Unit = { - testInnerRuntime - testMethodInnerRuntime - } -} diff --git a/test/pending/run/jar-version.scala b/test/pending/run/jar-version.scala deleted file mode 100644 index b79dfe733d..0000000000 --- a/test/pending/run/jar-version.scala +++ /dev/null @@ -1,11 +0,0 @@ -import scala.util.Properties._ -import scala.tools.nsc.util.ClassPath._ - -object Test { - def main(args: Array[String]): Unit = { - infoFor(this).jarManifestMainAttrs get ScalaCompilerVersion match { - case Some(v) => println("I was built by scala compiler version " + v) - case _ => println("I was not apprised of which scala compiler version built me.") - } - } -} diff --git a/test/pending/run/macro-expand-default.flags b/test/pending/run/macro-expand-default.flags deleted file mode 100644 index cd66464f2f..0000000000 --- a/test/pending/run/macro-expand-default.flags +++ /dev/null @@ -1 +0,0 @@ --language:experimental.macros
\ No newline at end of file diff --git a/test/pending/run/macro-expand-default/Impls_1.scala b/test/pending/run/macro-expand-default/Impls_1.scala deleted file mode 100644 index fd5d8d7f18..0000000000 --- a/test/pending/run/macro-expand-default/Impls_1.scala +++ /dev/null @@ -1,10 +0,0 @@ -import scala.reflect.macros.blackbox.Context - -object Impls { - def foo(c: Context)(x: c.Expr[Int], y: c.Expr[Int]) = { - import c.universe._ - val sum = Apply(Select(x.tree, TermName("$minus")), List(y.tree)) - val body = Apply(Select(Ident(definitions.PredefModule), TermName("println")), List(sum)) - Expr[Unit](body) - } -}
\ No newline at end of file diff --git a/test/pending/run/macro-expand-default/Macros_Test_2.scala b/test/pending/run/macro-expand-default/Macros_Test_2.scala deleted file mode 100644 index 92fe84d04a..0000000000 --- a/test/pending/run/macro-expand-default/Macros_Test_2.scala +++ /dev/null @@ -1,8 +0,0 @@ -object Test extends App { - def foo(x: Int = 2, y: Int = -40) = macro Impls.foo - foo(y = -40, x = 2) - foo(x = 2, y = -40) - foo(x = 100) - foo(y = 100) - foo() -}
\ No newline at end of file diff --git a/test/pending/run/macro-expand-implicit-macro-defeats-type-inference.check b/test/pending/run/macro-expand-implicit-macro-defeats-type-inference.check deleted file mode 100644 index e7cb9c367b..0000000000 --- a/test/pending/run/macro-expand-implicit-macro-defeats-type-inference.check +++ /dev/null @@ -1,6 +0,0 @@ -openImplicits are: List() -enclosingImplicits are: List((List[Int],scala.this.Predef.implicitly[List[Int]])) -typetag is: TypeTag[Nothing] -openImplicits are: List() -enclosingImplicits are: List((List[String],Test.this.bar[String])) -typetag is: TypeTag[Nothing] diff --git a/test/pending/run/macro-expand-implicit-macro-defeats-type-inference.flags b/test/pending/run/macro-expand-implicit-macro-defeats-type-inference.flags deleted file mode 100644 index cd66464f2f..0000000000 --- a/test/pending/run/macro-expand-implicit-macro-defeats-type-inference.flags +++ /dev/null @@ -1 +0,0 @@ --language:experimental.macros
\ No newline at end of file diff --git a/test/pending/run/macro-expand-implicit-macro-defeats-type-inference/Impls_1.scala b/test/pending/run/macro-expand-implicit-macro-defeats-type-inference/Impls_1.scala deleted file mode 100644 index e8170fda07..0000000000 --- a/test/pending/run/macro-expand-implicit-macro-defeats-type-inference/Impls_1.scala +++ /dev/null @@ -1,10 +0,0 @@ -import scala.reflect.macros.whitebox.Context - -object Impls { - def foo[T: c.WeakTypeTag](c: Context): c.Expr[List[T]] = c.universe.reify { - println("openImplicits are: " + c.literal(c.openImplicits.toString).splice) - println("enclosingImplicits are: " + c.literal(c.enclosingImplicits.toString).splice) - println("typetag is: " + c.literal(c.tag[T].toString).splice) - null - } -}
\ No newline at end of file diff --git a/test/pending/run/macro-expand-implicit-macro-defeats-type-inference/Macros_Test_2.scala b/test/pending/run/macro-expand-implicit-macro-defeats-type-inference/Macros_Test_2.scala deleted file mode 100644 index 27d0662799..0000000000 --- a/test/pending/run/macro-expand-implicit-macro-defeats-type-inference/Macros_Test_2.scala +++ /dev/null @@ -1,6 +0,0 @@ -object Test extends App { - implicit def foo[T]: List[T] = macro Impls.foo[T] - def bar[T](implicit foo: List[T]) {} - implicitly[List[Int]] - bar[String] -}
\ No newline at end of file diff --git a/test/pending/run/macro-expand-macro-has-context-bound.check b/test/pending/run/macro-expand-macro-has-context-bound.check deleted file mode 100644 index ac4213d6e9..0000000000 --- a/test/pending/run/macro-expand-macro-has-context-bound.check +++ /dev/null @@ -1 +0,0 @@ -43
\ No newline at end of file diff --git a/test/pending/run/macro-expand-macro-has-context-bound.flags b/test/pending/run/macro-expand-macro-has-context-bound.flags deleted file mode 100644 index cd66464f2f..0000000000 --- a/test/pending/run/macro-expand-macro-has-context-bound.flags +++ /dev/null @@ -1 +0,0 @@ --language:experimental.macros
\ No newline at end of file diff --git a/test/pending/run/macro-expand-macro-has-context-bound/Impls_1.scala b/test/pending/run/macro-expand-macro-has-context-bound/Impls_1.scala deleted file mode 100644 index 34182b7968..0000000000 --- a/test/pending/run/macro-expand-macro-has-context-bound/Impls_1.scala +++ /dev/null @@ -1,10 +0,0 @@ -import scala.reflect.macros.blackbox.Context - -object Impls { - def foo[U](c: Context)(x: c.Expr[U])(evidence: c.Expr[Numeric[U]]) = { - import c.universe._ - val plusOne = Apply(Select(evidence.tree, TermName("plus")), List(x.tree, Literal(Constant(1)))) - val body = Apply(Select(Ident(definitions.PredefModule), TermName("println")), List(plusOne)) - Expr[Unit](body) - } -}
\ No newline at end of file diff --git a/test/pending/run/macro-expand-macro-has-context-bound/Macros_Test_2.scala b/test/pending/run/macro-expand-macro-has-context-bound/Macros_Test_2.scala deleted file mode 100644 index 7d16b773a6..0000000000 --- a/test/pending/run/macro-expand-macro-has-context-bound/Macros_Test_2.scala +++ /dev/null @@ -1,4 +0,0 @@ -object Test extends App { - def foo[U: Numeric](x: U) = macro Impls.foo[U] - foo(42) -}
\ No newline at end of file diff --git a/test/pending/run/macro-expand-named.flags b/test/pending/run/macro-expand-named.flags deleted file mode 100644 index cd66464f2f..0000000000 --- a/test/pending/run/macro-expand-named.flags +++ /dev/null @@ -1 +0,0 @@ --language:experimental.macros
\ No newline at end of file diff --git a/test/pending/run/macro-expand-named/Impls_1.scala b/test/pending/run/macro-expand-named/Impls_1.scala deleted file mode 100644 index fd5d8d7f18..0000000000 --- a/test/pending/run/macro-expand-named/Impls_1.scala +++ /dev/null @@ -1,10 +0,0 @@ -import scala.reflect.macros.blackbox.Context - -object Impls { - def foo(c: Context)(x: c.Expr[Int], y: c.Expr[Int]) = { - import c.universe._ - val sum = Apply(Select(x.tree, TermName("$minus")), List(y.tree)) - val body = Apply(Select(Ident(definitions.PredefModule), TermName("println")), List(sum)) - Expr[Unit](body) - } -}
\ No newline at end of file diff --git a/test/pending/run/macro-expand-named/Macros_Test_2.scala b/test/pending/run/macro-expand-named/Macros_Test_2.scala deleted file mode 100644 index abebcf8448..0000000000 --- a/test/pending/run/macro-expand-named/Macros_Test_2.scala +++ /dev/null @@ -1,5 +0,0 @@ -object Test extends App { - def foo(x: Int, y: Int) = macro Impls.foo - foo(y = -40, x = 2) - foo(x = 2, y = -40) -}
\ No newline at end of file diff --git a/test/pending/run/macro-expand-tparams-prefix-e1.check b/test/pending/run/macro-expand-tparams-prefix-e1.check deleted file mode 100644 index 4fa05a7678..0000000000 --- a/test/pending/run/macro-expand-tparams-prefix-e1.check +++ /dev/null @@ -1,3 +0,0 @@ -TypeTag(List[Int]) -TypeTag(String) -TypeTag(Boolean) diff --git a/test/pending/run/macro-expand-tparams-prefix-e1.flags b/test/pending/run/macro-expand-tparams-prefix-e1.flags deleted file mode 100644 index cd66464f2f..0000000000 --- a/test/pending/run/macro-expand-tparams-prefix-e1.flags +++ /dev/null @@ -1 +0,0 @@ --language:experimental.macros
\ No newline at end of file diff --git a/test/pending/run/macro-expand-tparams-prefix-e1/Impls_1.scala b/test/pending/run/macro-expand-tparams-prefix-e1/Impls_1.scala deleted file mode 100644 index 683622b29d..0000000000 --- a/test/pending/run/macro-expand-tparams-prefix-e1/Impls_1.scala +++ /dev/null @@ -1,12 +0,0 @@ -import scala.reflect.macros.blackbox.Context - -object Impls { - def foo[T, U: c.WeakTypeTag, V](c: Context)(implicit T: c.WeakTypeTag[T], V: c.WeakTypeTag[V]): c.Expr[Unit] = { - import c.universe._ - Block(List( - Apply(Select(Ident(definitions.PredefModule), TermName("println")), List(Literal(Constant(T.toString)))), - Apply(Select(Ident(definitions.PredefModule), TermName("println")), List(Literal(Constant(implicitly[c.WeakTypeTag[U]].toString)))), - Apply(Select(Ident(definitions.PredefModule), TermName("println")), List(Literal(Constant(V.toString))))), - Literal(Constant(()))) - } -}
\ No newline at end of file diff --git a/test/pending/run/macro-expand-tparams-prefix-e1/Macros_Test_2.scala b/test/pending/run/macro-expand-tparams-prefix-e1/Macros_Test_2.scala deleted file mode 100644 index d4fc52fca0..0000000000 --- a/test/pending/run/macro-expand-tparams-prefix-e1/Macros_Test_2.scala +++ /dev/null @@ -1,13 +0,0 @@ -import scala.reflect.runtime.universe._ - -object Test extends App { - class D[T: TypeTag] { - class C[U: TypeTag] { - def foo[V] = macro Impls.foo[List[T], U, V] - foo[Boolean] - } - } - - val outer1 = new D[Int] - new outer1.C[String] -}
\ No newline at end of file diff --git a/test/pending/run/macro-expand-tparams-prefix-f1.check b/test/pending/run/macro-expand-tparams-prefix-f1.check deleted file mode 100644 index d15226143a..0000000000 --- a/test/pending/run/macro-expand-tparams-prefix-f1.check +++ /dev/null @@ -1,3 +0,0 @@ -TypeTag(List[T]) -TypeTag(U) -TypeTag(Boolean) diff --git a/test/pending/run/macro-expand-tparams-prefix-f1.flags b/test/pending/run/macro-expand-tparams-prefix-f1.flags deleted file mode 100644 index cd66464f2f..0000000000 --- a/test/pending/run/macro-expand-tparams-prefix-f1.flags +++ /dev/null @@ -1 +0,0 @@ --language:experimental.macros
\ No newline at end of file diff --git a/test/pending/run/macro-expand-tparams-prefix-f1/Impls_1.scala b/test/pending/run/macro-expand-tparams-prefix-f1/Impls_1.scala deleted file mode 100644 index 683622b29d..0000000000 --- a/test/pending/run/macro-expand-tparams-prefix-f1/Impls_1.scala +++ /dev/null @@ -1,12 +0,0 @@ -import scala.reflect.macros.blackbox.Context - -object Impls { - def foo[T, U: c.WeakTypeTag, V](c: Context)(implicit T: c.WeakTypeTag[T], V: c.WeakTypeTag[V]): c.Expr[Unit] = { - import c.universe._ - Block(List( - Apply(Select(Ident(definitions.PredefModule), TermName("println")), List(Literal(Constant(T.toString)))), - Apply(Select(Ident(definitions.PredefModule), TermName("println")), List(Literal(Constant(implicitly[c.WeakTypeTag[U]].toString)))), - Apply(Select(Ident(definitions.PredefModule), TermName("println")), List(Literal(Constant(V.toString))))), - Literal(Constant(()))) - } -}
\ No newline at end of file diff --git a/test/pending/run/macro-expand-tparams-prefix-f1/Macros_Test_2.scala b/test/pending/run/macro-expand-tparams-prefix-f1/Macros_Test_2.scala deleted file mode 100644 index 9417cf663e..0000000000 --- a/test/pending/run/macro-expand-tparams-prefix-f1/Macros_Test_2.scala +++ /dev/null @@ -1,13 +0,0 @@ -import scala.reflect.runtime.universe._ - -object Test extends App { - class D[T] { - class C[U] { - def foo[V] = macro Impls.foo[List[T], U, V] - foo[Boolean] - } - } - - val outer1 = new D[Int] - new outer1.C[String] -}
\ No newline at end of file diff --git a/test/pending/run/macro-quasiinvalidbody-a.check b/test/pending/run/macro-quasiinvalidbody-a.check deleted file mode 100644 index f70d7bba4a..0000000000 --- a/test/pending/run/macro-quasiinvalidbody-a.check +++ /dev/null @@ -1 +0,0 @@ -42
\ No newline at end of file diff --git a/test/pending/run/macro-quasiinvalidbody-a.flags b/test/pending/run/macro-quasiinvalidbody-a.flags deleted file mode 100644 index cd66464f2f..0000000000 --- a/test/pending/run/macro-quasiinvalidbody-a.flags +++ /dev/null @@ -1 +0,0 @@ --language:experimental.macros
\ No newline at end of file diff --git a/test/pending/run/macro-quasiinvalidbody-a/Impls_1.scala b/test/pending/run/macro-quasiinvalidbody-a/Impls_1.scala deleted file mode 100644 index 741a921b72..0000000000 --- a/test/pending/run/macro-quasiinvalidbody-a/Impls_1.scala +++ /dev/null @@ -1,5 +0,0 @@ -import scala.reflect.macros.blackbox.Context - -trait Impls { - def impl(c: Context)(x: c.Expr[Any]) = x -}
\ No newline at end of file diff --git a/test/pending/run/macro-quasiinvalidbody-a/Macros_Test_2.scala b/test/pending/run/macro-quasiinvalidbody-a/Macros_Test_2.scala deleted file mode 100644 index 2735321eae..0000000000 --- a/test/pending/run/macro-quasiinvalidbody-a/Macros_Test_2.scala +++ /dev/null @@ -1,10 +0,0 @@ -import scala.reflect.macros.blackbox.Context - -object Macros extends Impls { - def foo(x: Any) = macro impl -} - -object Test extends App { - import Macros._ - println(foo(42)) -}
\ No newline at end of file diff --git a/test/pending/run/macro-quasiinvalidbody-b.check b/test/pending/run/macro-quasiinvalidbody-b.check deleted file mode 100644 index f70d7bba4a..0000000000 --- a/test/pending/run/macro-quasiinvalidbody-b.check +++ /dev/null @@ -1 +0,0 @@ -42
\ No newline at end of file diff --git a/test/pending/run/macro-quasiinvalidbody-b.flags b/test/pending/run/macro-quasiinvalidbody-b.flags deleted file mode 100644 index cd66464f2f..0000000000 --- a/test/pending/run/macro-quasiinvalidbody-b.flags +++ /dev/null @@ -1 +0,0 @@ --language:experimental.macros
\ No newline at end of file diff --git a/test/pending/run/macro-quasiinvalidbody-b/Impls_1.scala b/test/pending/run/macro-quasiinvalidbody-b/Impls_1.scala deleted file mode 100644 index b023d31f05..0000000000 --- a/test/pending/run/macro-quasiinvalidbody-b/Impls_1.scala +++ /dev/null @@ -1,7 +0,0 @@ -import scala.reflect.macros.blackbox.Context - -trait ImplContainer { - object Impls { - def foo(c: Context)(x: c.Expr[Any]) = x - } -}
\ No newline at end of file diff --git a/test/pending/run/macro-quasiinvalidbody-b/Macros_Test_2.scala b/test/pending/run/macro-quasiinvalidbody-b/Macros_Test_2.scala deleted file mode 100644 index 639d93fb5f..0000000000 --- a/test/pending/run/macro-quasiinvalidbody-b/Macros_Test_2.scala +++ /dev/null @@ -1,10 +0,0 @@ -import scala.reflect.macros.blackbox.Context - -object Macros extends ImplContainer { - def foo(x: Any) = macro Impls.foo -} - -object Test extends App { - import Macros._ - println(foo(42)) -}
\ No newline at end of file diff --git a/test/pending/run/macro-reify-array.flags b/test/pending/run/macro-reify-array.flags deleted file mode 100644 index cd66464f2f..0000000000 --- a/test/pending/run/macro-reify-array.flags +++ /dev/null @@ -1 +0,0 @@ --language:experimental.macros
\ No newline at end of file diff --git a/test/pending/run/macro-reify-array/Macros_1.scala b/test/pending/run/macro-reify-array/Macros_1.scala deleted file mode 100644 index eea0133feb..0000000000 --- a/test/pending/run/macro-reify-array/Macros_1.scala +++ /dev/null @@ -1,11 +0,0 @@ -import scala.reflect.macros.blackbox.Context - -object Macros { - def foo[T](s: String) = macro Impls.foo[T] - - object Impls { - def foo[T: c.WeakTypeTag](c: Context)(s: c.Expr[T]) = c.universe.reify { - Array(s.splice) - } - } -}
\ No newline at end of file diff --git a/test/pending/run/macro-reify-array/Test_2.scala b/test/pending/run/macro-reify-array/Test_2.scala deleted file mode 100644 index e40d5b40e0..0000000000 --- a/test/pending/run/macro-reify-array/Test_2.scala +++ /dev/null @@ -1,4 +0,0 @@ -object Test extends App { - val arr = Macros.foo("hello", "world") - println(arr.getClass) -}
\ No newline at end of file diff --git a/test/pending/run/macro-reify-groundtypetag-hktypeparams-tags.check b/test/pending/run/macro-reify-groundtypetag-hktypeparams-tags.check deleted file mode 100644 index 7e4b000c52..0000000000 --- a/test/pending/run/macro-reify-groundtypetag-hktypeparams-tags.check +++ /dev/null @@ -1,2 +0,0 @@ -TypeTag(List[Int]) -TypeTag(List[List[Int]]) diff --git a/test/pending/run/macro-reify-groundtypetag-hktypeparams-tags/Test.scala b/test/pending/run/macro-reify-groundtypetag-hktypeparams-tags/Test.scala deleted file mode 100644 index 3252423375..0000000000 --- a/test/pending/run/macro-reify-groundtypetag-hktypeparams-tags/Test.scala +++ /dev/null @@ -1,9 +0,0 @@ -import scala.reflect.runtime.universe._ - -object Test extends App { - def fooTypeTagHK[C[_]: TypeTag, T: TypeTag] = { - println(implicitly[TypeTag[C[T]]]) - println(implicitly[TypeTag[List[C[T]]]]) - } - fooTypeTagHK[List, Int] -}
\ No newline at end of file diff --git a/test/pending/run/macro-reify-tagful-b.check b/test/pending/run/macro-reify-tagful-b.check deleted file mode 100644 index 5bd9fe2156..0000000000 --- a/test/pending/run/macro-reify-tagful-b.check +++ /dev/null @@ -1 +0,0 @@ -List(List(hello world)) diff --git a/test/pending/run/macro-reify-tagful-b.flags b/test/pending/run/macro-reify-tagful-b.flags deleted file mode 100644 index cd66464f2f..0000000000 --- a/test/pending/run/macro-reify-tagful-b.flags +++ /dev/null @@ -1 +0,0 @@ --language:experimental.macros
\ No newline at end of file diff --git a/test/pending/run/macro-reify-tagful-b/Macros_1.scala b/test/pending/run/macro-reify-tagful-b/Macros_1.scala deleted file mode 100644 index f4d8062a14..0000000000 --- a/test/pending/run/macro-reify-tagful-b/Macros_1.scala +++ /dev/null @@ -1,11 +0,0 @@ -import scala.reflect.macros.blackbox.Context - -object Macros { - def foo[T](s: T) = macro Impls.foo[List[T]] - - object Impls { - def foo[T: c.WeakTypeTag](c: Context)(s: c.Expr[T]) = c.universe.reify { - List(s.splice) - } - } -}
\ No newline at end of file diff --git a/test/pending/run/macro-reify-tagful-b/Test_2.scala b/test/pending/run/macro-reify-tagful-b/Test_2.scala deleted file mode 100644 index 142234901f..0000000000 --- a/test/pending/run/macro-reify-tagful-b/Test_2.scala +++ /dev/null @@ -1,4 +0,0 @@ -object Test extends App { - val list: List[List[String]] = Macros.foo(List("hello world")) - println(list) -}
\ No newline at end of file diff --git a/test/pending/run/macro-reify-tagless-b.check b/test/pending/run/macro-reify-tagless-b.check deleted file mode 100644 index 61ebb4e547..0000000000 --- a/test/pending/run/macro-reify-tagless-b.check +++ /dev/null @@ -1,3 +0,0 @@ -error: macro must not return an expr that contains free type variables (namely: T). have you forgot to use c.TypeTag annotations for type parameters external to a reifee? - -java.lang.Error: reflective compilation has failed diff --git a/test/pending/run/macro-reify-tagless-b.flags b/test/pending/run/macro-reify-tagless-b.flags deleted file mode 100644 index cd66464f2f..0000000000 --- a/test/pending/run/macro-reify-tagless-b.flags +++ /dev/null @@ -1 +0,0 @@ --language:experimental.macros
\ No newline at end of file diff --git a/test/pending/run/macro-reify-tagless-b/Impls_Macros_1.scala b/test/pending/run/macro-reify-tagless-b/Impls_Macros_1.scala deleted file mode 100644 index 1307052394..0000000000 --- a/test/pending/run/macro-reify-tagless-b/Impls_Macros_1.scala +++ /dev/null @@ -1,11 +0,0 @@ -import scala.reflect.macros.blackbox.Context - -object Macros { - def foo[T](s: T) = macro Impls.foo[List[T]] - - object Impls { - def foo[T](c: Context)(s: c.Expr[T]) = c.universe.reify { - List(s.splice) - } - } -}
\ No newline at end of file diff --git a/test/pending/run/macro-reify-tagless-b/Test_2.scala b/test/pending/run/macro-reify-tagless-b/Test_2.scala deleted file mode 100644 index 09ca6ba30e..0000000000 --- a/test/pending/run/macro-reify-tagless-b/Test_2.scala +++ /dev/null @@ -1,13 +0,0 @@ -object Test extends App { - //val list: List[String] = Macros.foo("hello world") - //println(list) - - import scala.reflect.runtime.universe._ - import scala.reflect.runtime.{currentMirror => cm} - import scala.tools.reflect.ToolBox - val tpt = AppliedTypeTree(Ident(definitions.ListClass), List(Ident(definitions.StringClass))) - val rhs = Apply(Select(Ident(TermName("Macros")), TermName("foo")), List(Literal(Constant("hello world")))) - val list = ValDef(NoMods, TermName("list"), tpt, rhs) - val tree = Block(list, Apply(Select(Ident(definitions.PredefModule), TermName("println")), List(Ident(list.name)))) - println(cm.mkToolBox().eval(tree)) -} diff --git a/test/pending/run/macro-reify-typetag-hktypeparams-notags.check b/test/pending/run/macro-reify-typetag-hktypeparams-notags.check deleted file mode 100644 index 53acc9184c..0000000000 --- a/test/pending/run/macro-reify-typetag-hktypeparams-notags.check +++ /dev/null @@ -1,2 +0,0 @@ -TypeTag(C[T]) -TypeTag(List[C[T]]) diff --git a/test/pending/run/macro-reify-typetag-hktypeparams-notags/Test.scala b/test/pending/run/macro-reify-typetag-hktypeparams-notags/Test.scala deleted file mode 100644 index c7b1cedcd2..0000000000 --- a/test/pending/run/macro-reify-typetag-hktypeparams-notags/Test.scala +++ /dev/null @@ -1,9 +0,0 @@ -import scala.reflect.runtime.universe._ - -object Test extends App { - def fooNoTypeTagHK[C[_], T] = { - println(implicitly[TypeTag[C[T]]]) - println(implicitly[TypeTag[List[C[T]]]]) - } - fooNoTypeTagHK[List, Int] -}
\ No newline at end of file diff --git a/test/pending/run/macro-reify-typetag-hktypeparams-tags.check b/test/pending/run/macro-reify-typetag-hktypeparams-tags.check deleted file mode 100644 index 7e4b000c52..0000000000 --- a/test/pending/run/macro-reify-typetag-hktypeparams-tags.check +++ /dev/null @@ -1,2 +0,0 @@ -TypeTag(List[Int]) -TypeTag(List[List[Int]]) diff --git a/test/pending/run/macro-reify-typetag-hktypeparams-tags/Test.scala b/test/pending/run/macro-reify-typetag-hktypeparams-tags/Test.scala deleted file mode 100644 index 3252423375..0000000000 --- a/test/pending/run/macro-reify-typetag-hktypeparams-tags/Test.scala +++ /dev/null @@ -1,9 +0,0 @@ -import scala.reflect.runtime.universe._ - -object Test extends App { - def fooTypeTagHK[C[_]: TypeTag, T: TypeTag] = { - println(implicitly[TypeTag[C[T]]]) - println(implicitly[TypeTag[List[C[T]]]]) - } - fooTypeTagHK[List, Int] -}
\ No newline at end of file diff --git a/test/pending/run/macro-term-declared-in-anonymous-explicit-import/Impls_1.scala b/test/pending/run/macro-term-declared-in-anonymous-explicit-import/Impls_1.scala deleted file mode 100644 index c43f5f3f53..0000000000 --- a/test/pending/run/macro-term-declared-in-anonymous-explicit-import/Impls_1.scala +++ /dev/null @@ -1,11 +0,0 @@ -import scala.reflect.macros.blackbox.Context - -object Impls { - def foo(c: Context) = { - import c.{prefix => prefix} - import c.universe._ - val printPrefix = Apply(Select(Ident(definitions.PredefModule), TermName("println")), List(Literal(Constant("prefix = " + prefix)))) - val body = Block(List(printPrefix), Apply(Select(Ident(definitions.PredefModule), TermName("println")), List(Literal(Constant("it works"))))) - c.Expr[Unit](body) - } -}
\ No newline at end of file diff --git a/test/pending/run/macro-term-declared-in-anonymous-explicit-import/Macros_Test_2.scala b/test/pending/run/macro-term-declared-in-anonymous-explicit-import/Macros_Test_2.scala deleted file mode 100644 index dd2317b1b7..0000000000 --- a/test/pending/run/macro-term-declared-in-anonymous-explicit-import/Macros_Test_2.scala +++ /dev/null @@ -1,6 +0,0 @@ -import language.experimental.macros - -object Test extends App { - val macros = new { def foo = macro Impls.foo } - macros.foo -}
\ No newline at end of file diff --git a/test/pending/run/origins.check b/test/pending/run/origins.check deleted file mode 100644 index af94b549d3..0000000000 --- a/test/pending/run/origins.check +++ /dev/null @@ -1,4 +0,0 @@ - ->> Origins tag 'boop' logged 65 calls from 1 distinguished sources. - - 65 null diff --git a/test/pending/run/origins.flags b/test/pending/run/origins.flags deleted file mode 100644 index 690753d807..0000000000 --- a/test/pending/run/origins.flags +++ /dev/null @@ -1 +0,0 @@ --no-specialization -Ydelambdafy:inline
\ No newline at end of file diff --git a/test/pending/run/origins.scala b/test/pending/run/origins.scala deleted file mode 100644 index 6529351d3c..0000000000 --- a/test/pending/run/origins.scala +++ /dev/null @@ -1,21 +0,0 @@ -import scala.reflect.internal.util.Origins - -package goxbox { - object Socks { - val origins = Origins("boop") - - def boop(x: Int): Int = origins { 5 } - } -} - -object Test { - import goxbox.Socks.boop - - def f1() = 1 to 5 map boop - def f2() = 1 to 10 map boop - def f3() = 1 to 50 map boop - - def main(args: Array[String]): Unit = { - f1() ; f2() ; f3() - } -} diff --git a/test/pending/run/partial-anyref-spec.check b/test/pending/run/partial-anyref-spec.check deleted file mode 100644 index 26e41933e7..0000000000 --- a/test/pending/run/partial-anyref-spec.check +++ /dev/null @@ -1,13 +0,0 @@ -Fn$mcII$sp -Fn$mcLI$sp -Fn$mcLI$sp -Fn$mcIL$sp -Fn -Fn -Fn$mcIL$sp -Fn -Fn -Fn3 -Fn3$mcLIDF$sp -Fn3$mcBIDF$sp -Fn3 diff --git a/test/pending/run/partial-anyref-spec.scala b/test/pending/run/partial-anyref-spec.scala deleted file mode 100644 index 49ed514f03..0000000000 --- a/test/pending/run/partial-anyref-spec.scala +++ /dev/null @@ -1,31 +0,0 @@ -class Fn[@specialized(Int, AnyRef) -T, @specialized(Int, AnyRef) +R] { - override def toString = getClass.getName -} - -class Fn3[ - @specialized(Int, AnyRef) -T1, - @specialized(Double, AnyRef) -T2, - @specialized(Float) -T3, - @specialized(Byte, AnyRef) +R -] { - override def toString = getClass.getName -} - -object Test { - def main(args: Array[String]): Unit = { - println(new Fn[Int, Int]) - println(new Fn[Int, Byte]) - println(new Fn[Int, AnyRef]) - println(new Fn[Byte, Int]) - println(new Fn[Byte, Byte]) - println(new Fn[Byte, AnyRef]) - println(new Fn[AnyRef, Int]) - println(new Fn[AnyRef, Byte]) - println(new Fn[AnyRef, AnyRef]) - - println(new Fn3[Int, Int, Int, Int]) - println(new Fn3[Int, Double, Float, Int]) - println(new Fn3[Int, Double, Float, Byte]) - println(new Fn3[AnyRef, Double, AnyRef, Int]) - } -} diff --git a/test/pending/run/reflection-mem-eval.scala b/test/pending/run/reflection-mem-eval.scala deleted file mode 100644 index 9045c44cd6..0000000000 --- a/test/pending/run/reflection-mem-eval.scala +++ /dev/null @@ -1,26 +0,0 @@ -import scala.tools.partest.MemoryTest - -trait A { type T <: A } -trait B { type T <: B } - -object Test extends MemoryTest { - lazy val tb = { - import scala.reflect.runtime.universe._ - import scala.reflect.runtime.{currentMirror => cm} - import scala.tools.reflect.ToolBox - cm.mkToolBox() - } - - override def maxDelta = 10 - override def calcsPerIter = 3 - override def calc() { - var snippet = """ - trait A { type T <: A } - trait B { type T <: B } - def foo[T](x: List[T]) = x - foo(List(new A {}, new B {})) - """.trim - snippet = snippet + "\n" + (List.fill(50)(snippet.split("\n").last) mkString "\n") - tb.eval(tb.parse(snippet)) - } -}
\ No newline at end of file diff --git a/test/pending/run/reify_addressbook.check b/test/pending/run/reify_addressbook.check deleted file mode 100644 index 4e12f87bdc..0000000000 --- a/test/pending/run/reify_addressbook.check +++ /dev/null @@ -1,30 +0,0 @@ -<html> - <head> - <title> - My Address Book - </title> - <style type="text/css"> table { border-right: 1px solid #cccccc; } - th { background-color: #cccccc; } - td { border-left: 1px solid #acacac; } - td { border-bottom: 1px solid #acacac; - </style> - </head> - <body> - <table cellspacing="0" cellpadding="2"> - <tr> - <th>Name</th> - <th>Age</th> - </tr> - <tr> - <td> Tom </td> - <td> 20 </td> - </tr><tr> - <td> Bob </td> - <td> 22 </td> - </tr><tr> - <td> James </td> - <td> 19 </td> - </tr> - </table> - </body> - </html> diff --git a/test/pending/run/reify_addressbook.scala b/test/pending/run/reify_addressbook.scala deleted file mode 100644 index d53a0f7bc0..0000000000 --- a/test/pending/run/reify_addressbook.scala +++ /dev/null @@ -1,65 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.tools.reflect.Eval - -object Test extends App { - reify { - case class Person(name: String, age: Int) - - /** An AddressBook takes a variable number of arguments - * which are accessed as a Sequence - */ - class AddressBook(a: Person*) { - private val people: List[Person] = a.toList - - /** Serialize to XHTML. Scala supports XML literals - * which may contain Scala expressions between braces, - * which are replaced by their evaluation - */ - def toXHTML = - <table cellpadding="2" cellspacing="0"> - <tr> - <th>Name</th> - <th>Age</th> - </tr> - { for (p <- people) yield - <tr> - <td> { p.name } </td> - <td> { p.age.toString() } </td> - </tr> - } - </table>; - } - - /** We introduce CSS using raw strings (between triple - * quotes). Raw strings may contain newlines and special - * characters (like \) are not interpreted. - */ - val header = - <head> - <title> - { "My Address Book" } - </title> - <style type="text/css"> { - """table { border-right: 1px solid #cccccc; } - th { background-color: #cccccc; } - td { border-left: 1px solid #acacac; } - td { border-bottom: 1px solid #acacac;"""} - </style> - </head>; - - val people = new AddressBook( - Person("Tom", 20), - Person("Bob", 22), - Person("James", 19)); - - val page = - <html> - { header } - <body> - { people.toXHTML } - </body> - </html>; - - println(page) - }.eval -} diff --git a/test/pending/run/reify_brainf_ck.check b/test/pending/run/reify_brainf_ck.check deleted file mode 100644 index 702bb18394..0000000000 --- a/test/pending/run/reify_brainf_ck.check +++ /dev/null @@ -1,4 +0,0 @@ ----running--- -Hello World! - ----done--- diff --git a/test/pending/run/reify_brainf_ck.scala b/test/pending/run/reify_brainf_ck.scala deleted file mode 100644 index 2af3bca1c7..0000000000 --- a/test/pending/run/reify_brainf_ck.scala +++ /dev/null @@ -1,79 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.tools.reflect.Eval - -object Test extends App { - reify { - import scala.annotation._ - - trait Func[T] { - val zero: T - def inc(t: T): T - def dec(t: T): T - def in: T - def out(t: T): Unit - } - - object ByteFunc extends Func[Byte] { - override val zero: Byte = 0 - override def inc(t: Byte) = ((t + 1) & 0xFF).toByte - override def dec(t: Byte) = ((t - 1) & 0xFF).toByte - override def in: Byte = readByte - override def out(t: Byte) { print(t.toChar) } - } - - case class Tape[T](left: List[T], cell: T, right: List[T])(implicit func: Func[T]) { - private def headOf(list:List[T]) = if (list.isEmpty) func.zero else list.head - private def tailOf(list:List[T]) = if (list.isEmpty) Nil else list.tail - def isZero = cell == func.zero - def execute(ch: Char) = (ch: @switch) match { - case '+' => copy(cell = func.inc(cell)) - case '-' => copy(cell = func.dec(cell)) - case '<' => Tape(tailOf(left), headOf(left), cell :: right) - case '>' => Tape(cell :: left, headOf(right), tailOf(right)) - case '.' => func.out(cell); this - case ',' => copy(cell = func.in) - case '[' | ']' => this - case _ => error("Unexpected token: " + ch) - } - } - - object Tape { - def empty[T](func: Func[T]) = Tape(Nil, func.zero, Nil)(func) - } - - class Brainfuck[T](func:Func[T]) { - - def execute(p: String) { - val prog = p.replaceAll("[^\\+\\-\\[\\]\\.\\,\\>\\<]", "") - - @tailrec def braceMatcher(pos: Int, stack: List[Int], o2c: Map[Int, Int]): Map[Int,Int] = - if(pos == prog.length) o2c else (prog(pos): @switch) match { - case '[' => braceMatcher(pos + 1, pos :: stack, o2c) - case ']' => braceMatcher(pos + 1, stack.tail, o2c + (stack.head -> pos)) - case _ => braceMatcher(pos + 1, stack, o2c) - } - - val open2close = braceMatcher(0, Nil, Map()) - val close2open = open2close.map(_.swap) - - @tailrec def ex(pos:Int, tape:Tape[T]): Unit = - if(pos < prog.length) ex((prog(pos): @switch) match { - case '[' if tape.isZero => open2close(pos) - case ']' if ! tape.isZero => close2open(pos) - case _ => pos + 1 - }, tape.execute(prog(pos))) - - println("---running---") - ex(0, Tape.empty(func)) - println("\n---done---") - } - } - - val bf = new Brainfuck(ByteFunc) - bf.execute(""">+++++++++[<++++++++>-]<.>+++++++[<++ - ++>-]<+.+++++++..+++.[-]>++++++++[<++++>-] - <.#>+++++++++++[<+++++>-]<.>++++++++[<++ - +>-]<.+++.------.--------.[-]>++++++++[<++++> - -]<+.[-]++++++++++.""") - }.eval -} diff --git a/test/pending/run/reify_callccinterpreter.check b/test/pending/run/reify_callccinterpreter.check deleted file mode 100644 index ef8fc121df..0000000000 --- a/test/pending/run/reify_callccinterpreter.check +++ /dev/null @@ -1,3 +0,0 @@ -42 -wrong -5 diff --git a/test/pending/run/reify_callccinterpreter.scala b/test/pending/run/reify_callccinterpreter.scala deleted file mode 100644 index 82c70da28f..0000000000 --- a/test/pending/run/reify_callccinterpreter.scala +++ /dev/null @@ -1,88 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.tools.reflect.Eval - -object Test extends App { - reify { - type Answer = Value; - - /** - * A continuation monad. - */ - case class M[A](in: (A => Answer) => Answer) { - def bind[B](k: A => M[B]) = M[B](c => in (a => k(a) in c)) - def map[B](f: A => B): M[B] = bind(x => unitM(f(x))) - def flatMap[B](f: A => M[B]): M[B] = bind(f) - } - - def unitM[A](a: A) = M[A](c => c(a)) - - def id[A] = (x: A) => x - def showM(m: M[Value]): String = (m in id).toString() - - def callCC[A](h: (A => M[A]) => M[A]) = - M[A](c => h(a => M[A](d => c(a))) in c) - - type Name = String - - trait Term - case class Var(x: Name) extends Term - case class Con(n: Int) extends Term - case class Add(l: Term, r: Term) extends Term - case class Lam(x: Name, body: Term) extends Term - case class App(fun: Term, arg: Term) extends Term - case class Ccc(x: Name, t: Term) extends Term - - trait Value - case object Wrong extends Value { - override def toString() = "wrong" - } - case class Num(n: Int) extends Value { - override def toString() = n.toString() - } - case class Fun(f: Value => M[Value]) extends Value { - override def toString() = "<function>" - } - - type Environment = List[Tuple2[Name, Value]]; - - def lookup(x: Name, e: Environment): M[Value] = e match { - case List() => unitM(Wrong) - case (y, b) :: e1 => if (x == y) unitM(b) else lookup(x, e1) - } - - def add(a: Value, b: Value): M[Value] = (a, b) match { - case (Num(m), Num(n)) => unitM(Num(m + n)) - case _ => unitM(Wrong) - } - - def apply(a: Value, b: Value): M[Value] = a match { - case Fun(k) => k(b) - case _ => unitM(Wrong) - } - - def interp(t: Term, e: Environment): M[Value] = t match { - case Var(x) => lookup(x, e) - case Con(n) => unitM(Num(n)) - case Add(l, r) => for (a <- interp(l, e); - b <- interp(r, e); - c <- add(a, b)) - yield c - case Lam(x, t) => unitM(Fun(a => interp(t, (x, a) :: e))) - case App(f, t) => for (a <- interp(f, e); - b <- interp(t, e); - c <- apply(a, b)) - yield c - case Ccc(x, t) => callCC(k => interp(t, (x, Fun(k)) :: e)) - } - - def test(t: Term): String = showM(interp(t, List())) - - val term0 = App(Lam("x", Add(Var("x"), Var("x"))), Add(Con(10), Con(11))) - val term1 = App(Con(1), Con(2)) - val term2 = Add(Con(1), Ccc("k", Add(Con(2), App(Var("k"), Con(4))))) - - println(test(term0)) - println(test(term1)) - println(test(term2)) - }.eval -} diff --git a/test/pending/run/reify_closure2b.check b/test/pending/run/reify_closure2b.check deleted file mode 100644 index c1f3abd7e6..0000000000 --- a/test/pending/run/reify_closure2b.check +++ /dev/null @@ -1,2 +0,0 @@ -11 -12 diff --git a/test/pending/run/reify_closure2b.scala b/test/pending/run/reify_closure2b.scala deleted file mode 100644 index 0f126c8c91..0000000000 --- a/test/pending/run/reify_closure2b.scala +++ /dev/null @@ -1,21 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.reflect.runtime.{universe => ru} -import scala.reflect.runtime.{currentMirror => cm} -import scala.tools.reflect.ToolBox - -object Test extends App { - def foo(y: Int): Int => Int = { - class Foo(y: Int) { - val fun = reify{(x: Int) => { - x + y - }} - } - - val toolbox = cm.mkToolBox() - val dyn = toolbox.eval(new Foo(y).fun.tree) - dyn.asInstanceOf[Int => Int] - } - - println(foo(1)(10)) - println(foo(2)(10)) -}
\ No newline at end of file diff --git a/test/pending/run/reify_closure3b.check b/test/pending/run/reify_closure3b.check deleted file mode 100644 index c1f3abd7e6..0000000000 --- a/test/pending/run/reify_closure3b.check +++ /dev/null @@ -1,2 +0,0 @@ -11 -12 diff --git a/test/pending/run/reify_closure3b.scala b/test/pending/run/reify_closure3b.scala deleted file mode 100644 index 54ac52ba0b..0000000000 --- a/test/pending/run/reify_closure3b.scala +++ /dev/null @@ -1,23 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.reflect.runtime.{universe => ru} -import scala.reflect.runtime.{currentMirror => cm} -import scala.tools.reflect.ToolBox - -object Test extends App { - def foo(y: Int): Int => Int = { - class Foo(y: Int) { - def y1 = y - - val fun = reify{(x: Int) => { - x + y1 - }} - } - - val toolbox = cm.mkToolBox() - val dyn = toolbox.eval(new Foo(y).fun.tree) - dyn.asInstanceOf[Int => Int] - } - - println(foo(1)(10)) - println(foo(2)(10)) -}
\ No newline at end of file diff --git a/test/pending/run/reify_closure4b.check b/test/pending/run/reify_closure4b.check deleted file mode 100644 index c1f3abd7e6..0000000000 --- a/test/pending/run/reify_closure4b.check +++ /dev/null @@ -1,2 +0,0 @@ -11 -12 diff --git a/test/pending/run/reify_closure4b.scala b/test/pending/run/reify_closure4b.scala deleted file mode 100644 index 34f707e092..0000000000 --- a/test/pending/run/reify_closure4b.scala +++ /dev/null @@ -1,23 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.reflect.runtime.{universe => ru} -import scala.reflect.runtime.{currentMirror => cm} -import scala.tools.reflect.ToolBox - -object Test extends App { - def foo(y: Int): Int => Int = { - class Foo(y: Int) { - val y1 = y - - val fun = reify{(x: Int) => { - x + y1 - }} - } - - val toolbox = cm.mkToolBox() - val dyn = toolbox.eval(new Foo(y).fun.tree) - dyn.asInstanceOf[Int => Int] - } - - println(foo(1)(10)) - println(foo(2)(10)) -}
\ No newline at end of file diff --git a/test/pending/run/reify_closure5b.check b/test/pending/run/reify_closure5b.check deleted file mode 100644 index df9e19c591..0000000000 --- a/test/pending/run/reify_closure5b.check +++ /dev/null @@ -1,2 +0,0 @@ -13 -14 diff --git a/test/pending/run/reify_closure5b.scala b/test/pending/run/reify_closure5b.scala deleted file mode 100644 index 0e506bf7b5..0000000000 --- a/test/pending/run/reify_closure5b.scala +++ /dev/null @@ -1,21 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.reflect.runtime.{universe => ru} -import scala.reflect.runtime.{currentMirror => cm} -import scala.tools.reflect.ToolBox - -object Test extends App { - def foo[T](ys: List[T]): Int => Int = { - class Foo[T](ys: List[T]) { - val fun = reify{(x: Int) => { - x + ys.length - }} - } - - val toolbox = cm.mkToolBox() - val dyn = toolbox.eval(new Foo(ys).fun.tree) - dyn.asInstanceOf[Int => Int] - } - - println(foo(List(1, 2, 3))(10)) - println(foo(List(1, 2, 3, 4))(10)) -}
\ No newline at end of file diff --git a/test/pending/run/reify_closure9a.check b/test/pending/run/reify_closure9a.check deleted file mode 100644 index 9a037142aa..0000000000 --- a/test/pending/run/reify_closure9a.check +++ /dev/null @@ -1 +0,0 @@ -10
\ No newline at end of file diff --git a/test/pending/run/reify_closure9a.scala b/test/pending/run/reify_closure9a.scala deleted file mode 100644 index f39ff1e2f3..0000000000 --- a/test/pending/run/reify_closure9a.scala +++ /dev/null @@ -1,18 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.reflect.runtime.{universe => ru} -import scala.reflect.runtime.{currentMirror => cm} -import scala.tools.reflect.ToolBox - -object Test extends App { - def foo(y: Int) = { - class Foo(val y: Int) { - def fun = reify{y} - } - - val toolbox = cm.mkToolBox() - val dyn = toolbox.eval(new Foo(y).fun.tree) - dyn.asInstanceOf[Int] - } - - println(foo(10)) -}
\ No newline at end of file diff --git a/test/pending/run/reify_closure9b.check b/test/pending/run/reify_closure9b.check deleted file mode 100644 index 9a037142aa..0000000000 --- a/test/pending/run/reify_closure9b.check +++ /dev/null @@ -1 +0,0 @@ -10
\ No newline at end of file diff --git a/test/pending/run/reify_closure9b.scala b/test/pending/run/reify_closure9b.scala deleted file mode 100644 index a6920b4e02..0000000000 --- a/test/pending/run/reify_closure9b.scala +++ /dev/null @@ -1,18 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.reflect.runtime.{universe => ru} -import scala.reflect.runtime.{currentMirror => cm} -import scala.tools.reflect.ToolBox - -object Test extends App { - def foo(y: Int) = { - class Foo(y: Int) { - def fun = reify{y} - } - - val toolbox = cm.mkToolBox() - val dyn = toolbox.eval(new Foo(y).fun.tree) - dyn.asInstanceOf[Int] - } - - println(foo(10)) -}
\ No newline at end of file diff --git a/test/pending/run/reify_closures11.check b/test/pending/run/reify_closures11.check deleted file mode 100644 index d8263ee986..0000000000 --- a/test/pending/run/reify_closures11.check +++ /dev/null @@ -1 +0,0 @@ -2
\ No newline at end of file diff --git a/test/pending/run/reify_closures11.scala b/test/pending/run/reify_closures11.scala deleted file mode 100644 index 9156208b40..0000000000 --- a/test/pending/run/reify_closures11.scala +++ /dev/null @@ -1,16 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.reflect.runtime.{universe => ru} -import scala.reflect.runtime.{currentMirror => cm} -import scala.tools.reflect.ToolBox - -object Test extends App { - def fun() = { - def z() = 2 - reify{z} - } - - val toolbox = cm.mkToolBox() - val dyn = toolbox.eval(fun().tree) - val foo = dyn.asInstanceOf[Int] - println(foo) -}
\ No newline at end of file diff --git a/test/pending/run/reify_gadts.check b/test/pending/run/reify_gadts.check deleted file mode 100644 index d81cc0710e..0000000000 --- a/test/pending/run/reify_gadts.check +++ /dev/null @@ -1 +0,0 @@ -42 diff --git a/test/pending/run/reify_gadts.scala b/test/pending/run/reify_gadts.scala deleted file mode 100644 index 582c0802f7..0000000000 --- a/test/pending/run/reify_gadts.scala +++ /dev/null @@ -1,39 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.tools.reflect.Eval - -object Test extends App { - reify { - /* The syntax tree of a toy language */ - abstract class Term[T] - - /* An integer literal */ - case class Lit(x: Int) extends Term[Int] - - /* Successor of a number */ - case class Succ(t: Term[Int]) extends Term[Int] - - /* Is 't' equal to zero? */ - case class IsZero(t: Term[Int]) extends Term[Boolean] - - /* An 'if' expression. */ - case class If[T](c: Term[Boolean], - t1: Term[T], - t2: Term[T]) extends Term[T] - - /** A type-safe eval function. The right-hand sides can - * make use of the fact that 'T' is a more precise type, - * constraint by the pattern type. - */ - def eval[T](t: Term[T]): T = t match { - case Lit(n) => n - - // the right hand side makes use of the fact - // that T = Int and so it can use '+' - case Succ(u) => eval(u) + 1 - case IsZero(u) => eval(u) == 0 - case If(c, u1, u2) => eval(if (eval(c)) u1 else u2) - } - println( - eval(If(IsZero(Lit(1)), Lit(41), Succ(Lit(41))))) - }.eval -} diff --git a/test/pending/run/reify_newimpl_07.scala b/test/pending/run/reify_newimpl_07.scala deleted file mode 100644 index b6886b8bb7..0000000000 --- a/test/pending/run/reify_newimpl_07.scala +++ /dev/null @@ -1,14 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.tools.reflect.Eval - -object Test extends App { - { - class C(val y: Int) { - val code = reify { - reify{y}.splice - } - } - - println(new C(2).code.eval) - } -}
\ No newline at end of file diff --git a/test/pending/run/reify_newimpl_08.scala b/test/pending/run/reify_newimpl_08.scala deleted file mode 100644 index 6caa33f30d..0000000000 --- a/test/pending/run/reify_newimpl_08.scala +++ /dev/null @@ -1,16 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.tools.reflect.Eval - -object Test extends App { - val code = reify { - class C(val y: Int) { - val code = reify { - reify{y}.splice - } - } - - new C(2).code.splice - } - - println(code.eval) -}
\ No newline at end of file diff --git a/test/pending/run/reify_newimpl_09.scala b/test/pending/run/reify_newimpl_09.scala deleted file mode 100644 index 27fbd37b71..0000000000 --- a/test/pending/run/reify_newimpl_09.scala +++ /dev/null @@ -1,13 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.tools.reflect.ToolBox -import scala.tools.reflect.Eval - -object Test extends App { - { - type T = Int - val code = reify { - List[T](2) - } - println(code.eval) - } -}
\ No newline at end of file diff --git a/test/pending/run/reify_newimpl_09a.scala b/test/pending/run/reify_newimpl_09a.scala deleted file mode 100644 index 27fbd37b71..0000000000 --- a/test/pending/run/reify_newimpl_09a.scala +++ /dev/null @@ -1,13 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.tools.reflect.ToolBox -import scala.tools.reflect.Eval - -object Test extends App { - { - type T = Int - val code = reify { - List[T](2) - } - println(code.eval) - } -}
\ No newline at end of file diff --git a/test/pending/run/reify_newimpl_09b.scala b/test/pending/run/reify_newimpl_09b.scala deleted file mode 100644 index 9e86dd5d8d..0000000000 --- a/test/pending/run/reify_newimpl_09b.scala +++ /dev/null @@ -1,14 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.tools.reflect.ToolBox -import scala.tools.reflect.Eval - -object Test extends App { - { - type U = Int - type T = U - val code = reify { - List[T](2) - } - println(code.eval) - } -}
\ No newline at end of file diff --git a/test/pending/run/reify_newimpl_09c.scala b/test/pending/run/reify_newimpl_09c.scala deleted file mode 100644 index 6bde36328e..0000000000 --- a/test/pending/run/reify_newimpl_09c.scala +++ /dev/null @@ -1,20 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.tools.reflect.ToolBox -import scala.tools.reflect.Eval - -object Test extends App { - { - def foo[W] = { - type U = W - type T = U - reify { - List[T](2) - } - } - val code = foo[Int] - println(code.tree.freeTypes) - val W = code.tree.freeTypes(2) - cm.mkToolBox().eval(code.tree, Map(W -> definitions.IntTpe)) - println(code.eval) - } -}
\ No newline at end of file diff --git a/test/pending/run/reify_newimpl_10.scala b/test/pending/run/reify_newimpl_10.scala deleted file mode 100644 index 791e52943a..0000000000 --- a/test/pending/run/reify_newimpl_10.scala +++ /dev/null @@ -1,14 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.tools.reflect.ToolBox -import scala.tools.reflect.Eval - -object Test extends App { - { - type T = Int - implicit val tt = implicitly[TypeTag[String]].asInstanceOf[TypeTag[T]] // this "mistake" is made for a reason! - val code = reify { - List[T](2) - } - println(code.eval) - } -}
\ No newline at end of file diff --git a/test/pending/run/reify_newimpl_16.scala b/test/pending/run/reify_newimpl_16.scala deleted file mode 100644 index a0cadf4d48..0000000000 --- a/test/pending/run/reify_newimpl_16.scala +++ /dev/null @@ -1,17 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.tools.reflect.ToolBox -import scala.tools.reflect.Eval - -object Test extends App { - { - class C { - type T = Int - val code = reify { - List[T](2) - } - println(code.eval) - } - - new C - } -}
\ No newline at end of file diff --git a/test/pending/run/reify_newimpl_17.scala b/test/pending/run/reify_newimpl_17.scala deleted file mode 100644 index 8fbcd52502..0000000000 --- a/test/pending/run/reify_newimpl_17.scala +++ /dev/null @@ -1,20 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.tools.reflect.ToolBox -import scala.tools.reflect.Eval - -object Test extends App { - class C[U] { - type T = U - val code = reify { - List[T](2.asInstanceOf[T]) - } - println(code.eval) - } - - try { - new C[Int] - } catch { - case ex: Throwable => - println(ex) - } -}
\ No newline at end of file diff --git a/test/pending/run/reify_newimpl_28.scala b/test/pending/run/reify_newimpl_28.scala deleted file mode 100644 index 524a110704..0000000000 --- a/test/pending/run/reify_newimpl_28.scala +++ /dev/null @@ -1,17 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.tools.reflect.ToolBox -import scala.tools.reflect.Eval - -object Test extends App { - { - object C { - type T = Int - val code = reify { - List[T](2) - } - println(code.eval) - } - - C - } -}
\ No newline at end of file diff --git a/test/pending/run/reify_newimpl_32.scala b/test/pending/run/reify_newimpl_32.scala deleted file mode 100644 index 095e59d919..0000000000 --- a/test/pending/run/reify_newimpl_32.scala +++ /dev/null @@ -1,17 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.tools.reflect.ToolBox -import scala.tools.reflect.Eval - -object Test extends App { - { - object C { - type T = Int - val code = reify { - List[C.T](2) - } - println(code.eval) - } - - C - } -}
\ No newline at end of file diff --git a/test/pending/run/reify_newimpl_34.scala b/test/pending/run/reify_newimpl_34.scala deleted file mode 100644 index a0a575ed7d..0000000000 --- a/test/pending/run/reify_newimpl_34.scala +++ /dev/null @@ -1,18 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.tools.reflect.ToolBox -import scala.tools.reflect.Eval - -object Test extends App { - { - object C { - type T = Int - lazy val c = C - val code = reify { - List[c.T](2) - } - println(code.eval) - } - - C - } -}
\ No newline at end of file diff --git a/test/pending/run/reify_newimpl_46.scala b/test/pending/run/reify_newimpl_46.scala deleted file mode 100644 index d063be0486..0000000000 --- a/test/pending/run/reify_newimpl_46.scala +++ /dev/null @@ -1,15 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.reflect.runtime.{universe => ru} -import scala.reflect.runtime.{currentMirror => cm} -import scala.tools.reflect.ToolBox - -object Test extends App { - class C[T[_] >: Null] { - val code = reify{val x: T[String] = null; println("ima worx"); x}.tree - println(code.freeTypes) - val T = code.freeTypes(0) - cm.mkToolBox().eval(code, Map(T -> definitions.ListClass.asType)) - } - - new C[List] -}
\ No newline at end of file diff --git a/test/pending/run/reify_newimpl_53.scala b/test/pending/run/reify_newimpl_53.scala deleted file mode 100644 index 54fa4bec1d..0000000000 --- a/test/pending/run/reify_newimpl_53.scala +++ /dev/null @@ -1,18 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.reflect.runtime.{universe => ru} -import scala.reflect.runtime.{currentMirror => cm} -import scala.tools.reflect.ToolBox - -object Test extends App { - class C[T >: Null] { - val code = reify{ - val tt = implicitly[TypeTag[T]] - println("mah typetag is: %s".format(tt)) - }.tree - println(code.freeTypes) - val T = code.freeTypes(0) - cm.mkToolBox().eval(code, Map(T -> definitions.StringClass.asType)) - } - - new C[String] -}
\ No newline at end of file diff --git a/test/pending/run/reify_simpleinterpreter.check b/test/pending/run/reify_simpleinterpreter.check deleted file mode 100644 index 4344dc9009..0000000000 --- a/test/pending/run/reify_simpleinterpreter.check +++ /dev/null @@ -1,2 +0,0 @@ -42 -wrong diff --git a/test/pending/run/reify_simpleinterpreter.scala b/test/pending/run/reify_simpleinterpreter.scala deleted file mode 100644 index 1f6d6c8da7..0000000000 --- a/test/pending/run/reify_simpleinterpreter.scala +++ /dev/null @@ -1,75 +0,0 @@ -import scala.reflect.runtime.universe._ - -object Test extends App { - reify { - case class M[A](value: A) { - def bind[B](k: A => M[B]): M[B] = k(value) - def map[B](f: A => B): M[B] = bind(x => unitM(f(x))) - def flatMap[B](f: A => M[B]): M[B] = bind(f) - } - - def unitM[A](a: A): M[A] = M(a) - - def showM(m: M[Value]): String = m.value.toString(); - - type Name = String - - trait Term; - case class Var(x: Name) extends Term - case class Con(n: Int) extends Term - case class Add(l: Term, r: Term) extends Term - case class Lam(x: Name, body: Term) extends Term - case class App(fun: Term, arg: Term) extends Term - - trait Value - case object Wrong extends Value { - override def toString() = "wrong" - } - case class Num(n: Int) extends Value { - override def toString() = n.toString() - } - case class Fun(f: Value => M[Value]) extends Value { - override def toString() = "<function>" - } - - type Environment = List[Tuple2[Name, Value]] - - def lookup(x: Name, e: Environment): M[Value] = e match { - case List() => unitM(Wrong) - case (y, b) :: e1 => if (x == y) unitM(b) else lookup(x, e1) - } - - def add(a: Value, b: Value): M[Value] = (a, b) match { - case (Num(m), Num(n)) => unitM(Num(m + n)) - case _ => unitM(Wrong) - } - - def apply(a: Value, b: Value): M[Value] = a match { - case Fun(k) => k(b) - case _ => unitM(Wrong) - } - - def interp(t: Term, e: Environment): M[Value] = t match { - case Var(x) => lookup(x, e) - case Con(n) => unitM(Num(n)) - case Add(l, r) => for (a <- interp(l, e); - b <- interp(r, e); - c <- add(a, b)) - yield c - case Lam(x, t) => unitM(Fun(a => interp(t, (x, a) :: e))) - case App(f, t) => for (a <- interp(f, e); - b <- interp(t, e); - c <- apply(a, b)) - yield c - } - - def test(t: Term): String = - showM(interp(t, List())) - - val term0 = App(Lam("x", Add(Var("x"), Var("x"))), Add(Con(10), Con(11))) - val term1 = App(Con(1), Con(2)) - - println(test(term0)) - println(test(term1)) - }.eval -} diff --git a/test/pending/run/signals.scala b/test/pending/run/signals.scala deleted file mode 100644 index 608b3c7fd5..0000000000 --- a/test/pending/run/signals.scala +++ /dev/null @@ -1,22 +0,0 @@ -// not exactly "pending", here as an example usage. -// -val manager = scala.tools.util.SignalManager - -manager.requireInterval(3, manager.INT) { - case true => Console.println("\nPress ctrl-C again to exit.") - case false => System.exit(1) -} - -manager("HUP") = println("HUP 1!") -manager("HUP").raise() - -manager("HUP") += println("HUP 2!") -manager("HUP").raise() - -manager("HUP") += println("HUP 3!") -manager("HUP").raise() - -manager("HUP") = println("Back to HUP 1!") -manager("HUP").raise() - -manager.dump() diff --git a/test/pending/run/sigtp.check b/test/pending/run/sigtp.check deleted file mode 100644 index a4d0f55ece..0000000000 --- a/test/pending/run/sigtp.check +++ /dev/null @@ -1,11 +0,0 @@ -BugBase - (m) public abstract A BugBase.key() - (m) public abstract E BugBase.next() - (m) public abstract void BugBase.next_$eq(E) -Bug - (m) public Bug<A, B> Bug.foo() - (m) public A Bug.key() - (m) public Bug<A, B> Bug.next() (bridge) - (m) public void Bug.next_$eq(Bug<A, B>) (bridge) - (f) private final A Bug.key - (f) private java.lang.Object Bug.next diff --git a/test/pending/run/sigtp.scala b/test/pending/run/sigtp.scala deleted file mode 100644 index f8e050dbdc..0000000000 --- a/test/pending/run/sigtp.scala +++ /dev/null @@ -1,17 +0,0 @@ -import scala.tools.partest._ - -trait BugBase [A, E] { - val key: A - var next: E = _ -} - -final class Bug[A, B](val key: A) extends BugBase[A, Bug[A, B]] { - def foo = next -} - -object Test extends SigTest { - def main(args: Array[String]): Unit = { - show[BugBase[_, _]]() - show[Bug[_, _]]() - } -} diff --git a/test/pending/run/string-reverse.scala b/test/pending/run/string-reverse.scala deleted file mode 100644 index 976a970dec..0000000000 --- a/test/pending/run/string-reverse.scala +++ /dev/null @@ -1,22 +0,0 @@ -/** In case we ever feel like taking on unicode string reversal. - * See ticket #2565. - */ -object Test { - val xs = "Les Mise\u0301rables" // this is the tricky one to reverse - val ys = "Les Misérables" - val xs2 = new StringBuilder(xs) - val ys2 = new StringBuilder(ys) - - def main(args: Array[String]): Unit = { - val out = new java.io.PrintStream(System.out, true, "UTF-8") - - out.println("Strings") - List(xs, xs.reverse, ys, ys.reverse) foreach (out println _) - - out.println("StringBuilder") - out.println(xs2.toString) - out.println(xs2.reverseContents().toString) - out.println(ys2.toString) - out.println(ys2.reverseContents().toString) - } -}
\ No newline at end of file diff --git a/test/pending/run/structural-types-vs-anon-classes.scala b/test/pending/run/structural-types-vs-anon-classes.scala deleted file mode 100644 index 23410e3955..0000000000 --- a/test/pending/run/structural-types-vs-anon-classes.scala +++ /dev/null @@ -1,17 +0,0 @@ -object Test { - class Arm - class Leg - class Tail - class Monkey(arms: List[Arm], legs :List[Leg], tail: Tail) - - def makeAwesomeMonkey(arms: List[Arm], legs: List[Leg], tail: Tail) = { - object m extends Monkey(arms, legs, tail) { - def beAwesome () = "I can fly! I can fly!" - } - m - } - - def main(args: Array[String]): Unit = { - println(makeAwesomeMonkey(Nil, Nil, new Tail) beAwesome) - } -} diff --git a/test/pending/run/t0508x.scala b/test/pending/run/t0508x.scala deleted file mode 100644 index 12d3d09711..0000000000 --- a/test/pending/run/t0508x.scala +++ /dev/null @@ -1,21 +0,0 @@ - final object Test extends java.lang.Object with Application { - - class Foo(val s: String, val n: Int) extends java.lang.Object { - }; - - def foo[A >: Nothing <: Any, B >: Nothing <: Any, C >: Nothing <: Any] - (unapply1: (A) => Option[(B, C)], v: A): Unit = - unapply1.apply(v) match { - case Some((fst @ _, snd @ _)) => - scala.Predef.println(scala.Tuple2.apply[java.lang.String, java.lang.String]("first: ".+(fst), " second: ".+(snd))) - case _ => scala.Predef.println(":(") - } - Test.this.foo[Test.Foo, String, Int]({ - ((eta$0$1: Test.Foo) => Test.this.Foo.unapply(eta$0$1)) - }, Test.this.Foo.apply("this might be fun", 10)); - final object Foo extends java.lang.Object with ((String, Int) => Test.Foo) { - def unapply(x$0: Test.Foo): Some[(String, Int)] = scala.Some.apply[(String, Int)](scala.Tuple2.apply[String, Int](x$0.s, x$0.n)); - def apply(s: String, n: Int): Test.Foo = new Test.this.Foo(s, n) - } - } - diff --git a/test/pending/run/t1980.scala b/test/pending/run/t1980.scala deleted file mode 100644 index 71c178d634..0000000000 --- a/test/pending/run/t1980.scala +++ /dev/null @@ -1,27 +0,0 @@ -// by-name argument incorrectly evaluated on :-ending operator -// Reported by: extempore Owned by: odersky -// Priority: normal Component: Compiler -// Keywords: Cc: paulp@… -// Fixed in version: -// Description - -scala> def foo() = { println("foo") ; 5 } -foo: ()Int - -scala> class C { def m1(f: => Int) = () ; def m2_:(f: => Int) = () } -defined class C - -scala> val c = new C -c: C = C@96d484 - -scala> c m1 foo() - -scala> foo() m2_: c -foo - -// But it is not evaluated if invoked directly: - -scala> c.m2_:(foo()) - -// scala> - diff --git a/test/pending/run/t2034.scala b/test/pending/run/t2034.scala deleted file mode 100644 index a599dc2224..0000000000 --- a/test/pending/run/t2034.scala +++ /dev/null @@ -1,15 +0,0 @@ -// no idea, reassigned to Iulian -object Test { - - def main(args: Array[String]) { - val fooz = new foo.foo2 - println(fooz) - } - - object foo { - class foo2 { - override def toString = getClass.toString//.getSimpleName - } - } - -} diff --git a/test/pending/run/t2364.check b/test/pending/run/t2364.check deleted file mode 100644 index 219305e43a..0000000000 --- a/test/pending/run/t2364.check +++ /dev/null @@ -1 +0,0 @@ -<test></test> diff --git a/test/pending/run/t2364.scala b/test/pending/run/t2364.scala deleted file mode 100644 index d5805a13b8..0000000000 --- a/test/pending/run/t2364.scala +++ /dev/null @@ -1,60 +0,0 @@ -import java.io.ByteArrayInputStream -import java.io.ByteArrayOutputStream -import com.sun.xml.internal.fastinfoset._ -import com.sun.xml.internal.fastinfoset.sax._ -import scala.xml.parsing.NoBindingFactoryAdapter -import scala.xml._ - -// Note - this is in pending because com.sun.xml.etc is not standard, -// and I don't have time to extract a smaller test. - -object Test { - def main(args: Array[String]) { - val node = <test/> - val bytes = new ByteArrayOutputStream - val serializer = new SAXDocumentSerializer() - - serializer.setOutputStream(bytes) - serializer.startDocument() - serialize(node, serializer) - serializer.endDocument() - println(parse(new ByteArrayInputStream(bytes.toByteArray))) - } - def serialize(node: Node, serializer: SAXDocumentSerializer) { - node match { - case _ : ProcInstr | _ : Comment | _ : EntityRef => - case x : Atom[_] => - val chars = x.text.toCharArray - serializer.characters(chars, 0, chars.length) - case _ : Elem => - serializer.startElement("", node.label.toLowerCase, node.label.toLowerCase, attributes(node.attributes)) - for (m <- node.child) serialize(m, serializer) - serializer.endElement("", node.label.toLowerCase, node.label.toLowerCase) - } - } - def parse(str: ByteArrayInputStream) = { - val parser = new SAXDocumentParser - val fac = new NoBindingFactoryAdapter - - parser.setContentHandler(fac) - try { - parser.parse(str) - } catch { - case x: Exception => - x.printStackTrace - } - fac.rootElem - } - def attributes(d: MetaData) = { - val attrs = new AttributesHolder - - if (d != null) { - for (attr <- d) { - val sb = new StringBuilder() - Utility.sequenceToXML(attr.value, TopScope, sb, true) - attrs.addAttribute(new QualifiedName("", "", attr.key.toLowerCase), sb.toString) - } - } - attrs - } -} diff --git a/test/pending/run/t2897.scala b/test/pending/run/t2897.scala deleted file mode 100644 index 40fd3c2b08..0000000000 --- a/test/pending/run/t2897.scala +++ /dev/null @@ -1,22 +0,0 @@ -class A { - def f1(t: String) = { - trait T { - def xs = Nil map (_ => t) - } - } - def f2(t: String) = { - def xs = Nil map (_ => t) - } - def f3(t: String) = { - var t1 = 5 - trait T { - def xs = { t1 = 10 ; t } - } - } - def f4() = { - var u = 5 - trait T { - def xs = Nil map (_ => u = 10) - } - } -} diff --git a/test/pending/run/t3609.scala b/test/pending/run/t3609.scala deleted file mode 100644 index eb25afd667..0000000000 --- a/test/pending/run/t3609.scala +++ /dev/null @@ -1,28 +0,0 @@ -object Test extends Application { - class A - class B extends A - def foo(x: A, y: B) = print(1) - val foo = new { - // def apply(x: B, y: A) = print(3) - def apply = (x: B, z: B) => print(4) - } - - foo(new B, new B) -} - -// This code prints 1. If we remove comment, then it will print 4. -// Moreover following code prints 3 (which is most strange thing): - -object Test2 extends Application { - class A - class B extends A - def foo(x: A, y: B) = print(1) - val foo = new { - def apply(x: B, y: A) = print(3) - def apply = new { - def apply = (x: B, z: B) => print(4) - } - } - - foo(new B, new B) -}
\ No newline at end of file diff --git a/test/pending/run/t3669.scala b/test/pending/run/t3669.scala deleted file mode 100644 index c60ba98538..0000000000 --- a/test/pending/run/t3669.scala +++ /dev/null @@ -1,22 +0,0 @@ -trait MyTrait[T <: { var id: U }, U] { - def test(t: T): T = { - val v: U = t.id - t.id = v - t - } -} - -class C (var id: String){ - // uncommenting this fixes it - // def id_=(x: AnyRef) { id = x.asInstanceOf[String] } -} - -class Test extends MyTrait[C, String] - -object Test { - def main(args: Array[String]): Unit = { - val t = new Test() - val c1 = new C("a") - val c2 = t.test(c1) - } -} diff --git a/test/pending/run/t3832.scala b/test/pending/run/t3832.scala deleted file mode 100644 index f081d5b3af..0000000000 --- a/test/pending/run/t3832.scala +++ /dev/null @@ -1,7 +0,0 @@ -class Test { - def this(un: Int) = { - this() - def test(xs: List[Int]) = xs map (x => x) - () - } -}
\ No newline at end of file diff --git a/test/pending/run/t3857.check b/test/pending/run/t3857.check deleted file mode 100644 index 520b350ff5..0000000000 --- a/test/pending/run/t3857.check +++ /dev/null @@ -1,11 +0,0 @@ -ScalaGeneric - (m) public java.util.Set<java.lang.String> ScalaGeneric.s() - (m) public void ScalaGeneric.s_$eq(java.util.Set<java.lang.String>) - (f) private java.util.Set<java.lang.String> ScalaGeneric.s -ScalaGeneric2Trait - (m) public abstract java.util.Set<java.lang.String> ScalaGeneric2Trait.s() - (m) public abstract void ScalaGeneric2Trait.s_$eq(java.util.Set<java.lang.String>) -ScalaGeneric2 - (m) public java.util.Set<java.lang.String> ScalaGeneric2.s() (bridge) - (m) public void ScalaGeneric2.s_$eq(java.util.Set<java.lang.String>) (bridge) - (f) private java.util.Set<java.lang.String> ScalaGeneric2.s diff --git a/test/pending/run/t3857.scala b/test/pending/run/t3857.scala deleted file mode 100644 index 62bdc39da9..0000000000 --- a/test/pending/run/t3857.scala +++ /dev/null @@ -1,13 +0,0 @@ -import scala.tools.partest._ - -class ScalaGeneric { var s: java.util.Set[String] = _ } -trait ScalaGeneric2Trait { var s: java.util.Set[String] = _ } -class ScalaGeneric2 extends ScalaGeneric2Trait { } - -object Test extends SigTest { - def main(args: Array[String]): Unit = { - show[ScalaGeneric]() - show[ScalaGeneric2Trait]() - show[ScalaGeneric2]() - } -} diff --git a/test/pending/run/t3899.check b/test/pending/run/t3899.check deleted file mode 100644 index c317608eab..0000000000 --- a/test/pending/run/t3899.check +++ /dev/null @@ -1,4 +0,0 @@ -a,b -a,b -a,b -a,b diff --git a/test/pending/run/t3899/Base_1.java b/test/pending/run/t3899/Base_1.java deleted file mode 100644 index 114cc0b7a6..0000000000 --- a/test/pending/run/t3899/Base_1.java +++ /dev/null @@ -1,5 +0,0 @@ -public class Base_1 { - public String[] varargs1(String... as) { - return as; - } -} diff --git a/test/pending/run/t3899/Derived_2.scala b/test/pending/run/t3899/Derived_2.scala deleted file mode 100644 index bb4e53784d..0000000000 --- a/test/pending/run/t3899/Derived_2.scala +++ /dev/null @@ -1,30 +0,0 @@ -trait T extends Base_1 { - def t1(as: String*): Array[String] = { - varargs1(as: _*) - } - def t2(as: String*): Array[String] = { - // This is the bug reported in the ticket. - super.varargs1(as: _*) - } -} - -class C extends Base_1 { - def c1(as: String*): Array[String] = { - varargs1(as: _*) - } - def c2(as: String*): Array[String] = { - super.varargs1(as: _*) - } -} - - -object Test extends App { - val t = new T {} - println(t.t1("a", "b").mkString(",")) - println(t.t2("a", "b").mkString(",")) - - val c = new C {} - println(c.c1("a", "b").mkString(",")) - println(c.c2("a", "b").mkString(",")) - -} diff --git a/test/pending/run/t4098.scala b/test/pending/run/t4098.scala deleted file mode 100644 index b74ccf9bff..0000000000 --- a/test/pending/run/t4098.scala +++ /dev/null @@ -1,9 +0,0 @@ -class A(a: Any) { - def this() = { this(b) ; def b = new {} } -} - -object Test { - def main(args: Array[String]): Unit = { - new A ("") - } -} diff --git a/test/pending/run/t4291.check b/test/pending/run/t4291.check deleted file mode 100644 index 30bacfac28..0000000000 --- a/test/pending/run/t4291.check +++ /dev/null @@ -1,87 +0,0 @@ -scala.collection.immutable.List - (m) public java.lang.Object scala.collection.immutable.List.apply(java.lang.Object) (bridge) - (m) public A scala.collection.immutable.List.apply(int) (bridge) -scala.Option - (m) public abstract A scala.Option.get() -scala.Function1 - (m) public abstract R scala.Function1.apply(T1) -scala.collection.Traversable - (m) public abstract <B,That> That scala.collection.TraversableLike.map(scala.Function1<A, B>,scala.collection.generic.CanBuildFrom<Repr, B, That>) -scala.collection.Iterable - (m) public abstract <B,That> That scala.collection.TraversableLike.map(scala.Function1<A, B>,scala.collection.generic.CanBuildFrom<Repr, B, That>) -scala.collection.Seq - (m) public abstract <B,That> That scala.collection.TraversableLike.map(scala.Function1<A, B>,scala.collection.generic.CanBuildFrom<Repr, B, That>) -scala.collection.immutable.Set - (m) public abstract <B,That> That scala.collection.TraversableLike.map(scala.Function1<A, B>,scala.collection.generic.CanBuildFrom<Repr, B, That>) - (m) public abstract <B,That> That scala.collection.SetLike.map(scala.Function1<A, B>,scala.collection.generic.CanBuildFrom<This, B, That>) -scala.collection.immutable.Map - (m) public abstract <B,That> That scala.collection.TraversableLike.map(scala.Function1<A, B>,scala.collection.generic.CanBuildFrom<Repr, B, That>) -scala.collection.immutable.Vector - (m) public <B,That> That scala.collection.immutable.Vector.map(scala.Function1<A, B>,scala.collection.generic.CanBuildFrom<scala.collection.immutable.Vector<A>, B, That>) (bridge) -scala.collection.immutable.Range - (m) public <B,That> That scala.collection.immutable.Range.map(scala.Function1<java.lang.Object, B>,scala.collection.generic.CanBuildFrom<scala.collection.immutable.IndexedSeq<java.lang.Object>, B, That>) (bridge) -scala.collection.Traversable - (m) public abstract <B,That> That scala.collection.TraversableLike.flatMap(scala.Function1<A, scala.collection.TraversableOnce<B>>,scala.collection.generic.CanBuildFrom<Repr, B, That>) -scala.collection.Iterable - (m) public abstract <B,That> That scala.collection.TraversableLike.flatMap(scala.Function1<A, scala.collection.TraversableOnce<B>>,scala.collection.generic.CanBuildFrom<Repr, B, That>) -scala.collection.Seq - (m) public abstract <B,That> That scala.collection.TraversableLike.flatMap(scala.Function1<A, scala.collection.TraversableOnce<B>>,scala.collection.generic.CanBuildFrom<Repr, B, That>) -scala.collection.immutable.Set - (m) public abstract <B,That> That scala.collection.TraversableLike.flatMap(scala.Function1<A, scala.collection.TraversableOnce<B>>,scala.collection.generic.CanBuildFrom<Repr, B, That>) -scala.collection.immutable.Map - (m) public abstract <B,That> That scala.collection.TraversableLike.flatMap(scala.Function1<A, scala.collection.TraversableOnce<B>>,scala.collection.generic.CanBuildFrom<Repr, B, That>) -scala.collection.immutable.Vector - (m) public <B,That> That scala.collection.immutable.Vector.flatMap(scala.Function1<A, scala.collection.TraversableOnce<B>>,scala.collection.generic.CanBuildFrom<scala.collection.immutable.Vector<A>, B, That>) (bridge) -scala.collection.immutable.Range - (m) public <B,That> That scala.collection.immutable.Range.flatMap(scala.Function1<java.lang.Object, scala.collection.TraversableOnce<B>>,scala.collection.generic.CanBuildFrom<scala.collection.immutable.IndexedSeq<java.lang.Object>, B, That>) (bridge) -scala.collection.Traversable - (m) public abstract Repr scala.collection.TraversableLike.filter(scala.Function1<A, java.lang.Object>) -scala.collection.Iterable - (m) public abstract Repr scala.collection.TraversableLike.filter(scala.Function1<A, java.lang.Object>) -scala.collection.Seq - (m) public abstract Repr scala.collection.TraversableLike.filter(scala.Function1<A, java.lang.Object>) -scala.collection.immutable.Set - (m) public abstract Repr scala.collection.TraversableLike.filter(scala.Function1<A, java.lang.Object>) -scala.collection.immutable.Map - (m) public abstract Repr scala.collection.TraversableLike.filter(scala.Function1<A, java.lang.Object>) -scala.collection.immutable.Vector - (m) public scala.collection.immutable.Vector<A> scala.collection.immutable.Vector.filter(scala.Function1<A, java.lang.Object>) (bridge) -scala.collection.immutable.Range - (m) public scala.collection.immutable.IndexedSeq<java.lang.Object> scala.collection.immutable.Range.filter(scala.Function1<java.lang.Object, java.lang.Object>) (bridge) -scala.collection.Traversable - (m) public abstract A scala.collection.TraversableLike.head() - (m) public abstract A scala.collection.generic.GenericTraversableTemplate.head() -scala.collection.Iterable - (m) public abstract A scala.collection.TraversableLike.head() - (m) public abstract A scala.collection.generic.GenericTraversableTemplate.head() - (m) public abstract A scala.collection.IterableLike.head() -scala.collection.Seq - (m) public abstract A scala.collection.TraversableLike.head() - (m) public abstract A scala.collection.generic.GenericTraversableTemplate.head() - (m) public abstract A scala.collection.IterableLike.head() -scala.collection.immutable.Set - (m) public abstract A scala.collection.TraversableLike.head() - (m) public abstract A scala.collection.generic.GenericTraversableTemplate.head() - (m) public abstract A scala.collection.IterableLike.head() -scala.collection.immutable.Map - (m) public abstract A scala.collection.TraversableLike.head() - (m) public abstract A scala.collection.generic.GenericTraversableTemplate.head() - (m) public abstract A scala.collection.IterableLike.head() -scala.collection.immutable.Vector - (m) public A scala.collection.immutable.Vector.head() -scala.collection.immutable.Range - (m) public java.lang.Object scala.collection.immutable.Range.head() (bridge) -scala.collection.Traversable - (m) public abstract <K> scala.collection.immutable.Map<K, Repr> scala.collection.TraversableLike.groupBy(scala.Function1<A, K>) -scala.collection.Iterable - (m) public abstract <K> scala.collection.immutable.Map<K, Repr> scala.collection.TraversableLike.groupBy(scala.Function1<A, K>) -scala.collection.Seq - (m) public abstract <K> scala.collection.immutable.Map<K, Repr> scala.collection.TraversableLike.groupBy(scala.Function1<A, K>) -scala.collection.immutable.Set - (m) public abstract <K> scala.collection.immutable.Map<K, Repr> scala.collection.TraversableLike.groupBy(scala.Function1<A, K>) -scala.collection.immutable.Map - (m) public abstract <K> scala.collection.immutable.Map<K, Repr> scala.collection.TraversableLike.groupBy(scala.Function1<A, K>) -scala.collection.immutable.Vector - (m) public <K> scala.collection.immutable.Map<K, scala.collection.immutable.Vector<A>> scala.collection.immutable.Vector.groupBy(scala.Function1<A, K>) (bridge) -scala.collection.immutable.Range - (m) public <K> scala.collection.immutable.Map<K, scala.collection.immutable.IndexedSeq<java.lang.Object>> scala.collection.immutable.Range.groupBy(scala.Function1<java.lang.Object, K>) (bridge) diff --git a/test/pending/run/t4291.scala b/test/pending/run/t4291.scala deleted file mode 100644 index 0213bb2c20..0000000000 --- a/test/pending/run/t4291.scala +++ /dev/null @@ -1,19 +0,0 @@ -import scala.tools.partest._ - -object Test extends SigTest { - def main(args: Array[String]): Unit = { - show[List[_]]("apply") - show[Option[_]]("get") - show[Function1[_, _]]("apply") - - for (name <- List("map", "flatMap", "filter", "head", "groupBy")) { - show[Traversable[_]](name) - show[Iterable[_]](name) - show[Seq[_]](name) - show[Set[_]](name) - show[Map[_,_]](name) - show[Vector[_]](name) - show[Range](name) - } - } -} diff --git a/test/pending/run/t4460.scala b/test/pending/run/t4460.scala deleted file mode 100644 index 324e2f5bef..0000000000 --- a/test/pending/run/t4460.scala +++ /dev/null @@ -1,12 +0,0 @@ -trait A - -class B(val x: Int) { - self: A => - - def this() = this() -} - -object Test extends B(2) with A { - def main(args: Array[String]) { } -} - diff --git a/test/pending/run/t4511.scala b/test/pending/run/t4511.scala deleted file mode 100644 index 58d4e0c7b0..0000000000 --- a/test/pending/run/t4511.scala +++ /dev/null @@ -1,10 +0,0 @@ -class Interval[@specialized T](val high: T) -class Node[@specialized T](val interval: Interval[T]) { - val x1 = Some(interval.high) -} - -object Test { - def main(args: Array[String]): Unit = { - new Node(new Interval(5)).x1 - } -}
\ No newline at end of file diff --git a/test/pending/run/t4511b.scala b/test/pending/run/t4511b.scala deleted file mode 100644 index 3337fb3203..0000000000 --- a/test/pending/run/t4511b.scala +++ /dev/null @@ -1,25 +0,0 @@ -import scala.{specialized => spec} - -class Interval[@spec(Int) T](high:T) - -class X1[@spec(Int) T](interval:Interval[T]) { val x = interval } -class Y1[@spec(Int) T](interval:Interval[T]) { val y = Some(interval) } - -class X2[T](val interval:Interval[T]) { val x = interval } -class Y2[T](val interval:Interval[T]) { val y = Some(interval) } - -class X3[@spec(Int) T](val interval:Interval[T]) { val x = interval } -class Y3[@spec(Int) T](val interval:Interval[T]) { val y = Some(interval) } - -object Test { - def tryit(o: => Any) = println(try { "ok: " + o.getClass.getName } catch { case e => "FAIL: " + e + "\n" + e.getStackTrace.mkString("\n ") }) - - def main(args: Array[String]) { - tryit(new X1(new Interval(3))) - tryit(new X2(new Interval(3))) - tryit(new X3(new Interval(3))) - tryit(new Y1(new Interval(3))) - tryit(new Y2(new Interval(3))) - tryit(new Y3(new Interval(3))) - } -} diff --git a/test/pending/run/t4574.scala b/test/pending/run/t4574.scala deleted file mode 100644 index 1dde496aca..0000000000 --- a/test/pending/run/t4574.scala +++ /dev/null @@ -1,13 +0,0 @@ -object Test { - val xs: List[(Int, Int)] = List((2, 2), null) - - def expectMatchError[T](msg: String)(body: => T) { - try { body ; assert(false, "Should not succeed.") } - catch { case _: MatchError => println(msg) } - } - - def main(args: Array[String]): Unit = { - expectMatchError("I hereby refute null!")( for ((x, y) <- xs) yield x ) - expectMatchError("I denounce null as unListLike!")( (null: Any) match { case List(_*) => true } ) - } -} diff --git a/test/pending/run/t4713/JavaAnnots.java b/test/pending/run/t4713/JavaAnnots.java deleted file mode 100644 index 29541b1ee0..0000000000 --- a/test/pending/run/t4713/JavaAnnots.java +++ /dev/null @@ -1,14 +0,0 @@ -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; -import java.util.List; - -public abstract class JavaAnnots { - @Retention(RetentionPolicy.RUNTIME) - @Target(ElementType.FIELD) - public @interface Book { - } - - public static final List<String> Book = null; -}
\ No newline at end of file diff --git a/test/pending/run/t4713/Problem.scala b/test/pending/run/t4713/Problem.scala deleted file mode 100644 index e87f657d2e..0000000000 --- a/test/pending/run/t4713/Problem.scala +++ /dev/null @@ -1,5 +0,0 @@ -object Problem { - def d() { - val v: java.util.List[String] = JavaAnnots.Book - } -} diff --git a/test/pending/run/t4971.scala b/test/pending/run/t4971.scala deleted file mode 100644 index c9b6d6f39f..0000000000 --- a/test/pending/run/t4971.scala +++ /dev/null @@ -1,16 +0,0 @@ -trait A[@specialized(Int) K, @specialized(Double) V] { - def doStuff(k: K, v: V): Unit = sys.error("I am overridden, you cannot call me") -} - -trait B[@specialized(Double) V] extends A[Int, V] { - override def doStuff(k: Int, v: V): Unit = println("Hi - I'm calling doStuff in B") -} - -object Test { - def main(args: Array[String]): Unit = delegate(new B[Double]() {}, 1, 0.1) - - def delegate[@specialized(Int) K, @specialized(Double) V](a: A[K, V], k: K, v: V) { - a.doStuff(k, v) - } -} - diff --git a/test/pending/run/t4996.scala b/test/pending/run/t4996.scala deleted file mode 100644 index 58a8fe16a3..0000000000 --- a/test/pending/run/t4996.scala +++ /dev/null @@ -1,15 +0,0 @@ -object SpecializationAbstractOverride { - - trait A[@specialized(Int) T] { def foo(t: T) } - trait B extends A[Int] { def foo(t: Int) { println("B.foo") } } - trait M extends B { abstract override def foo(t: Int) { super.foo(t) ; println ("M.foo") } } - object C extends B with M - - object D extends B { override def foo(t: Int) { super.foo(t); println("M.foo") } } - - def main(args: Array[String]) { - D.foo(42) // OK, prints B.foo M.foo - C.foo(42) // StackOverflowError - } -} - diff --git a/test/pending/run/t5258b.check b/test/pending/run/t5258b.check deleted file mode 100644 index 283b4225fb..0000000000 --- a/test/pending/run/t5258b.check +++ /dev/null @@ -1 +0,0 @@ -TBI
\ No newline at end of file diff --git a/test/pending/run/t5258b.scala b/test/pending/run/t5258b.scala deleted file mode 100644 index a280513d59..0000000000 --- a/test/pending/run/t5258b.scala +++ /dev/null @@ -1,9 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.tools.reflect.Eval - -object Test extends App { - reify { - class C - println(classOf[C]) - }.eval -}
\ No newline at end of file diff --git a/test/pending/run/t5258c.check b/test/pending/run/t5258c.check deleted file mode 100644 index 283b4225fb..0000000000 --- a/test/pending/run/t5258c.check +++ /dev/null @@ -1 +0,0 @@ -TBI
\ No newline at end of file diff --git a/test/pending/run/t5258c.scala b/test/pending/run/t5258c.scala deleted file mode 100644 index 4a656690ba..0000000000 --- a/test/pending/run/t5258c.scala +++ /dev/null @@ -1,9 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.tools.reflect.Eval - -object Test extends App { - reify { - object E extends Enumeration { val foo, bar = Value } - println(E.foo) - }.eval -}
\ No newline at end of file diff --git a/test/pending/run/t5284.scala b/test/pending/run/t5284.scala deleted file mode 100644 index b43afed5b8..0000000000 --- a/test/pending/run/t5284.scala +++ /dev/null @@ -1,14 +0,0 @@ -object Test { - def main(args:Array[String]) { - val a = Blarg(Array(1,2,3)) - println(a.m((x:Int) => x+1)) - } -} - -object Blarg { - def apply[T:Manifest](a:Array[T]) = new Blarg(a) -} -class Blarg [@specialized T:Manifest](val a:Array[T]) { - def m[@specialized W>:T,@specialized S](f:W=>S) = f(a(0)) -} - diff --git a/test/pending/run/t5334_1.scala b/test/pending/run/t5334_1.scala deleted file mode 100644 index b75badb145..0000000000 --- a/test/pending/run/t5334_1.scala +++ /dev/null @@ -1,9 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.tools.reflect.Eval - -object Test extends App { - reify { - class C { override def toString = "C" } - new C - }.eval -}
\ No newline at end of file diff --git a/test/pending/run/t5334_2.scala b/test/pending/run/t5334_2.scala deleted file mode 100644 index e082e3b8e3..0000000000 --- a/test/pending/run/t5334_2.scala +++ /dev/null @@ -1,9 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.tools.reflect.Eval - -object Test extends App { - reify { - class C { override def toString() = "C" } - List((new C, new C)) - }.eval -}
\ No newline at end of file diff --git a/test/pending/run/t5427a.check b/test/pending/run/t5427a.check deleted file mode 100644 index d8263ee986..0000000000 --- a/test/pending/run/t5427a.check +++ /dev/null @@ -1 +0,0 @@ -2
\ No newline at end of file diff --git a/test/pending/run/t5427a.scala b/test/pending/run/t5427a.scala deleted file mode 100644 index a7d20922db..0000000000 --- a/test/pending/run/t5427a.scala +++ /dev/null @@ -1,10 +0,0 @@ -import scala.reflect.runtime.universe._ - -object Foo { val bar = 2 } - -object Test extends App { - val tpe = getType(Foo) - val bar = tpe.nonPrivateMember(TermName("bar")) - val value = getValue(Foo, bar) - println(value) -}
\ No newline at end of file diff --git a/test/pending/run/t5427b.check b/test/pending/run/t5427b.check deleted file mode 100644 index d8263ee986..0000000000 --- a/test/pending/run/t5427b.check +++ /dev/null @@ -1 +0,0 @@ -2
\ No newline at end of file diff --git a/test/pending/run/t5427b.scala b/test/pending/run/t5427b.scala deleted file mode 100644 index af1ae6ea2f..0000000000 --- a/test/pending/run/t5427b.scala +++ /dev/null @@ -1,11 +0,0 @@ -import scala.reflect.runtime.universe._ - -class Foo { val bar = 2 } - -object Test extends App { - val foo = new Foo - val tpe = getType(foo) - val bar = tpe.nonPrivateMember(TermName("bar")) - val value = getValue(foo, bar) - println(value) -}
\ No newline at end of file diff --git a/test/pending/run/t5427c.check b/test/pending/run/t5427c.check deleted file mode 100644 index 32c91abbd6..0000000000 --- a/test/pending/run/t5427c.check +++ /dev/null @@ -1 +0,0 @@ -no public member
\ No newline at end of file diff --git a/test/pending/run/t5427c.scala b/test/pending/run/t5427c.scala deleted file mode 100644 index ba71803080..0000000000 --- a/test/pending/run/t5427c.scala +++ /dev/null @@ -1,13 +0,0 @@ -import scala.reflect.runtime.universe._ - -class Foo(bar: Int) - -object Test extends App { - val foo = new Foo(2) - val tpe = getType(foo) - val bar = tpe.nonPrivateMember(TermName("bar")) - bar match { - case NoSymbol => println("no public member") - case _ => println("i'm screwed") - } -}
\ No newline at end of file diff --git a/test/pending/run/t5427d.check b/test/pending/run/t5427d.check deleted file mode 100644 index d8263ee986..0000000000 --- a/test/pending/run/t5427d.check +++ /dev/null @@ -1 +0,0 @@ -2
\ No newline at end of file diff --git a/test/pending/run/t5427d.scala b/test/pending/run/t5427d.scala deleted file mode 100644 index 1d37dbdde3..0000000000 --- a/test/pending/run/t5427d.scala +++ /dev/null @@ -1,11 +0,0 @@ -import scala.reflect.runtime.universe._ - -class Foo(val bar: Int) - -object Test extends App { - val foo = new Foo(2) - val tpe = getType(foo) - val bar = tpe.nonPrivateMember(TermName("bar")) - val value = getValue(foo, bar) - println(value) -}
\ No newline at end of file diff --git a/test/pending/run/t5610b.check b/test/pending/run/t5610b.check deleted file mode 100644 index 2aa46b3b91..0000000000 --- a/test/pending/run/t5610b.check +++ /dev/null @@ -1 +0,0 @@ -Stroke a kitten diff --git a/test/pending/run/t5610b.scala b/test/pending/run/t5610b.scala deleted file mode 100644 index d922d6333c..0000000000 --- a/test/pending/run/t5610b.scala +++ /dev/null @@ -1,21 +0,0 @@ -object Bug { - def main(args: Array[String]) { - var test: String = null - val result = bar(foo(test)) - test = "bar" - - if (result.str == null) { - println("Destroy ALL THE THINGS!!!") - } else { - println("Stroke a kitten") - } - } - - class Result(_str: => String) { - lazy val str = _str - } - - def foo(str: => String)(i: Int) = new Result(str) - - def bar(f: Int => Result) = f(42) -}
\ No newline at end of file diff --git a/test/pending/run/t5692.flags b/test/pending/run/t5692.flags deleted file mode 100644 index cd66464f2f..0000000000 --- a/test/pending/run/t5692.flags +++ /dev/null @@ -1 +0,0 @@ --language:experimental.macros
\ No newline at end of file diff --git a/test/pending/run/t5692/Impls_Macros_1.scala b/test/pending/run/t5692/Impls_Macros_1.scala deleted file mode 100644 index 94bcffbcaf..0000000000 --- a/test/pending/run/t5692/Impls_Macros_1.scala +++ /dev/null @@ -1,9 +0,0 @@ -import scala.reflect.macros.Context - -object Impls { - def impl[A](c: reflect.macros.Context) = c.universe.reify(()) -} - -object Macros { - def decl[A] = macro Impls.impl[A] -}
\ No newline at end of file diff --git a/test/pending/run/t5692/Test_2.scala b/test/pending/run/t5692/Test_2.scala deleted file mode 100644 index 29251a5ef5..0000000000 --- a/test/pending/run/t5692/Test_2.scala +++ /dev/null @@ -1,4 +0,0 @@ -object Test extends App { - val x = Macros.decl - def y() { Macros.decl(); } -}
\ No newline at end of file diff --git a/test/pending/run/t5722.scala b/test/pending/run/t5722.scala deleted file mode 100644 index 21ace060d6..0000000000 --- a/test/pending/run/t5722.scala +++ /dev/null @@ -1,6 +0,0 @@ -object Test extends App { - def foo[T: ClassTag] = println(classOf[T]) - foo[Int] - foo[Array[Int]] - foo[List[Int]] -}
\ No newline at end of file diff --git a/test/pending/run/t5726a.scala b/test/pending/run/t5726a.scala deleted file mode 100644 index 24d828a159..0000000000 --- a/test/pending/run/t5726a.scala +++ /dev/null @@ -1,17 +0,0 @@ -import language.dynamics - -class DynamicTest extends Dynamic { - def selectDynamic(name: String) = s"value of $name" - def updateDynamic(name: String)(value: Any) { - println(s"You have just updated property '$name' with value: $value") - } -} - -object MyApp extends App { - def testing() { - val test = new DynamicTest - test.firstName = "John" - } - - testing() -}
\ No newline at end of file diff --git a/test/pending/run/t5726b.scala b/test/pending/run/t5726b.scala deleted file mode 100644 index 839dcf40b5..0000000000 --- a/test/pending/run/t5726b.scala +++ /dev/null @@ -1,16 +0,0 @@ -import language.dynamics - -class DynamicTest extends Dynamic { - def updateDynamic(name: String)(value: Any) { - println(s"You have just updated property '$name' with value: $value") - } -} - -object MyApp extends App { - def testing() { - val test = new DynamicTest - test.firstName = "John" - } - - testing() -}
\ No newline at end of file diff --git a/test/pending/run/t5866b.scala b/test/pending/run/t5866b.scala deleted file mode 100644 index 44d8b114b8..0000000000 --- a/test/pending/run/t5866b.scala +++ /dev/null @@ -1,17 +0,0 @@ -class Foo(val d: Double) extends AnyVal { - override def toString = s"Foo($d)" -} - -class Bar(val d: String) extends AnyVal { - override def toString = s"Foo($d)" -} - -object Test { - def main(args: Array[String]): Unit = { - val f: Foo = {val n: Any = null; n.asInstanceOf[Foo]} - println(f) - - val b: Bar = {val n: Any = null; n.asInstanceOf[Bar]} - println(b) - } -} diff --git a/test/pending/run/t5882.scala b/test/pending/run/t5882.scala deleted file mode 100644 index 47996d3068..0000000000 --- a/test/pending/run/t5882.scala +++ /dev/null @@ -1,14 +0,0 @@ -// SIP-15 was revised to allow nested classes in value classes. -// This test checks that their basic functionality. - -class NodeOps(val n: Any) extends AnyVal { self => - class Foo() { def show = self.show(n) } - def show(x: Any) = x.toString -} - - -object Test extends App { - - val n = new NodeOps("abc") - assert(new n.Foo().show == "abc") -} diff --git a/test/pending/run/t5943b1.scala b/test/pending/run/t5943b1.scala deleted file mode 100644 index 79c638fedc..0000000000 --- a/test/pending/run/t5943b1.scala +++ /dev/null @@ -1,10 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.reflect.runtime.{currentMirror => cm} -import scala.tools.reflect.ToolBox - -// pending until https://issues.scala-lang.org/browse/SI-6393 is fixed -object Test extends App { - val tb = cm.mkToolBox() - val expr = tb.parse("math.sqrt(4.0)") - println(tb.typecheck(expr)) -}
\ No newline at end of file diff --git a/test/pending/run/t5943b2.scala b/test/pending/run/t5943b2.scala deleted file mode 100644 index 85299d9f12..0000000000 --- a/test/pending/run/t5943b2.scala +++ /dev/null @@ -1,10 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.reflect.runtime.{currentMirror => cm} -import scala.tools.reflect.ToolBox - -// pending until https://issues.scala-lang.org/browse/SI-6393 is fixed -object Test extends App { - val tb = cm.mkToolBox() - val expr = tb.parse("math.sqrt(4.0)") - println(tb.eval(expr)) -}
\ No newline at end of file diff --git a/test/pending/run/t6387.check b/test/pending/run/t6387.check deleted file mode 100644 index 83b33d238d..0000000000 --- a/test/pending/run/t6387.check +++ /dev/null @@ -1 +0,0 @@ -1000 diff --git a/test/pending/run/t6387.scala b/test/pending/run/t6387.scala deleted file mode 100644 index bbebb5f511..0000000000 --- a/test/pending/run/t6387.scala +++ /dev/null @@ -1,16 +0,0 @@ -trait A { - def foo: Long -} - -object Test { - def a(): A = new A { - var foo: Long = 1000L - - val test = () => { - foo = 28 - } - } - def main(args: Array[String]) { - println(a().foo) - } -} diff --git a/test/pending/run/t6408.scala b/test/pending/run/t6408.scala deleted file mode 100644 index ff17480b35..0000000000 --- a/test/pending/run/t6408.scala +++ /dev/null @@ -1,11 +0,0 @@ -class X(val i: Int) extends AnyVal { - class Inner(val q: Int) { - def plus = i + q - } -} - -object Test extends App { - val x = new X(11) - val i = new x.Inner(22) - assert(i.plus == 33) -} diff --git a/test/pending/run/t6591_4.check b/test/pending/run/t6591_4.check deleted file mode 100644 index 0f1c0489e9..0000000000 --- a/test/pending/run/t6591_4.check +++ /dev/null @@ -1 +0,0 @@ -Expr(Block(List(ValDef(Modifiers(), newTermName("v"), Select(Ident(newTermName("A")), newTypeName("I")), Apply(Select(New(Select(Ident(newTermName("A")), newTypeName("I"))), nme.CONSTRUCTOR), List()))), Ident(newTermName("v")))) diff --git a/test/pending/run/t6591_4.scala b/test/pending/run/t6591_4.scala deleted file mode 100644 index f20c8e6127..0000000000 --- a/test/pending/run/t6591_4.scala +++ /dev/null @@ -1,17 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.tools.reflect.ToolBox -import scala.tools.reflect.Eval - -class O { class I } - -class A extends O { - val code = reify { - val v: I = new I - v - } - println(showRaw(code)) -} - -object Test extends App { - val v: A#I = (new A).code.eval -} diff --git a/test/pending/run/t7733.check b/test/pending/run/t7733.check deleted file mode 100644 index 19765bd501..0000000000 --- a/test/pending/run/t7733.check +++ /dev/null @@ -1 +0,0 @@ -null diff --git a/test/pending/run/t7733/Separate_1.scala b/test/pending/run/t7733/Separate_1.scala deleted file mode 100644 index a326ecd53e..0000000000 --- a/test/pending/run/t7733/Separate_1.scala +++ /dev/null @@ -1,5 +0,0 @@ -package test - -class Separate { - for (i <- 1 to 10) println(i) -}
\ No newline at end of file diff --git a/test/pending/run/t7733/Test_2.scala b/test/pending/run/t7733/Test_2.scala deleted file mode 100644 index 28358574ec..0000000000 --- a/test/pending/run/t7733/Test_2.scala +++ /dev/null @@ -1,9 +0,0 @@ -import scala.reflect.runtime.universe._ -import scala.reflect.runtime.{currentMirror => cm} -import scala.tools.reflect.ToolBox - -object Test extends App { - val tb = cm.mkToolBox() - val code = tb.parse("{ val x: test.Separate$$anonfun$1 = null; x }") - println(tb.eval(code)) -}
\ No newline at end of file diff --git a/test/pending/run/virtpatmat_anonfun_underscore.flags b/test/pending/run/virtpatmat_anonfun_underscore.flags deleted file mode 100644 index 23e3dc7d26..0000000000 --- a/test/pending/run/virtpatmat_anonfun_underscore.flags +++ /dev/null @@ -1 +0,0 @@ --Yvirtpatmat
\ No newline at end of file diff --git a/test/pending/run/virtpatmat_anonfun_underscore.scala b/test/pending/run/virtpatmat_anonfun_underscore.scala deleted file mode 100644 index db6705d025..0000000000 --- a/test/pending/run/virtpatmat_anonfun_underscore.scala +++ /dev/null @@ -1,4 +0,0 @@ -object Test extends App { - List(1,2,3) map (_ match { case x => x + 1} ) // `_ match` is redundant but shouldn't crash the compiler - List((1,2)) map (_ match { case (x, z) => x + z}) -}
\ No newline at end of file diff --git a/test/pending/scalacheck/process.scala b/test/pending/scalacheck/process.scala deleted file mode 100644 index f3aa872361..0000000000 --- a/test/pending/scalacheck/process.scala +++ /dev/null @@ -1,160 +0,0 @@ -/** process tests. - */ - -import java.io.{ File, FileNotFoundException, IOException, InputStream, OutputStream, FileInputStream } -import java.net.{ URI, URISyntaxException, URL } -import org.scalacheck._ -import Prop._ -import sys.process._ -import scala.tools.nsc.io.{ File => SFile } - -/** This has scrounged bits of sbt to flesh it out enough to run. - */ -package processtest { - - object exit - { - def fn(code: Int) = System.exit(code) - def main(args: Array[String]) = exit.fn(java.lang.Integer.parseInt(args(0))) - } - object cat - { - def main(args: Array[String]) - { - try { - if (args.length == 0) - IO.transfer(System.in, System.out) - else - catFiles(args.toList) - exit.fn(0) - } catch { - case e => - e.printStackTrace() - System.err.println("Error: " + e.toString) - exit.fn(1) - } - } - private def catFiles(filenames: List[String]): Option[String] = filenames match { - case head :: tail => - val file = new File(head) - if (file.isDirectory) - throw new IOException("Is directory: " + file) - else if (file.exists) { - IO.transfer(file, System.out) - catFiles(tail) - } - else - throw new FileNotFoundException("No such file or directory: " + file) - case Nil => None - } - } - object echo - { - def main(args: Array[String]) - { - System.out.println(args.mkString(" ")) - } - } -} - -object IO { - def transfer(in: InputStream, out: OutputStream): Unit = BasicIO.transferFully(in, out) - def transfer(in: File, out: OutputStream): Unit = BasicIO.transferFully(new FileInputStream(in), out) - - def classLocation(cl: Class[_]): URL = { - val codeSource = cl.getProtectionDomain.getCodeSource - if(codeSource == null) sys.error("No class location for " + cl) - else codeSource.getLocation - } - def classLocationFile(cl: Class[_]): File = toFile(classLocation(cl)) - def classLocation[T](implicit mf: Manifest[T]): URL = classLocation(mf.erasure) - def classLocationFile[T](implicit mf: Manifest[T]): File = classLocationFile(mf.erasure) - - def toFile(url: URL) = - try { new File(url.toURI) } - catch { case _: URISyntaxException => new File(url.getPath) } -} - -class ProcessSpecification extends Properties("Process I/O") { - implicit val exitCodeArb: Arbitrary[Array[Byte]] = Arbitrary(Gen.choose(0, 10) flatMap { size => - Gen.resize(size, Arbitrary.arbArray[Byte].arbitrary) - }) - - /*property("Correct exit code") = forAll( (exitCode: Byte) => checkExit(exitCode)) - property("#&& correct") = forAll( (exitCodes: Array[Byte]) => checkBinary(exitCodes)(_ #&& _)(_ && _)) - property("#|| correct") = forAll( (exitCodes: Array[Byte]) => checkBinary(exitCodes)(_ #|| _)(_ || _)) - property("### correct") = forAll( (exitCodes: Array[Byte]) => checkBinary(exitCodes)(_ ### _)( (x,latest) => latest))*/ - property("Pipe to output file") = forAll( (data: Array[Byte]) => checkFileOut(data)) - property("Pipe to input file") = forAll( (data: Array[Byte]) => checkFileIn(data)) - property("Pipe to process") = forAll( (data: Array[Byte]) => checkPipe(data)) - - private def checkBinary(codes: Array[Byte])(reduceProcesses: (ProcessBuilder, ProcessBuilder) => ProcessBuilder)(reduceExit: (Boolean, Boolean) => Boolean) = - { - (codes.length > 1) ==> - { - val unsignedCodes = codes.map(unsigned) - val exitCode = unsignedCodes.map(code => Process(process("processtest.exit " + code))).reduceLeft(reduceProcesses) ! - val expectedExitCode = unsignedCodes.map(toBoolean).reduceLeft(reduceExit) - toBoolean(exitCode) == expectedExitCode - } - } - private def toBoolean(exitCode: Int) = exitCode == 0 - private def checkExit(code: Byte) = - { - val exitCode = unsigned(code) - (process("processtest.exit " + exitCode) !) == exitCode - } - private def checkFileOut(data: Array[Byte]) = - { - withData(data) { (temporaryFile, temporaryFile2) => - val catCommand = process("processtest.cat " + temporaryFile.getAbsolutePath) - catCommand #> temporaryFile2 - } - } - private def checkFileIn(data: Array[Byte]) = - { - withData(data) { (temporaryFile, temporaryFile2) => - val catCommand = process("processtest.cat") - temporaryFile #> catCommand #> temporaryFile2 - } - } - private def checkPipe(data: Array[Byte]) = - { - withData(data) { (temporaryFile, temporaryFile2) => - val catCommand = process("processtest.cat") - temporaryFile #> catCommand #| catCommand #> temporaryFile2 - } - } - private def temp() = SFile(File.createTempFile("processtest", "")) - private def withData(data: Array[Byte])(f: (File, File) => ProcessBuilder) = - { - val temporaryFile1 = temp() - val temporaryFile2 = temp() - try { - temporaryFile1 writeBytes data - val process = f(temporaryFile1.jfile, temporaryFile2.jfile) - ( process ! ) == 0 && - { - val b1 = temporaryFile1.slurp() - val b2 = temporaryFile2.slurp() - b1 == b2 - } - } - finally - { - temporaryFile1.delete() - temporaryFile2.delete() - } - } - private def unsigned(b: Byte): Int = ((b: Int) +256) % 256 - private def process(command: String) = { - val thisClasspath = List(getSource[ScalaObject], getSource[IO.type], getSource[SourceTag]).mkString(File.pathSeparator) - "java -cp " + thisClasspath + " " + command - } - private def getSource[T : Manifest]: String = - IO.classLocationFile[T].getAbsolutePath -} -private trait SourceTag - - -object Test extends ProcessSpecification { } diff --git a/test/pending/script/dashi.check b/test/pending/script/dashi.check deleted file mode 100644 index c3cf137155..0000000000 --- a/test/pending/script/dashi.check +++ /dev/null @@ -1 +0,0 @@ -test.bippy = dingus diff --git a/test/pending/script/dashi.flags b/test/pending/script/dashi.flags deleted file mode 100644 index 5b46a61e4f..0000000000 --- a/test/pending/script/dashi.flags +++ /dev/null @@ -1 +0,0 @@ --i dashi/a.scala -e 'setBippy ; getBippy' diff --git a/test/pending/script/dashi/a.scala b/test/pending/script/dashi/a.scala deleted file mode 100644 index c4a07bf9ba..0000000000 --- a/test/pending/script/dashi/a.scala +++ /dev/null @@ -1,2 +0,0 @@ -def setBippy = sys.props("test.bippy") = "dingus" -def getBippy = println("test.bippy = " + sys.props("test.bippy")) diff --git a/test/pending/script/error-messages.check b/test/pending/script/error-messages.check deleted file mode 100644 index 1aee1fb44a..0000000000 --- a/test/pending/script/error-messages.check +++ /dev/null @@ -1,7 +0,0 @@ -errors.scala:7: error: in XML literal: expected closing tag of hello -<hello> </there> - ^ -errors.scala:7: error: start tag was here: <hello> -<hello> </there> - -two errors found diff --git a/test/pending/script/error-messages.scala b/test/pending/script/error-messages.scala deleted file mode 100644 index 2e2025b203..0000000000 --- a/test/pending/script/error-messages.scala +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -exec scala -nocompdaemon "$0" -!# - -// test that error messages print nicely - -<hello> </there> - - diff --git a/test/pending/script/t2365.javaopts b/test/pending/script/t2365.javaopts deleted file mode 100644 index 357e033c1c..0000000000 --- a/test/pending/script/t2365.javaopts +++ /dev/null @@ -1 +0,0 @@ --XX:MaxPermSize=25M diff --git a/test/pending/script/t2365.sh b/test/pending/script/t2365.sh deleted file mode 100755 index f3c44ad086..0000000000 --- a/test/pending/script/t2365.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# -# This script should fail with any build of scala where #2365 -# is not fixed, and otherwise succeed. Failure means running out -# of PermGen space. - -CP=.:/local/lib/java/ivy.jar -# SCALAC=/scala/inst/28/bin/scalac -SCALAC=scalac -RUN_OPTS="-XX:MaxPermSize=25M -verbose:gc" - -$SCALAC -cp $CP *.scala -JAVA_OPTS="${RUN_OPTS}" scala -cp $CP Test diff --git a/test/pending/script/t2365/Test.scala b/test/pending/script/t2365/Test.scala deleted file mode 100644 index 110dea2ab6..0000000000 --- a/test/pending/script/t2365/Test.scala +++ /dev/null @@ -1,35 +0,0 @@ -import scala.tools.nsc.io._ -import java.net.URL - -object A { def apply(d: { def apply(): Int}) = d.apply() } -object A2 { def apply(d: { def apply(): Int}) = d.apply() } -object A3 { def apply(d: { def apply(): Int}) = d.apply() } -object A4 { def apply(d: { def apply(): Int}) = d.apply() } - -class B extends Function0[Int] { - def apply() = 3 -} - -object Test -{ - type StructF0 = { def apply(): Int } - def main(args: Array[String]) { - for(i <- 0 until 150) - println(i + " " + test(A.apply) + " " + test(A2.apply) + " " + test(A3.apply) + " " + test(A3.apply)) - } - - def test(withF0: StructF0 => Int): Int = { - // Some large jar - val jar = File("../../../../lib/scalacheck.jar").toURL - // load a class in a separate loader that will be passed to A - val loader = new java.net.URLClassLoader(Array(File(".").toURL, jar)) - // load a real class to fill perm gen space - Class.forName("org.scalacheck.Properties", true, loader).newInstance - // create a class from another class loader with an apply: Int method - val b = Class.forName("B", true, loader).newInstance - - // pass instance to a, which will call apply using structural type reflection. - // This should hold on to the class for B, which means bLoader will not get collected - withF0(b.asInstanceOf[StructF0]) - } -} diff --git a/test/pending/script/t2365/runner.scala b/test/pending/script/t2365/runner.scala deleted file mode 100755 index b5e05325cf..0000000000 --- a/test/pending/script/t2365/runner.scala +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -# -# This script should fail with any build of scala where #2365 -# is not fixed, and otherwise succeed. Failure means running out -# of PermGen space. -# - -scalac -cp .:/local/lib/java/ivy.jar Test.scala -JAVA_OPTS="-XX:MaxPermSize=25M -verbose:gc" scalac -cp $CP Test diff --git a/test/pending/shootout/fasta.check b/test/pending/shootout/fasta.check deleted file mode 100644 index f1caba0d62..0000000000 --- a/test/pending/shootout/fasta.check +++ /dev/null @@ -1,171 +0,0 @@ ->ONE Homo sapiens alu -GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGA -TCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACT -AAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAG -GCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCG -CCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGT -GGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCA -GGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAA -TTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAG -AATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCA -GCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGT -AATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACC -AGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTG -GTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACC -CGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAG -AGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTT -TGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACA -TGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCT -GTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGG -TTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGT -CTCAAAAAGGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGG -CGGGCGGATCACCTGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCG -TCTCTACTAAAAATACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTA -CTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCG -AGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCG -GGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACC -TGAGGTCAGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAA -TACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGA -GGCAGGAGAATCGCTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACT -GCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAAGGCCGGGCGCGGTGGCTC -ACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGT -TCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGC -CGGGCGTGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCG -CTTGAACCCGGGAGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTG -GGCGACAGAGCGAGACTCCG ->TWO IUB ambiguity codes -cttBtatcatatgctaKggNcataaaSatgtaaaDcDRtBggDtctttataattcBgtcg -tactDtDagcctatttSVHtHttKtgtHMaSattgWaHKHttttagacatWatgtRgaaa -NtactMcSMtYtcMgRtacttctWBacgaaatatagScDtttgaagacacatagtVgYgt -cattHWtMMWcStgttaggKtSgaYaaccWStcgBttgcgaMttBYatcWtgacaYcaga -gtaBDtRacttttcWatMttDBcatWtatcttactaBgaYtcttgttttttttYaaScYa -HgtgttNtSatcMtcVaaaStccRcctDaataataStcYtRDSaMtDttgttSagtRRca -tttHatSttMtWgtcgtatSSagactYaaattcaMtWatttaSgYttaRgKaRtccactt -tattRggaMcDaWaWagttttgacatgttctacaaaRaatataataaMttcgDacgaSSt -acaStYRctVaNMtMgtaggcKatcttttattaaaaagVWaHKYagtttttatttaacct -tacgtVtcVaattVMBcttaMtttaStgacttagattWWacVtgWYagWVRctDattBYt -gtttaagaagattattgacVatMaacattVctgtBSgaVtgWWggaKHaatKWcBScSWa -accRVacacaaactaccScattRatatKVtactatatttHttaagtttSKtRtacaaagt -RDttcaaaaWgcacatWaDgtDKacgaacaattacaRNWaatHtttStgttattaaMtgt -tgDcgtMgcatBtgcttcgcgaDWgagctgcgaggggVtaaScNatttacttaatgacag -cccccacatYScaMgtaggtYaNgttctgaMaacNaMRaacaaacaKctacatagYWctg -ttWaaataaaataRattagHacacaagcgKatacBttRttaagtatttccgatctHSaat -actcNttMaagtattMtgRtgaMgcataatHcMtaBSaRattagttgatHtMttaaKagg -YtaaBataSaVatactWtataVWgKgttaaaacagtgcgRatatacatVtHRtVYataSa -KtWaStVcNKHKttactatccctcatgWHatWaRcttactaggatctataDtDHBttata -aaaHgtacVtagaYttYaKcctattcttcttaataNDaaggaaaDYgcggctaaWSctBa -aNtgctggMBaKctaMVKagBaactaWaDaMaccYVtNtaHtVWtKgRtcaaNtYaNacg -gtttNattgVtttctgtBaWgtaattcaagtcaVWtactNggattctttaYtaaagccgc -tcttagHVggaYtgtNcDaVagctctctKgacgtatagYcctRYHDtgBattDaaDgccK -tcHaaStttMcctagtattgcRgWBaVatHaaaataYtgtttagMDMRtaataaggatMt -ttctWgtNtgtgaaaaMaatatRtttMtDgHHtgtcattttcWattRSHcVagaagtacg -ggtaKVattKYagactNaatgtttgKMMgYNtcccgSKttctaStatatNVataYHgtNa -BKRgNacaactgatttcctttaNcgatttctctataScaHtataRagtcRVttacDSDtt -aRtSatacHgtSKacYagttMHtWataggatgactNtatSaNctataVtttRNKtgRacc -tttYtatgttactttttcctttaaacatacaHactMacacggtWataMtBVacRaSaatc -cgtaBVttccagccBcttaRKtgtgcctttttRtgtcagcRttKtaaacKtaaatctcac -aattgcaNtSBaaccgggttattaaBcKatDagttactcttcattVtttHaaggctKKga -tacatcBggScagtVcacattttgaHaDSgHatRMaHWggtatatRgccDttcgtatcga -aacaHtaagttaRatgaVacttagattVKtaaYttaaatcaNatccRttRRaMScNaaaD -gttVHWgtcHaaHgacVaWtgttScactaagSgttatcttagggDtaccagWattWtRtg -ttHWHacgattBtgVcaYatcggttgagKcWtKKcaVtgaYgWctgYggVctgtHgaNcV -taBtWaaYatcDRaaRtSctgaHaYRttagatMatgcatttNattaDttaattgttctaa -ccctcccctagaWBtttHtBccttagaVaatMcBHagaVcWcagBVttcBtaYMccagat -gaaaaHctctaacgttagNWRtcggattNatcRaNHttcagtKttttgWatWttcSaNgg -gaWtactKKMaacatKatacNattgctWtatctaVgagctatgtRaHtYcWcttagccaa -tYttWttaWSSttaHcaaaaagVacVgtaVaRMgattaVcDactttcHHggHRtgNcctt -tYatcatKgctcctctatVcaaaaKaaaagtatatctgMtWtaaaacaStttMtcgactt -taSatcgDataaactaaacaagtaaVctaggaSccaatMVtaaSKNVattttgHccatca -cBVctgcaVatVttRtactgtVcaattHgtaaattaaattttYtatattaaRSgYtgBag -aHSBDgtagcacRHtYcBgtcacttacactaYcgctWtattgSHtSatcataaatataHt -cgtYaaMNgBaatttaRgaMaatatttBtttaaaHHKaatctgatWatYaacttMctctt -ttVctagctDaaagtaVaKaKRtaacBgtatccaaccactHHaagaagaaggaNaaatBW -attccgStaMSaMatBttgcatgRSacgttVVtaaDMtcSgVatWcaSatcttttVatag -ttactttacgatcaccNtaDVgSRcgVcgtgaacgaNtaNatatagtHtMgtHcMtagaa -attBgtataRaaaacaYKgtRccYtatgaagtaataKgtaaMttgaaRVatgcagaKStc -tHNaaatctBBtcttaYaBWHgtVtgacagcaRcataWctcaBcYacYgatDgtDHccta ->THREE Homo sapiens frequency -aacacttcaccaggtatcgtgaaggctcaagattacccagagaacctttgcaatataaga -atatgtatgcagcattaccctaagtaattatattctttttctgactcaaagtgacaagcc -ctagtgtatattaaatcggtatatttgggaaattcctcaaactatcctaatcaggtagcc -atgaaagtgatcaaaaaagttcgtacttataccatacatgaattctggccaagtaaaaaa -tagattgcgcaaaattcgtaccttaagtctctcgccaagatattaggatcctattactca -tatcgtgtttttctttattgccgccatccccggagtatctcacccatccttctcttaaag -gcctaatattacctatgcaaataaacatatattgttgaaaattgagaacctgatcgtgat -tcttatgtgtaccatatgtatagtaatcacgcgactatatagtgctttagtatcgcccgt -gggtgagtgaatattctgggctagcgtgagatagtttcttgtcctaatatttttcagatc -gaatagcttctatttttgtgtttattgacatatgtcgaaactccttactcagtgaaagtc -atgaccagatccacgaacaatcttcggaatcagtctcgttttacggcggaatcttgagtc -taacttatatcccgtcgcttactttctaacaccccttatgtatttttaaaattacgttta -ttcgaacgtacttggcggaagcgttattttttgaagtaagttacattgggcagactcttg -acattttcgatacgactttctttcatccatcacaggactcgttcgtattgatatcagaag -ctcgtgatgattagttgtcttctttaccaatactttgaggcctattctgcgaaatttttg -ttgccctgcgaacttcacataccaaggaacacctcgcaacatgccttcatatccatcgtt -cattgtaattcttacacaatgaatcctaagtaattacatccctgcgtaaaagatggtagg -ggcactgaggatatattaccaagcatttagttatgagtaatcagcaatgtttcttgtatt -aagttctctaaaatagttacatcgtaatgttatctcgggttccgcgaataaacgagatag -attcattatatatggccctaagcaaaaacctcctcgtattctgttggtaattagaatcac -acaatacgggttgagatattaattatttgtagtacgaagagatataaaaagatgaacaat -tactcaagtcaagatgtatacgggatttataataaaaatcgggtagagatctgctttgca -attcagacgtgccactaaatcgtaatatgtcgcgttacatcagaaagggtaactattatt -aattaataaagggcttaatcactacatattagatcttatccgatagtcttatctattcgt -tgtatttttaagcggttctaattcagtcattatatcagtgctccgagttctttattattg -ttttaaggatgacaaaatgcctcttgttataacgctgggagaagcagactaagagtcgga -gcagttggtagaatgaggctgcaaaagacggtctcgacgaatggacagactttactaaac -caatgaaagacagaagtagagcaaagtctgaagtggtatcagcttaattatgacaaccct -taatacttccctttcgccgaatactggcgtggaaaggttttaaaagtcgaagtagttaga -ggcatctctcgctcataaataggtagactactcgcaatccaatgtgactatgtaatactg -ggaacatcagtccgcgatgcagcgtgtttatcaaccgtccccactcgcctggggagacat -gagaccacccccgtggggattattagtccgcagtaatcgactcttgacaatccttttcga -ttatgtcatagcaatttacgacagttcagcgaagtgactactcggcgaaatggtattact -aaagcattcgaacccacatgaatgtgattcttggcaatttctaatccactaaagcttttc -cgttgaatctggttgtagatatttatataagttcactaattaagatcacggtagtatatt -gatagtgatgtctttgcaagaggttggccgaggaatttacggattctctattgatacaat -ttgtctggcttataactcttaaggctgaaccaggcgtttttagacgacttgatcagctgt -tagaatggtttggactccctctttcatgtcagtaacatttcagccgttattgttacgata -tgcttgaacaatattgatctaccacacacccatagtatattttataggtcatgctgttac -ctacgagcatggtattccacttcccattcaatgagtattcaacatcactagcctcagaga -tgatgacccacctctaataacgtcacgttgcggccatgtgaaacctgaacttgagtagac -gatatcaagcgctttaaattgcatataacatttgagggtaaagctaagcggatgctttat -ataatcaatactcaataataagatttgattgcattttagagttatgacacgacatagttc -actaacgagttactattcccagatctagactgaagtactgatcgagacgatccttacgtc -gatgatcgttagttatcgacttaggtcgggtctctagcggtattggtacttaaccggaca -ctatactaataacccatgatcaaagcataacagaatacagacgataatttcgccaacata -tatgtacagaccccaagcatgagaagctcattgaaagctatcattgaagtcccgctcaca -atgtgtcttttccagacggtttaactggttcccgggagtcctggagtttcgacttacata -aatggaaacaatgtattttgctaatttatctatagcgtcatttggaccaatacagaatat -tatgttgcctagtaatccactataacccgcaagtgctgatagaaaatttttagacgattt -ataaatgccccaagtatccctcccgtgaatcctccgttatactaattagtattcgttcat -acgtataccgcgcatatatgaacatttggcgataaggcgcgtgaattgttacgtgacaga -gatagcagtttcttgtgatatggttaacagacgtacatgaagggaaactttatatctata -gtgatgcttccgtagaaataccgccactggtctgccaatgatgaagtatgtagctttagg -tttgtactatgaggctttcgtttgtttgcagagtataacagttgcgagtgaaaaaccgac -gaatttatactaatacgctttcactattggctacaaaatagggaagagtttcaatcatga -gagggagtatatggatgctttgtagctaaaggtagaacgtatgtatatgctgccgttcat -tcttgaaagatacataagcgataagttacgacaattataagcaacatccctaccttcgta -acgatttcactgttactgcgcttgaaatacactatggggctattggcggagagaagcaga -tcgcgccgagcatatacgagacctataatgttgatgatagagaaggcgtctgaattgata -catcgaagtacactttctttcgtagtatctctcgtcctctttctatctccggacacaaga -attaagttatatatatagagtcttaccaatcatgttgaatcctgattctcagagttcttt -ggcgggccttgtgatgactgagaaacaatgcaatattgctccaaatttcctaagcaaatt -ctcggttatgttatgttatcagcaaagcgttacgttatgttatttaaatctggaatgacg -gagcgaagttcttatgtcggtgtgggaataattcttttgaagacagcactccttaaataa -tatcgctccgtgtttgtatttatcgaatgggtctgtaaccttgcacaagcaaatcggtgg -tgtatatatcggataacaattaatacgatgttcatagtgacagtatactgatcgagtcct -ctaaagtcaattacctcacttaacaatctcattgatgttgtgtcattcccggtatcgccc -gtagtatgtgctctgattgaccgagtgtgaaccaaggaacatctactaatgcctttgtta -ggtaagatctctctgaattccttcgtgccaacttaaaacattatcaaaatttcttctact -tggattaactacttttacgagcatggcaaattcccctgtggaagacggttcattattatc -ggaaaccttatagaaattgcgtgttgactgaaattagatttttattgtaagagttgcatc -tttgcgattcctctggtctagcttccaatgaacagtcctcccttctattcgacatcgggt -ccttcgtacatgtctttgcgatgtaataattaggttcggagtgtggccttaatgggtgca -actaggaatacaacgcaaatttgctgacatgatagcaaatcggtatgccggcaccaaaac -gtgctccttgcttagcttgtgaatgagactcagtagttaaataaatccatatctgcaatc -gattccacaggtattgtccactatctttgaactactctaagagatacaagcttagctgag -accgaggtgtatatgactacgctgatatctgtaaggtaccaatgcaggcaaagtatgcga -gaagctaataccggctgtttccagctttataagattaaaatttggctgtcctggcggcct -cagaattgttctatcgtaatcagttggttcattaattagctaagtacgaggtacaactta -tctgtcccagaacagctccacaagtttttttacagccgaaacccctgtgtgaatcttaat -atccaagcgcgttatctgattagagtttacaactcagtattttatcagtacgttttgttt -ccaacattacccggtatgacaaaatgacgccacgtgtcgaataatggtctgaccaatgta -ggaagtgaaaagataaatat diff --git a/test/pending/shootout/fasta.scala b/test/pending/shootout/fasta.scala deleted file mode 100644 index ae99ba5936..0000000000 --- a/test/pending/shootout/fasta.scala +++ /dev/null @@ -1,162 +0,0 @@ -/* The Computer Language Shootout - http://shootout.alioth.debian.org/ - contributed by Isaac Gouy -*/ - -import java.io._ - -object fasta { - def main(args: Array[String]) = { - - val ALU = - "GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGG" + - "GAGGCCGAGGCGGGCGGATCACCTGAGGTCAGGAGTTCGAGA" + - "CCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAAT" + - "ACAAAAATTAGCCGGGCGTGGTGGCGCGCGCCTGTAATCCCA" + - "GCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGG" + - "AGGCGGAGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCC" + - "AGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAA" - - val _IUB = Array( - ('a', 0.27), - ('c', 0.12), - ('g', 0.12), - ('t', 0.27), - - ('B', 0.02), - ('D', 0.02), - ('H', 0.02), - ('K', 0.02), - ('M', 0.02), - ('N', 0.02), - ('R', 0.02), - ('S', 0.02), - ('V', 0.02), - ('W', 0.02), - ('Y', 0.02) - ) - - val IUB = makeCumulative(_IUB) - - val _HomoSapiens = Array( - ('a', 0.3029549426680), - ('c', 0.1979883004921), - ('g', 0.1975473066391), - ('t', 0.3015094502008) - ) - - val HomoSapiens = makeCumulative(_HomoSapiens) - - - val n = Integer parseInt(args(0)) - val s = new FastaOutputStream(System.out) - - s.writeDescription("ONE Homo sapiens alu") - s.writeRepeatingSequence(ALU,n*2) - - s.writeDescription("TWO IUB ambiguity codes") - s.writeRandomSequence(IUB,n*3) - - s.writeDescription("THREE Homo sapiens frequency") - s.writeRandomSequence(HomoSapiens,n*5) - - s.close - } - - def makeCumulative(a: Array[Tuple2[Char,Double]]) = { - var cp = 0.0 - a map (frequency => - frequency match { - case (code,percent) => - cp = cp + percent; new Frequency(code.toByte,cp) - } - ) - } - -} - - -// We could use instances of Pair or Tuple2 but specific labels -// make the code more readable than index numbers - -class Frequency(_code: Byte, _percent: Double){ - var code = _code; var percent = _percent; -} - - -// extend the Java BufferedOutputStream class - -class FastaOutputStream(out: OutputStream) extends BufferedOutputStream(out) { - - private val LineLength = 60 - private val nl = '\n'.toByte - - def writeDescription(desc: String) = { write( (">" + desc + "\n").getBytes ) } - - def writeRepeatingSequence(_alu: String, length: Int) = { - val alu = _alu.getBytes - var n = length; var k = 0; val kn = alu.length; - - while (n > 0) { - val m = if (n < LineLength) n else LineLength - - var i = 0 - while (i < m){ - if (k == kn) k = 0 - val b = alu(k) - if (count < buf.length){ buf(count) = b; count = count + 1 } - else { write(b) } // flush buffer - k = k+1 - i = i+1 - } - - write(nl) - n = n - LineLength - } - - } - - def writeRandomSequence(distribution: Array[Frequency], length: Int) = { - var n = length - while (n > 0) { - val m = if (n < LineLength) n else LineLength - - var i = 0 - while (i < m){ - val b = selectRandom(distribution) - if (count < buf.length){ buf(count) = b; count = count + 1 } - else { write(b) } // flush buffer - i = i+1 - } - - if (count < buf.length){ buf(count) = nl; count = count + 1 } - else { write(nl) } // flush buffer - n = n - LineLength - } - } - - private def selectRandom(distribution: Array[Frequency]): Byte = { - val n = distribution.length - val r = RandomNumber scaledTo(1.0) - - var i = 0 - while (i < n) { - if (r < distribution(i).percent) return distribution(i).code - i = i+1 - } - return distribution(n-1).code - } -} - - -object RandomNumber { - private val IM = 139968 - private val IA = 3877 - private val IC = 29573 - private var seed = 42 - - def scaledTo(max: Double) = { - seed = (seed * IA + IC) % IM - max * seed / IM - } -} diff --git a/test/pending/shootout/fasta.scala.runner b/test/pending/shootout/fasta.scala.runner deleted file mode 100644 index e95a749cf2..0000000000 --- a/test/pending/shootout/fasta.scala.runner +++ /dev/null @@ -1,3 +0,0 @@ -object Test extends Application { - for(n <- List(25000,250000,2500000)) fasta.main(Array(n.toString)) -} diff --git a/test/pending/shootout/harmonic.scala-2.scala b/test/pending/shootout/harmonic.scala-2.scala deleted file mode 100644 index a55e164e50..0000000000 --- a/test/pending/shootout/harmonic.scala-2.scala +++ /dev/null @@ -1,14 +0,0 @@ -/* The Computer Language Shootout - http://shootout.alioth.debian.org/ - contributed by Isaac Gouy (Scala novice) -*/ - -object harmonic { - def main(args: Array[String]) = { - val n = Integer.parseInt(args(0)); - var partialSum = 0.0; - - for (i <- Iterator.range(1,n+1)) partialSum = partialSum + 1.0/i; - Console.printf("{0,number,#.000000000}\n")(partialSum); - } -} diff --git a/test/pending/shootout/harmonic.scala-2.scala.runner b/test/pending/shootout/harmonic.scala-2.scala.runner deleted file mode 100644 index d0ea85742a..0000000000 --- a/test/pending/shootout/harmonic.scala-2.scala.runner +++ /dev/null @@ -1,16 +0,0 @@ -/* The Computer Language Shootout - http://shootout.alioth.debian.org/ - contributed by Isaac Gouy (Scala novice) -*/ -object Test extends Application { - for(n <- List(6000000,8000000,10000000)) harmonic.main(Array(n.toString)) -} -object harmonic { - def main(args: Array[String]) = { - val n = Integer.parseInt(args(0)); - var partialSum = 0.0; - - for (i <- Iterator.range(1,n+1)) partialSum = partialSum + 1.0/i; - Console.printf("{0,number,#.000000000}\n")(partialSum); - } -} diff --git a/test/pending/shootout/harmonic.scala-3.scala b/test/pending/shootout/harmonic.scala-3.scala deleted file mode 100644 index dc631fcf12..0000000000 --- a/test/pending/shootout/harmonic.scala-3.scala +++ /dev/null @@ -1,15 +0,0 @@ -/* The Computer Language Shootout - http://shootout.alioth.debian.org/ - contributed by Isaac Gouy (Scala novice) -*/ - -object harmonic { - def main(args: Array[String]) = { - val n = Integer.parseInt(args(0)); - var partialSum = 0.0; - var i = 1; - - while (i < n){ partialSum = partialSum + 1.0/i; i = i + 1; } - Console.printf("{0,number,#.000000000}\n", partialSum); - } -} diff --git a/test/pending/shootout/harmonic.scala-3.scala.runner b/test/pending/shootout/harmonic.scala-3.scala.runner deleted file mode 100644 index b5eda3f034..0000000000 --- a/test/pending/shootout/harmonic.scala-3.scala.runner +++ /dev/null @@ -1,3 +0,0 @@ -object Test extends Application { - for(n <- List(6000000,8000000,10000000)) harmonic.main(Array(n.toString)) -} diff --git a/test/pending/shootout/heapsort.scala b/test/pending/shootout/heapsort.scala deleted file mode 100644 index 59b1fe27cb..0000000000 --- a/test/pending/shootout/heapsort.scala +++ /dev/null @@ -1,72 +0,0 @@ -/* The Computer Language Shootout - http://shootout.alioth.debian.org/ - contributed by Isaac Gouy (Scala novice) -*/ - -object heapsort { - def main(args: Array[String]) = { - val n = toPositiveInt(args); - - val numbers = new Array[Double](n+1); - for (i <- Iterator.range(1,n+1)) - numbers(i) = generate(100.0); - - heapsort(n, numbers); - - Console.printf("{0,number,#.000000000}\n", numbers(n)); - } - - - def heapsort(n: Int, ra: Array[Double]): Unit = { - var l = 0; var j = 0; var ir = 0; var i = 0; - var rra = 0.0d; - - if (n < 2) return; - l = (n >> 1) + 1; - ir = n; - while (true) { - if (l > 1) { l = l-1; rra = ra(l); } - else { - rra = ra(ir); - ra(ir) = ra(1); - ir = ir-1; - if (ir == 1) { - ra(1) = rra; - return; - } - } - i = l; - j = l << 1; - while (j <= ir) { - if (j < ir && ra(j) < ra(j+1)) { j = j+1; } - if (rra < ra(j)) { - ra(i) = ra(j); - i = j; - j = j + i; - } - else j = ir + 1; - } - ra(i) = rra; - } - } - - - private val IM = 139968; - private val IA = 3877; - private val IC = 29573; - private var seed = 42; - - private def generate(max: Double) = { - seed = (seed * IA + IC) % IM; - max * seed / IM; - } - - - private def toPositiveInt(s: Array[String]) = { - val i = - try { Integer.parseInt(s(0)); } - catch { case _ => 1 } - if (i>0) i; else 1; - } - -} diff --git a/test/pending/shootout/heapsort.scala.runner b/test/pending/shootout/heapsort.scala.runner deleted file mode 100644 index 07e4ec7fbd..0000000000 --- a/test/pending/shootout/heapsort.scala.runner +++ /dev/null @@ -1,3 +0,0 @@ -object Test extends Application { - for(n <- List(20000,40000,60000,80000,100000)) heapsort.main(Array(n.toString)) -} diff --git a/test/pending/shootout/mandelbrot.scala-2.check b/test/pending/shootout/mandelbrot.scala-2.check Binary files differdeleted file mode 100644 index 2f7bbbc6b0..0000000000 --- a/test/pending/shootout/mandelbrot.scala-2.check +++ /dev/null diff --git a/test/pending/shootout/mandelbrot.scala-2.scala b/test/pending/shootout/mandelbrot.scala-2.scala deleted file mode 100644 index dffdc354a0..0000000000 --- a/test/pending/shootout/mandelbrot.scala-2.scala +++ /dev/null @@ -1,79 +0,0 @@ -/* The Computer Language Shootout - http://shootout.alioth.debian.org/ - contributed by Isaac Gouy -*/ - -// This test is in pending because it fails on windows only, -// but partest's output and the fact that this test outputs in -// binary makes it a challenge to debug remotely. However, -// it's easy to guess that it has to do with the BufferedOutputStream -// and some kind of windows-specific damage that requires an extra -// flush, or different line-ending characters, or any of the various -// write-once-know-quirks-everywhere aspects of java i/o. -// -// [partest] testing: [...]\files\shootout\mandelbrot.scala-2.scala [FAILED] -// [partest] P4 -// [partest] 200 200 -// [partest] -// ^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^B^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@ -// ^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@ -// [etc] - -import java.io.BufferedOutputStream - -object mandelbrot { - def main(args: Array[String]) = { - val side = Integer.parseInt(args(0)) - val limitSquared = 4.0 - val max = 50 - var bits = 0 - var bitnum = 0 - val w = new BufferedOutputStream(System.out) - - Console.println("P4\n" + side + " " + side) - - var y = 0 - while (y < side){ - - var x = 0 - while (x < side){ - - val cr = 2.0 * x / side - 1.5 - val ci = 2.0 * y / side - 1.0 - - var zr = 0.0; var zi = 0.0 - var tr = 0.0; var ti = 0.0 - - var j = max - do { - zi = 2.0 * zr * zi + ci - zr = tr - ti + cr - ti = zi*zi - tr = zr*zr - - j = j - 1 - } while (!(tr + ti > limitSquared) && j > 0) - - - bits = bits << 1 - if (!(tr + ti > limitSquared)) bits = bits + 1 - bitnum = bitnum + 1 - - if (x == side - 1){ - bits = bits << (8 - bitnum) - bitnum = 8 - } - - if (bitnum == 8){ - w.write(bits.toByte) - bits = 0 - bitnum = 0 - } - - x = x + 1 - } - y = y + 1 - } - w.close - } -} diff --git a/test/pending/shootout/mandelbrot.scala-2.scala.runner b/test/pending/shootout/mandelbrot.scala-2.scala.runner deleted file mode 100644 index 27f69f6aec..0000000000 --- a/test/pending/shootout/mandelbrot.scala-2.scala.runner +++ /dev/null @@ -1,3 +0,0 @@ -object Test extends Application { - for(n <- List(200,400,600)) mandelbrot.main(Array(n.toString)) -} diff --git a/test/pending/shootout/message.check b/test/pending/shootout/message.check deleted file mode 100644 index 354b2529b2..0000000000 --- a/test/pending/shootout/message.check +++ /dev/null @@ -1 +0,0 @@ -500000 diff --git a/test/pending/shootout/message.javaopts b/test/pending/shootout/message.javaopts deleted file mode 100644 index 1879c77427..0000000000 --- a/test/pending/shootout/message.javaopts +++ /dev/null @@ -1 +0,0 @@ --Xss128k diff --git a/test/pending/shootout/message.scala b/test/pending/shootout/message.scala deleted file mode 100644 index a7a1dacc9d..0000000000 --- a/test/pending/shootout/message.scala +++ /dev/null @@ -1,47 +0,0 @@ -/* The Computer Language Shootout - http://shootout.alioth.debian.org/ - contributed by Isaac Gouy -*/ - - -import scala.concurrent._ - -object message { - def main(args: Array[String]) = { - val n = Integer.parseInt(args(0)) - val nActors = 500 - val finalSum = n * nActors - - case class Message(value: Int) - - class Incrementor(next: Pid) extends Actor { - var sum = 0 - - override def run() = { - while (true) { - receive { - case Message(value) => - val j = value + 1 - if (null != next){ - next ! Message(j) - } else { - sum = sum + j - if (sum >= finalSum){ - Console.println(sum); - System.exit(0) // exit without cleaning up - } - } - } - } - } - - def pid() = { this.start; this.self } - } - - def actorChain(i: Int, a: Pid): Pid = - if (i > 0) actorChain(i-1, new Incrementor(a).pid ) else a - - val firstActor = actorChain(nActors, null) - var i = n; while (i > 0){ firstActor ! Message(0); i = i-1 } - } -} diff --git a/test/pending/shootout/message.scala.runner b/test/pending/shootout/message.scala.runner deleted file mode 100644 index ffbee1640b..0000000000 --- a/test/pending/shootout/message.scala.runner +++ /dev/null @@ -1,3 +0,0 @@ -object Test extends Application { - for(n <- List(1000,2000,3000)) message.main(Array(n.toString)) -} diff --git a/test/pending/shootout/meteor.scala b/test/pending/shootout/meteor.scala deleted file mode 100644 index 6dbd3cf459..0000000000 --- a/test/pending/shootout/meteor.scala +++ /dev/null @@ -1,497 +0,0 @@ -import scala.reflect.{ClassTag, classTag} - -/* The Computer Language Shootout - http://shootout.alioth.debian.org/ - contributed by Isaac Gouy -*/ - -// This is an un-optimised example implementation - - -import scala.collection.mutable._ - -object meteor { - def main(args: Array[String]) = { - val solver = new Solver( Integer.parseInt(args(0)) ) - solver.findSolutions - solver.printSolutions - } -} - - - - -// Solver.scala -// import scala.collection.mutable._ - -final class Solver (n: Int) { - private var countdown = n - private var first: String = _ - private var last: String = _ - - private val board = new Board() - - val pieces = Array( - new Piece(0), new Piece(1), new Piece(2), new Piece(3), new Piece(4), - new Piece(5), new Piece(6), new Piece(7), new Piece(8), new Piece(9) ) - - val unplaced = new BitSet(pieces.length) - - { unplaced ++= (0 until pieces.length) } - - - def findSolutions(): Unit = { - if (countdown == 0) return - - if (unplaced.size > 0){ - val emptyCellIndex = board.firstEmptyCellIndex - - for (k <- Iterator.range(0,pieces.length)){ - if (unplaced.contains(k)){ - unplaced -= k - - for (i <- Iterator.range(0,Piece.orientations)){ - val piece = pieces(k).nextOrientation - - for (j <- Iterator.range(0,Piece.size)){ - if (board.add(j,emptyCellIndex,piece)) { - - if (!shouldPrune) findSolutions - - board.remove(piece) - } - } - } - unplaced += k - } - } - } - else { - puzzleSolved - } - } - - private def puzzleSolved() = { - val b = board.asString - if (first == null){ - first = b; last = b - } else { - if (b < first){ first = b } else { if (b > last){ last = b } } - } - countdown = countdown - 1 - } - - private def shouldPrune() = { - board.unmark - !board.cells.forall(c => c.contiguousEmptyCells % Piece.size == 0) - } - - - def printSolutions() = { - - def printBoard(s: String) = { - var indent = false - var i = 0 - while (i < s.length){ - if (indent) Console.print(' ') - for (j <- Iterator.range(0,Board.cols)){ - Console.print(s.charAt(i)); Console.print(' ') - i = i + 1 - } - Console.print('\n') - indent = !indent - } - Console.print('\n') - } - - Console.print(n + " solutions found\n\n") - printBoard(first) - printBoard(last) - } - -/* - def printPieces() = - for (i <- Iterator.range(0,Board.pieces)) pieces(i).print -*/ - -} - - - - -// Board.scala -// import scala.collection.mutable._ - -object Board { - val cols = 5 - val rows = 10 - val size = rows * cols -} - -final class Board { - val cells = boardCells() - - val cellsPieceWillFill = new Array[BoardCell](Piece.size) - var cellCount = 0 - - def unmark() = for (c <- cells) c.unmark - - def asString() = - new String( cells map( - c => if (c.piece == null) '-'.toByte - else (c.piece.number + 48).toByte )) - - def firstEmptyCellIndex() = cells.findIndexOf(c => c.isEmpty) - - def add(pieceIndex: Int, boardIndex: Int, p: Piece) = { - cellCount = 0 - p.unmark - - find( p.cells(pieceIndex), cells(boardIndex)) - - val boardHasSpace = cellCount == Piece.size && - cellsPieceWillFill.forall(c => c.isEmpty) - - if (boardHasSpace) cellsPieceWillFill.foreach(c => c.piece = p) - - boardHasSpace - } - - def remove(piece: Piece) = for (c <- cells; if c.piece == piece) c.empty - - - private def find(p: PieceCell, b: BoardCell): Unit = { - if (p != null && !p.marked && b != null){ - cellsPieceWillFill(cellCount) = b - cellCount = cellCount + 1 - p.mark - for (i <- Iterator.range(0,Cell.sides)) find(p.next(i), b.next(i)) - } - } - - - private def boardCells() = { - val a = for (i <- Array.range(0,Board.size)) yield new BoardCell(i) - val m = (Board.size / Board.cols) - 1 - - for (i <- Iterator.range(0,a.length)){ - val row = i / Board.cols - val isFirst = i % Board.cols == 0 - val isLast = (i+1) % Board.cols == 0 - val c = a(i) - - if (row % 2 == 1) { - if (!isLast) c.next(Cell.NE) = a(i-(Board.cols-1)) - c.next(Cell.NW) = a(i-Board.cols) - if (row != m) { - if (!isLast) c.next(Cell.SE) = a(i+(Board.cols+1)) - c.next(Cell.SW) = a(i+Board.cols) - } - } else { - if (row != 0) { - if (!isFirst) c.next(Cell.NW) = a(i-(Board.cols+1)) - c.next(Cell.NE) = a(i-Board.cols) - } - if (row != m) { - if (!isFirst) c.next(Cell.SW) = a(i+(Board.cols-1)) - c.next(Cell.SE) = a(i+Board.cols) - } - } - if (!isFirst) c.next(Cell.W) = a(i-1) - if (!isLast) c.next(Cell.E) = a(i+1) - } - a - } - - -/* -// Printing all the board cells and their neighbours -// helps check that they are connected properly - - def printBoardCellsAndNeighbours() = { - Console.println("cell\tNW NE W E SW SE") - for (i <- Iterator.range(0,Board.size)){ - Console.print(i + "\t") - for (j <- Iterator.range(0,Cell.sides)){ - val c = cells(i).next(j) - if (c == null) - Console.print("-- ") - else - Console.printf("{0,number,00} ")(c.number) - } - Console.println("") - } - Console.println("") - } -*/ - -} - - - - -// Piece.scala - -object Piece { - val size = 5 - val rotations = Cell.sides - val flips = 2 - val orientations = rotations * flips -} - -final class Piece(_number: Int) { - val number = _number - val cells = for (i <- Array.range(0,Piece.size)) yield new PieceCell() - - { - number match { - case 0 => make0 - case 1 => make1 - case 2 => make2 - case 3 => make3 - case 4 => make4 - case 5 => make5 - case 6 => make6 - case 7 => make7 - case 8 => make8 - case 9 => make9 - } - } - - def flip() = for (c <- cells) c.flip - def rotate() = for (c <- cells) c.rotate - def unmark() = for (c <- cells) c.unmark - - - private var orientation = 0 - - def nextOrientation() = { - if (orientation == Piece.orientations) orientation = 0 - if (orientation % Piece.rotations == 0) flip else rotate - orientation = orientation + 1 - this - } - - - private def make0() = { - cells(0).next(Cell.E) = cells(1) - cells(1).next(Cell.W) = cells(0) - cells(1).next(Cell.E) = cells(2) - cells(2).next(Cell.W) = cells(1) - cells(2).next(Cell.E) = cells(3) - cells(3).next(Cell.W) = cells(2) - cells(3).next(Cell.SE) = cells(4) - cells(4).next(Cell.NW) = cells(3) - } - - private def make1() = { - cells(0).next(Cell.SE) = cells(1) - cells(1).next(Cell.NW) = cells(0) - cells(1).next(Cell.SW) = cells(2) - cells(2).next(Cell.NE) = cells(1) - cells(2).next(Cell.W) = cells(3) - cells(3).next(Cell.E) = cells(2) - cells(3).next(Cell.SW) = cells(4) - cells(4).next(Cell.NE) = cells(3) - } - - private def make2() = { - cells(0).next(Cell.W) = cells(1) - cells(1).next(Cell.E) = cells(0) - cells(1).next(Cell.SW) = cells(2) - cells(2).next(Cell.NE) = cells(1) - cells(2).next(Cell.SE) = cells(3) - cells(3).next(Cell.NW) = cells(2) - cells(3).next(Cell.SE) = cells(4) - cells(4).next(Cell.NW) = cells(3) - } - - private def make3() = { - cells(0).next(Cell.SW) = cells(1) - cells(1).next(Cell.NE) = cells(0) - cells(1).next(Cell.W) = cells(2) - cells(2).next(Cell.E) = cells(1) - cells(1).next(Cell.SW) = cells(3) - cells(3).next(Cell.NE) = cells(1) - cells(2).next(Cell.SE) = cells(3) - cells(3).next(Cell.NW) = cells(2) - cells(3).next(Cell.SE) = cells(4) - cells(4).next(Cell.NW) = cells(3) - } - - private def make4() = { - cells(0).next(Cell.SE) = cells(1) - cells(1).next(Cell.NW) = cells(0) - cells(1).next(Cell.SW) = cells(2) - cells(2).next(Cell.NE) = cells(1) - cells(1).next(Cell.E) = cells(3) - cells(3).next(Cell.W) = cells(1) - cells(3).next(Cell.SE) = cells(4) - cells(4).next(Cell.NW) = cells(3) - } - - private def make5() = { - cells(0).next(Cell.SW) = cells(1) - cells(1).next(Cell.NE) = cells(0) - cells(0).next(Cell.SE) = cells(2) - cells(2).next(Cell.NW) = cells(0) - cells(1).next(Cell.SE) = cells(3) - cells(3).next(Cell.NW) = cells(1) - cells(2).next(Cell.SW) = cells(3) - cells(3).next(Cell.NE) = cells(2) - cells(3).next(Cell.SW) = cells(4) - cells(4).next(Cell.NE) = cells(3) - } - - private def make6() = { - cells(0).next(Cell.SW) = cells(1) - cells(1).next(Cell.NE) = cells(0) - cells(2).next(Cell.SE) = cells(1) - cells(1).next(Cell.NW) = cells(2) - cells(1).next(Cell.SE) = cells(3) - cells(3).next(Cell.NW) = cells(1) - cells(3).next(Cell.SW) = cells(4) - cells(4).next(Cell.NE) = cells(3) - } - - private def make7() = { - cells(0).next(Cell.SE) = cells(1) - cells(1).next(Cell.NW) = cells(0) - cells(0).next(Cell.SW) = cells(2) - cells(2).next(Cell.NE) = cells(0) - cells(2).next(Cell.SW) = cells(3) - cells(3).next(Cell.NE) = cells(2) - cells(3).next(Cell.SE) = cells(4) - cells(4).next(Cell.NW) = cells(3) - } - - private def make8() = { - cells(0).next(Cell.E) = cells(1) - cells(1).next(Cell.W) = cells(0) - cells(1).next(Cell.E) = cells(2) - cells(2).next(Cell.W) = cells(1) - cells(2).next(Cell.NE) = cells(3) - cells(3).next(Cell.SW) = cells(2) - cells(3).next(Cell.E) = cells(4) - cells(4).next(Cell.W) = cells(3) - } - - private def make9() = { - cells(0).next(Cell.E) = cells(1) - cells(1).next(Cell.W) = cells(0) - cells(1).next(Cell.E) = cells(2) - cells(2).next(Cell.W) = cells(1) - cells(2).next(Cell.NE) = cells(3) - cells(3).next(Cell.SW) = cells(2) - cells(2).next(Cell.E) = cells(4) - cells(4).next(Cell.W) = cells(2) - cells(4).next(Cell.NW) = cells(3) - cells(3).next(Cell.SE) = cells(4) - } - -/* - def print() = { - Console.println("Piece # " + number) - Console.println("cell\tNW NE W E SW SE") - for (i <- Iterator.range(0,Piece.size)){ - Console.print(i + "\t") - for (j <- Iterator.range(0,Cell.sides)){ - val c = cells(i).next(j) - if (c == null) - Console.print("-- ") - else - for (k <- Iterator.range(0,Piece.size)){ - if (cells(k) == c) Console.printf(" {0,number,0} ")(k) - } - } - Console.println("") - } - Console.println("") - } -*/ - -} - - - - -// Cell.scala - -object Cell { - val NW = 0; val NE = 1 - val W = 2; val E = 3 - val SW = 4; val SE = 5 - - val sides = 6 -} - -abstract class Cell { - implicit def t: ClassTag[T] - type T - val next = new Array[T](Cell.sides) - var marked = false - - def mark() = marked = true - def unmark() = marked = false -} - -// BoardCell.scala - -final class BoardCell(_number: Int) extends { - type T = BoardCell - implicit val t = classTag[BoardCell] -} with Cell { - val number = _number - var piece: Piece = _ - - def isEmpty() = piece == null - def empty() = piece = null - - def contiguousEmptyCells(): Int = { - if (!marked && isEmpty){ - mark - var count = 1 - - for (neighbour <- next) - if (neighbour != null && neighbour.isEmpty) - count = count + neighbour.contiguousEmptyCells - - count } else { 0 } - } -} - - - - -// PieceCell.scala - -final class PieceCell extends Cell { - type T = PieceCell - - def flip = { - var swap = next(Cell.NE) - next(Cell.NE) = next(Cell.NW) - next(Cell.NW) = swap - - swap = next(Cell.E) - next(Cell.E) = next(Cell.W) - next(Cell.W) = swap - - swap = next(Cell.SE) - next(Cell.SE) = next(Cell.SW) - next(Cell.SW) = swap - } - - def rotate = { - var swap = next(Cell.E) - next(Cell.E) = next(Cell.NE) - next(Cell.NE) = next(Cell.NW) - next(Cell.NW) = next(Cell.W) - next(Cell.W) = next(Cell.SW) - next(Cell.SW) = next(Cell.SE) - next(Cell.SE) = swap - } -} - - - diff --git a/test/pending/shootout/meteor.scala-2.scala b/test/pending/shootout/meteor.scala-2.scala deleted file mode 100644 index 2b42c19260..0000000000 --- a/test/pending/shootout/meteor.scala-2.scala +++ /dev/null @@ -1,496 +0,0 @@ -/* The Computer Language Shootout - http://shootout.alioth.debian.org/ - contributed by Isaac Gouy -*/ - -// This is an un-optimised example implementation -// classes BoardCell and PieceCell have Array - - -import scala.collection.mutable._ - -object meteor { - def main(args: Array[String]) = { - val solver = new Solver( Integer.parseInt(args(0)) ) - solver.findSolutions - solver.printSolutions - } -} - - - - -// Solver.scala -// import scala.collection.mutable._ - -final class Solver (n: Int) { - private var countdown = n - private var first: String = _ - private var last: String = _ - - private val board = new Board() - - val pieces = Array( - new Piece(0), new Piece(1), new Piece(2), new Piece(3), new Piece(4), - new Piece(5), new Piece(6), new Piece(7), new Piece(8), new Piece(9) ) - - val unplaced = new BitSet(pieces.length) - - { unplaced ++= (0 until pieces.length) } - - - def findSolutions(): Unit = { - if (countdown == 0) return - - if (unplaced.size > 0){ - val emptyCellIndex = board.firstEmptyCellIndex - - for (k <- Iterator.range(0,pieces.length)){ - if (unplaced.contains(k)){ - unplaced -= k - - for (i <- Iterator.range(0,Piece.orientations)){ - val piece = pieces(k).nextOrientation - - for (j <- Iterator.range(0,Piece.size)){ - if (board.add(j,emptyCellIndex,piece)) { - - if (!shouldPrune) findSolutions - - board.remove(piece) - } - } - } - unplaced += k - } - } - } - else { - puzzleSolved - } - } - - private def puzzleSolved() = { - val b = board.asString - if (first == null){ - first = b; last = b - } else { - if (b < first){ first = b } else { if (b > last){ last = b } } - } - countdown = countdown - 1 - } - - private def shouldPrune() = { - board.unmark - !board.cells.forall(c => c.contiguousEmptyCells % Piece.size == 0) - } - - - def printSolutions() = { - - def printBoard(s: String) = { - var indent = false - var i = 0 - while (i < s.length){ - if (indent) Console.print(' ') - for (j <- Iterator.range(0,Board.cols)){ - Console.print(s.charAt(i)); Console.print(' ') - i = i + 1 - } - Console.print('\n') - indent = !indent - } - Console.print('\n') - } - - Console.print(n + " solutions found\n\n") - printBoard(first) - printBoard(last) - } - -/* - def printPieces() = - for (i <- Iterator.range(0,Board.pieces)) pieces(i).print -*/ - -} - - - - -// Board.scala -// import scala.collection.mutable._ - -object Board { - val cols = 5 - val rows = 10 - val size = rows * cols -} - -final class Board { - val cells = boardCells() - - val cellsPieceWillFill = new Array[BoardCell](Piece.size) - var cellCount = 0 - - def unmark() = for (c <- cells) c.unmark - - def asString() = - new String( cells map( - c => if (c.piece == null) '-'.toByte - else (c.piece.number + 48).toByte )) - - def firstEmptyCellIndex() = cells.findIndexOf(c => c.isEmpty) - - - def add(pieceIndex: Int, boardIndex: Int, p: Piece) = { - cellCount = 0 - p.unmark - - find( p.cells(pieceIndex), cells(boardIndex)) - - val boardHasSpace = cellCount == Piece.size && - cellsPieceWillFill.forall(c => c.isEmpty) - - if (boardHasSpace) cellsPieceWillFill.foreach(c => c.piece = p) - - boardHasSpace - } - - def remove(piece: Piece) = for (c <- cells; if c.piece == piece) c.empty - - - private def find(p: PieceCell, b: BoardCell): Unit = { - if (p != null && !p.marked && b != null){ - cellsPieceWillFill(cellCount) = b - cellCount = cellCount + 1 - p.mark - for (i <- Iterator.range(0,Cell.sides)) find(p.next(i), b.next(i)) - } - } - - - private def boardCells() = { - val a = for (i <- Array.range(0,Board.size)) yield new BoardCell(i) - val m = (Board.size / Board.cols) - 1 - - for (i <- Iterator.range(0,a.length)){ - val row = i / Board.cols - val isFirst = i % Board.cols == 0 - val isLast = (i+1) % Board.cols == 0 - val c = a(i) - - if (row % 2 == 1) { - if (!isLast) c.next(Cell.NE) = a(i-(Board.cols-1)) - c.next(Cell.NW) = a(i-Board.cols) - if (row != m) { - if (!isLast) c.next(Cell.SE) = a(i+(Board.cols+1)) - c.next(Cell.SW) = a(i+Board.cols) - } - } else { - if (row != 0) { - if (!isFirst) c.next(Cell.NW) = a(i-(Board.cols+1)) - c.next(Cell.NE) = a(i-Board.cols) - } - if (row != m) { - if (!isFirst) c.next(Cell.SW) = a(i+(Board.cols-1)) - c.next(Cell.SE) = a(i+Board.cols) - } - } - if (!isFirst) c.next(Cell.W) = a(i-1) - if (!isLast) c.next(Cell.E) = a(i+1) - } - a - } - - -/* -// Printing all the board cells and their neighbours -// helps check that they are connected properly - - def printBoardCellsAndNeighbours() = { - Console.println("cell\tNW NE W E SW SE") - for (i <- Iterator.range(0,Board.size)){ - Console.print(i + "\t") - for (j <- Iterator.range(0,Cell.sides)){ - val c = cells(i).next(j) - if (c == null) - Console.print("-- ") - else - Console.printf("{0,number,00} ")(c.number) - } - Console.println("") - } - Console.println("") - } -*/ - -} - - - - -// Piece.scala - -object Piece { - val size = 5 - val rotations = Cell.sides - val flips = 2 - val orientations = rotations * flips -} - -final class Piece(_number: Int) { - val number = _number - val cells = for (i <- Array.range(0,Piece.size)) yield new PieceCell() - - { - number match { - case 0 => make0 - case 1 => make1 - case 2 => make2 - case 3 => make3 - case 4 => make4 - case 5 => make5 - case 6 => make6 - case 7 => make7 - case 8 => make8 - case 9 => make9 - } - } - - def flip() = for (c <- cells) c.flip - def rotate() = for (c <- cells) c.rotate - def unmark() = for (c <- cells) c.unmark - - - private var orientation = 0 - - def nextOrientation() = { - if (orientation == Piece.orientations) orientation = 0 - if (orientation % Piece.rotations == 0) flip else rotate - orientation = orientation + 1 - this - } - - - private def make0() = { - cells(0).next(Cell.E) = cells(1) - cells(1).next(Cell.W) = cells(0) - cells(1).next(Cell.E) = cells(2) - cells(2).next(Cell.W) = cells(1) - cells(2).next(Cell.E) = cells(3) - cells(3).next(Cell.W) = cells(2) - cells(3).next(Cell.SE) = cells(4) - cells(4).next(Cell.NW) = cells(3) - } - - private def make1() = { - cells(0).next(Cell.SE) = cells(1) - cells(1).next(Cell.NW) = cells(0) - cells(1).next(Cell.SW) = cells(2) - cells(2).next(Cell.NE) = cells(1) - cells(2).next(Cell.W) = cells(3) - cells(3).next(Cell.E) = cells(2) - cells(3).next(Cell.SW) = cells(4) - cells(4).next(Cell.NE) = cells(3) - } - - private def make2() = { - cells(0).next(Cell.W) = cells(1) - cells(1).next(Cell.E) = cells(0) - cells(1).next(Cell.SW) = cells(2) - cells(2).next(Cell.NE) = cells(1) - cells(2).next(Cell.SE) = cells(3) - cells(3).next(Cell.NW) = cells(2) - cells(3).next(Cell.SE) = cells(4) - cells(4).next(Cell.NW) = cells(3) - } - - private def make3() = { - cells(0).next(Cell.SW) = cells(1) - cells(1).next(Cell.NE) = cells(0) - cells(1).next(Cell.W) = cells(2) - cells(2).next(Cell.E) = cells(1) - cells(1).next(Cell.SW) = cells(3) - cells(3).next(Cell.NE) = cells(1) - cells(2).next(Cell.SE) = cells(3) - cells(3).next(Cell.NW) = cells(2) - cells(3).next(Cell.SE) = cells(4) - cells(4).next(Cell.NW) = cells(3) - } - - private def make4() = { - cells(0).next(Cell.SE) = cells(1) - cells(1).next(Cell.NW) = cells(0) - cells(1).next(Cell.SW) = cells(2) - cells(2).next(Cell.NE) = cells(1) - cells(1).next(Cell.E) = cells(3) - cells(3).next(Cell.W) = cells(1) - cells(3).next(Cell.SE) = cells(4) - cells(4).next(Cell.NW) = cells(3) - } - - private def make5() = { - cells(0).next(Cell.SW) = cells(1) - cells(1).next(Cell.NE) = cells(0) - cells(0).next(Cell.SE) = cells(2) - cells(2).next(Cell.NW) = cells(0) - cells(1).next(Cell.SE) = cells(3) - cells(3).next(Cell.NW) = cells(1) - cells(2).next(Cell.SW) = cells(3) - cells(3).next(Cell.NE) = cells(2) - cells(3).next(Cell.SW) = cells(4) - cells(4).next(Cell.NE) = cells(3) - } - - private def make6() = { - cells(0).next(Cell.SW) = cells(1) - cells(1).next(Cell.NE) = cells(0) - cells(2).next(Cell.SE) = cells(1) - cells(1).next(Cell.NW) = cells(2) - cells(1).next(Cell.SE) = cells(3) - cells(3).next(Cell.NW) = cells(1) - cells(3).next(Cell.SW) = cells(4) - cells(4).next(Cell.NE) = cells(3) - } - - private def make7() = { - cells(0).next(Cell.SE) = cells(1) - cells(1).next(Cell.NW) = cells(0) - cells(0).next(Cell.SW) = cells(2) - cells(2).next(Cell.NE) = cells(0) - cells(2).next(Cell.SW) = cells(3) - cells(3).next(Cell.NE) = cells(2) - cells(3).next(Cell.SE) = cells(4) - cells(4).next(Cell.NW) = cells(3) - } - - private def make8() = { - cells(0).next(Cell.E) = cells(1) - cells(1).next(Cell.W) = cells(0) - cells(1).next(Cell.E) = cells(2) - cells(2).next(Cell.W) = cells(1) - cells(2).next(Cell.NE) = cells(3) - cells(3).next(Cell.SW) = cells(2) - cells(3).next(Cell.E) = cells(4) - cells(4).next(Cell.W) = cells(3) - } - - private def make9() = { - cells(0).next(Cell.E) = cells(1) - cells(1).next(Cell.W) = cells(0) - cells(1).next(Cell.E) = cells(2) - cells(2).next(Cell.W) = cells(1) - cells(2).next(Cell.NE) = cells(3) - cells(3).next(Cell.SW) = cells(2) - cells(2).next(Cell.E) = cells(4) - cells(4).next(Cell.W) = cells(2) - cells(4).next(Cell.NW) = cells(3) - cells(3).next(Cell.SE) = cells(4) - } - -/* - def print() = { - Console.println("Piece # " + number) - Console.println("cell\tNW NE W E SW SE") - for (i <- Iterator.range(0,Piece.size)){ - Console.print(i + "\t") - for (j <- Iterator.range(0,Cell.sides)){ - val c = cells(i).next(j) - if (c == null) - Console.print("-- ") - else - for (k <- Iterator.range(0,Piece.size)){ - if (cells(k) == c) Console.printf(" {0,number,0} ")(k) - } - } - Console.println("") - } - Console.println("") - } -*/ - -} - - - - -// Cell.scala - -object Cell { - val NW = 0; val NE = 1 - val W = 2; val E = 3 - val SW = 4; val SE = 5 - - val sides = 6 -} - -abstract class Cell { - var marked = false - - def mark() = marked = true - def unmark() = marked = false -} - - - - -// BoardCell.scala - -final class BoardCell(_number: Int) extends Cell { - val next = new Array[BoardCell](Cell.sides) - val number = _number - var piece: Piece = _ - - def isEmpty() = piece == null - def empty() = piece = null - - def contiguousEmptyCells(): Int = { - if (!marked && isEmpty){ - mark - var count = 1 - - for (neighbour <- next) - if (neighbour != null && neighbour.isEmpty) - count = count + neighbour.contiguousEmptyCells - - count } else { 0 } - } -} - - - - -// PieceCell.scala - -final class PieceCell extends Cell { - val next = new Array[PieceCell](Cell.sides) - - def flip = { - var swap = next(Cell.NE) - next(Cell.NE) = next(Cell.NW) - next(Cell.NW) = swap - - swap = next(Cell.E) - next(Cell.E) = next(Cell.W) - next(Cell.W) = swap - - swap = next(Cell.SE) - next(Cell.SE) = next(Cell.SW) - next(Cell.SW) = swap - } - - def rotate = { - var swap = next(Cell.E) - next(Cell.E) = next(Cell.NE) - next(Cell.NE) = next(Cell.NW) - next(Cell.NW) = next(Cell.W) - next(Cell.W) = next(Cell.SW) - next(Cell.SW) = next(Cell.SE) - next(Cell.SE) = swap - } -} - - - - diff --git a/test/pending/shootout/meteor.scala-2.scala.runner b/test/pending/shootout/meteor.scala-2.scala.runner deleted file mode 100644 index dae384311f..0000000000 --- a/test/pending/shootout/meteor.scala-2.scala.runner +++ /dev/null @@ -1,3 +0,0 @@ -object Test extends Application { - for(n <- List(0)) meteor.main(Array(n.toString)) -} diff --git a/test/pending/shootout/meteor.scala-3.scala b/test/pending/shootout/meteor.scala-3.scala deleted file mode 100644 index 01dacf90c6..0000000000 --- a/test/pending/shootout/meteor.scala-3.scala +++ /dev/null @@ -1,557 +0,0 @@ -/* The Computer Language Shootout - http://shootout.alioth.debian.org/ - contributed by Isaac Gouy -*/ - -// Most for-comprehension replaced by while loops - - - -import scala.collection.mutable._ - -object meteor { - def main(args: Array[String]) = { - val solver = new Solver( Integer.parseInt(args(0)) ) - solver.findSolutions - solver.printSolutions - } -} - - - - -// Solver.scala -// import scala.collection.mutable._ - -final class Solver (n: Int) { - private var countdown = n - private var first: String = _ - private var last: String = _ - - private val board = new Board() - - val pieces = Array( - new Piece(0), new Piece(1), new Piece(2), new Piece(3), new Piece(4), - new Piece(5), new Piece(6), new Piece(7), new Piece(8), new Piece(9) ) - - val unplaced = new BitSet(pieces.length) - - { unplaced ++= (0 until pieces.length) } - - - def findSolutions(): Unit = { - if (countdown == 0) return - - if (unplaced.size > 0){ - val emptyCellIndex = board.firstEmptyCellIndex - - var k = 0 - while (k < pieces.length){ - if (unplaced.contains(k)){ - unplaced -= k - - var i = 0 - while (i < Piece.orientations){ - val piece = pieces(k).nextOrientation - - var j = 0 - while (j < Piece.size){ - if (board.add(j,emptyCellIndex,piece)) { - - if (!shouldPrune) findSolutions - - board.remove(piece) - } - j = j + 1 - } - i = i + 1 - } - unplaced += k - } - k = k + 1 - } - } - else { - puzzleSolved - } - } - - private def puzzleSolved() = { - val b = board.asString - if (first == null){ - first = b; last = b - } else { - if (b < first){ first = b } else { if (b > last){ last = b } } - } - countdown = countdown - 1 - } - - private def shouldPrune(): Boolean = { - board.unmark - var i = 0 - while (i < board.cells.length){ - if (board.cells(i).contiguousEmptyCells % Piece.size != 0) return true - i = i + 1 - } - false - } - - - def printSolutions() = { - - def printBoard(s: String) = { - var indent = false - var i = 0 - while (i < s.length){ - if (indent) Console.print(' ') - var j = 0 - while (j < Board.cols){ - Console.print(s.charAt(i)); Console.print(' ') - j = j + 1 - i = i + 1 - } - Console.print('\n') - indent = !indent - } - Console.print('\n') - } - - Console.print(n + " solutions found\n\n") - printBoard(first) - printBoard(last) - } - -/* - def printPieces() = - for (i <- Iterator.range(0,Board.pieces)) pieces(i).print -*/ - -} - - - - - -// Board.scala -// import scala.collection.mutable._ - -object Board { - val cols = 5 - val rows = 10 - val size = rows * cols -} - -final class Board { - val cells = boardCells() - - val cellsPieceWillFill = new Array[BoardCell](Piece.size) - var cellCount = 0 - - def unmark() = { - var i = 0 - while (i < cells.length){ - cells(i).unmark - i = i + 1 - } - } - - def asString() = - new String( cells map( - c => if (c.piece == null) '-'.toByte - else (c.piece.number + 48).toByte )) - - def firstEmptyCellIndex() = cells.findIndexOf(c => c.isEmpty) - - - def add(pieceIndex: Int, boardIndex: Int, p: Piece): Boolean = { - cellCount = 0 - p.unmark - - find(p.cells(pieceIndex), cells(boardIndex)) - - if (cellCount != Piece.size) return false - - var i = 0 - while (i < cellCount){ - if (!cellsPieceWillFill(i).isEmpty) return false - i = i + 1 - } - - i = 0 - while (i < cellCount){ - cellsPieceWillFill(i).piece = p - i = i + 1 - } - - true - } - - def remove(piece: Piece) = { - var i = 0 - while (i < cells.length){ - if (cells(i).piece == piece) cells(i).empty - i = i + 1 - } - } - - private def find(p: PieceCell, b: BoardCell): Unit = { - if (p != null && !p.marked && b != null){ - cellsPieceWillFill(cellCount) = b - cellCount = cellCount + 1 - p.mark - - var i = 0 - while (i < Cell.sides){ - find(p.next(i), b.next(i)) - i = i + 1 - } - } - } - - - private def boardCells() = { - val a = for (i <- Array.range(0,Board.size)) yield new BoardCell(i) - val m = (Board.size / Board.cols) - 1 - - for (i <- Iterator.range(0,a.length)){ - val row = i / Board.cols - val isFirst = i % Board.cols == 0 - val isLast = (i+1) % Board.cols == 0 - val c = a(i) - - if (row % 2 == 1) { - if (!isLast) c.next(Cell.NE) = a(i-(Board.cols-1)) - c.next(Cell.NW) = a(i-Board.cols) - if (row != m) { - if (!isLast) c.next(Cell.SE) = a(i+(Board.cols+1)) - c.next(Cell.SW) = a(i+Board.cols) - } - } else { - if (row != 0) { - if (!isFirst) c.next(Cell.NW) = a(i-(Board.cols+1)) - c.next(Cell.NE) = a(i-Board.cols) - } - if (row != m) { - if (!isFirst) c.next(Cell.SW) = a(i+(Board.cols-1)) - c.next(Cell.SE) = a(i+Board.cols) - } - } - if (!isFirst) c.next(Cell.W) = a(i-1) - if (!isLast) c.next(Cell.E) = a(i+1) - } - a - } - -/* -// Printing all the board cells and their neighbours -// helps check that they are connected properly - - def printBoardCellsAndNeighbours() = { - Console.println("cell\tNW NE W E SW SE") - for (i <- Iterator.range(0,Board.size)){ - Console.print(i + "\t") - for (j <- Iterator.range(0,Cell.sides)){ - val c = cells(i).next(j) - if (c == null) - Console.print("-- ") - else - Console.printf("{0,number,00} ")(c.number) - } - Console.println("") - } - Console.println("") - } -*/ - -} - - - - -// Piece.scala - -object Piece { - val size = 5 - val rotations = Cell.sides - val flips = 2 - val orientations = rotations * flips -} - -final class Piece(_number: Int) { - val number = _number - val cells = for (i <- Array.range(0,Piece.size)) yield new PieceCell() - - { - number match { - case 0 => make0 - case 1 => make1 - case 2 => make2 - case 3 => make3 - case 4 => make4 - case 5 => make5 - case 6 => make6 - case 7 => make7 - case 8 => make8 - case 9 => make9 - } - } - - def flip() = { - var i = 0 - while (i < cells.length){ - cells(i).flip - i = i + 1 - } - } - - def rotate() = { - var i = 0 - while (i < cells.length){ - cells(i).rotate - i = i + 1 - } - } - - def unmark() = { - var i = 0 - while (i < cells.length){ - cells(i).unmark - i = i + 1 - } - } - - - private var orientation = 0 - - def nextOrientation() = { - if (orientation == Piece.orientations) orientation = 0 - if (orientation % Piece.rotations == 0) flip else rotate - orientation = orientation + 1 - this - } - - - private def make0() = { - cells(0).next(Cell.E) = cells(1) - cells(1).next(Cell.W) = cells(0) - cells(1).next(Cell.E) = cells(2) - cells(2).next(Cell.W) = cells(1) - cells(2).next(Cell.E) = cells(3) - cells(3).next(Cell.W) = cells(2) - cells(3).next(Cell.SE) = cells(4) - cells(4).next(Cell.NW) = cells(3) - } - - private def make1() = { - cells(0).next(Cell.SE) = cells(1) - cells(1).next(Cell.NW) = cells(0) - cells(1).next(Cell.SW) = cells(2) - cells(2).next(Cell.NE) = cells(1) - cells(2).next(Cell.W) = cells(3) - cells(3).next(Cell.E) = cells(2) - cells(3).next(Cell.SW) = cells(4) - cells(4).next(Cell.NE) = cells(3) - } - - private def make2() = { - cells(0).next(Cell.W) = cells(1) - cells(1).next(Cell.E) = cells(0) - cells(1).next(Cell.SW) = cells(2) - cells(2).next(Cell.NE) = cells(1) - cells(2).next(Cell.SE) = cells(3) - cells(3).next(Cell.NW) = cells(2) - cells(3).next(Cell.SE) = cells(4) - cells(4).next(Cell.NW) = cells(3) - } - - private def make3() = { - cells(0).next(Cell.SW) = cells(1) - cells(1).next(Cell.NE) = cells(0) - cells(1).next(Cell.W) = cells(2) - cells(2).next(Cell.E) = cells(1) - cells(1).next(Cell.SW) = cells(3) - cells(3).next(Cell.NE) = cells(1) - cells(2).next(Cell.SE) = cells(3) - cells(3).next(Cell.NW) = cells(2) - cells(3).next(Cell.SE) = cells(4) - cells(4).next(Cell.NW) = cells(3) - } - - private def make4() = { - cells(0).next(Cell.SE) = cells(1) - cells(1).next(Cell.NW) = cells(0) - cells(1).next(Cell.SW) = cells(2) - cells(2).next(Cell.NE) = cells(1) - cells(1).next(Cell.E) = cells(3) - cells(3).next(Cell.W) = cells(1) - cells(3).next(Cell.SE) = cells(4) - cells(4).next(Cell.NW) = cells(3) - } - - private def make5() = { - cells(0).next(Cell.SW) = cells(1) - cells(1).next(Cell.NE) = cells(0) - cells(0).next(Cell.SE) = cells(2) - cells(2).next(Cell.NW) = cells(0) - cells(1).next(Cell.SE) = cells(3) - cells(3).next(Cell.NW) = cells(1) - cells(2).next(Cell.SW) = cells(3) - cells(3).next(Cell.NE) = cells(2) - cells(3).next(Cell.SW) = cells(4) - cells(4).next(Cell.NE) = cells(3) - } - - private def make6() = { - cells(0).next(Cell.SW) = cells(1) - cells(1).next(Cell.NE) = cells(0) - cells(2).next(Cell.SE) = cells(1) - cells(1).next(Cell.NW) = cells(2) - cells(1).next(Cell.SE) = cells(3) - cells(3).next(Cell.NW) = cells(1) - cells(3).next(Cell.SW) = cells(4) - cells(4).next(Cell.NE) = cells(3) - } - - private def make7() = { - cells(0).next(Cell.SE) = cells(1) - cells(1).next(Cell.NW) = cells(0) - cells(0).next(Cell.SW) = cells(2) - cells(2).next(Cell.NE) = cells(0) - cells(2).next(Cell.SW) = cells(3) - cells(3).next(Cell.NE) = cells(2) - cells(3).next(Cell.SE) = cells(4) - cells(4).next(Cell.NW) = cells(3) - } - - private def make8() = { - cells(0).next(Cell.E) = cells(1) - cells(1).next(Cell.W) = cells(0) - cells(1).next(Cell.E) = cells(2) - cells(2).next(Cell.W) = cells(1) - cells(2).next(Cell.NE) = cells(3) - cells(3).next(Cell.SW) = cells(2) - cells(3).next(Cell.E) = cells(4) - cells(4).next(Cell.W) = cells(3) - } - - private def make9() = { - cells(0).next(Cell.E) = cells(1) - cells(1).next(Cell.W) = cells(0) - cells(1).next(Cell.E) = cells(2) - cells(2).next(Cell.W) = cells(1) - cells(2).next(Cell.NE) = cells(3) - cells(3).next(Cell.SW) = cells(2) - cells(2).next(Cell.E) = cells(4) - cells(4).next(Cell.W) = cells(2) - cells(4).next(Cell.NW) = cells(3) - cells(3).next(Cell.SE) = cells(4) - } - -/* - def print() = { - Console.println("Piece # " + number) - Console.println("cell\tNW NE W E SW SE") - for (i <- Iterator.range(0,Piece.size)){ - Console.print(i + "\t") - for (j <- Iterator.range(0,Cell.sides)){ - val c = cells(i).next(j) - if (c == null) - Console.print("-- ") - else - for (k <- Iterator.range(0,Piece.size)){ - if (cells(k) == c) Console.printf(" {0,number,0} ")(k) - } - } - Console.println("") - } - Console.println("") - } -*/ - -} - - - - -// Cell.scala - -object Cell { - val NW = 0; val NE = 1 - val W = 2; val E = 3 - val SW = 4; val SE = 5 - - val sides = 6 -} - -abstract class Cell { - var marked = false - - def mark() = marked = true - def unmark() = marked = false -} - - - - -// BoardCell.scala - -final class BoardCell(_number: Int) extends Cell { - val next = new Array[BoardCell](Cell.sides) - val number = _number - var piece: Piece = _ - - def isEmpty() = piece == null - def empty() = piece = null - - def contiguousEmptyCells(): Int = { - if (!marked && isEmpty){ - mark - var count = 1 - - var i = 0 - while (i < next.length){ - if (next(i) != null && next(i).isEmpty) - count = count + next(i).contiguousEmptyCells - i = i + 1 - } - - count } else { 0 } - } -} - - - - -// PieceCell.scala - -final class PieceCell extends Cell { - val next = new Array[PieceCell](Cell.sides) - - def flip = { - var swap = next(Cell.NE) - next(Cell.NE) = next(Cell.NW) - next(Cell.NW) = swap - - swap = next(Cell.E) - next(Cell.E) = next(Cell.W) - next(Cell.W) = swap - - swap = next(Cell.SE) - next(Cell.SE) = next(Cell.SW) - next(Cell.SW) = swap - } - - def rotate = { - var swap = next(Cell.E) - next(Cell.E) = next(Cell.NE) - next(Cell.NE) = next(Cell.NW) - next(Cell.NW) = next(Cell.W) - next(Cell.W) = next(Cell.SW) - next(Cell.SW) = next(Cell.SE) - next(Cell.SE) = swap - } -} - - - - diff --git a/test/pending/shootout/meteor.scala-3.scala.runner b/test/pending/shootout/meteor.scala-3.scala.runner deleted file mode 100644 index dae384311f..0000000000 --- a/test/pending/shootout/meteor.scala-3.scala.runner +++ /dev/null @@ -1,3 +0,0 @@ -object Test extends Application { - for(n <- List(0)) meteor.main(Array(n.toString)) -} diff --git a/test/pending/shootout/meteor.scala-4.scala b/test/pending/shootout/meteor.scala-4.scala deleted file mode 100644 index ee036f7fab..0000000000 --- a/test/pending/shootout/meteor.scala-4.scala +++ /dev/null @@ -1,587 +0,0 @@ -/* The Computer Language Shootout - http://shootout.alioth.debian.org/ - contributed by Isaac Gouy -*/ - -// Most for-comprehension replaced by while loops -// BoardCells occupied by each Piece orientation are cached -// Piece orientations are cached - -import scala.collection.mutable._ - -object meteor { - def main(args: Array[String]) = { - val solver = new Solver( Integer.parseInt(args(0)) ) - solver.findSolutions - solver.printSolutions - } -} - - - - -// Solver.scala -// import scala.collection.mutable._ - -final class Solver (n: Int) { - private var countdown = n - private var first: String = _ - private var last: String = _ - - private val board = new Board() - - val pieces = Array( - new Piece(0), new Piece(1), new Piece(2), new Piece(3), new Piece(4), - new Piece(5), new Piece(6), new Piece(7), new Piece(8), new Piece(9) ) - - val unplaced = new BitSet(pieces.length) - - { unplaced ++= (0 until pieces.length) } - - - def findSolutions(): Unit = { - if (countdown == 0) return - - if (unplaced.size > 0){ - val emptyCellIndex = board.firstEmptyCellIndex - - var k = 0 - while (k < pieces.length){ - if (unplaced.contains(k)){ - unplaced -= k - - var i = 0 - while (i < Piece.orientations){ - val piece = pieces(k).nextOrientation - - var j = 0 - while (j < Piece.size){ - if (board.add(j,emptyCellIndex,piece)) { - - if (!shouldPrune) findSolutions - - board.remove(piece) - } - j = j + 1 - } - i = i + 1 - } - unplaced += k - } - k = k + 1 - } - } - else { - puzzleSolved - } - } - - private def puzzleSolved() = { - val b = board.asString - if (first == null){ - first = b; last = b - } else { - if (b < first){ first = b } else { if (b > last){ last = b } } - } - countdown = countdown - 1 - } - - private def shouldPrune(): Boolean = { - board.unmark - var i = 0 - while (i < board.cells.length){ - if (board.cells(i).contiguousEmptyCells % Piece.size != 0) return true - i = i + 1 - } - false - } - - - def printSolutions() = { - - def printBoard(s: String) = { - var indent = false - var i = 0 - while (i < s.length){ - if (indent) Console.print(' ') - var j = 0 - while (j < Board.cols){ - Console.print(s.charAt(i)); Console.print(' ') - j = j + 1 - i = i + 1 - } - Console.print('\n') - indent = !indent - } - Console.print('\n') - } - - Console.print(n + " solutions found\n\n") - printBoard(first) - printBoard(last) - } - -/* - def printPieces() = - for (i <- Iterator.range(0,Board.pieces)) pieces(i).print -*/ - -} - - - -// Board.scala -// import scala.collection.mutable._ - -object Board { - val cols = 5 - val rows = 10 - val size = rows * cols - val pieces = 10 - val noFit = new Array[BoardCell](0) -} - -final class Board { - val cells = boardCells() - - val cellsPieceWillFill = new Array[BoardCell](Piece.size) - var cellCount = 0 - - def unmark() = { - var i = 0 - while (i < cells.length){ - cells(i).unmark - i = i + 1 - } - } - - def asString() = - new String( cells map( - c => if (c.piece == null) '-'.toByte - else (c.piece.number + 48).toByte )) - - def firstEmptyCellIndex() = cells.findIndexOf(c => c.isEmpty) - - - private val cache: Array[Array[Array[Array[ Array[BoardCell] ]]]] = - for (i <- Array.range(0,Board.pieces)) - yield - for (j <- Array.range(0,Piece.orientations)) - yield - for (k <- Array.range(0,Piece.size)) // piece cell index - yield - for (m <- Array.range(0,Board.size)) // board cell index - yield (null: BoardCell) - - - def add(pieceIndex: Int, boardIndex: Int, p: Piece): Boolean = { - var a = cache(p.number)(p.orientation)(pieceIndex)(boardIndex) - - cellCount = 0 - p.unmark - - if (a == null){ - find(p.cells(pieceIndex), cells(boardIndex)) - - if (cellCount != Piece.size){ - cache(p.number)(p.orientation)(pieceIndex)(boardIndex) = Board.noFit - return false - } - - a = cellsPieceWillFill .filter(c => true) - cache(p.number)(p.orientation)(pieceIndex)(boardIndex) = a - } - else { - if (a == Board.noFit) return false - } - - var i = 0 - while (i < a.length){ - if (!a(i).isEmpty) return false - i = i + 1 - } - - i = 0 - while (i < a.length){ - a(i).piece = p - i = i + 1 - } - - true - } - - - def remove(piece: Piece) = { - var i = 0 - while (i < cells.length){ - if (cells(i).piece == piece) cells(i).empty - i = i + 1 - } - } - - - private def find(p: PieceCell, b: BoardCell): Unit = { - if (p != null && !p.marked && b != null){ - cellsPieceWillFill(cellCount) = b - cellCount = cellCount + 1 - p.mark - - var i = 0 - while (i < Cell.sides){ - find(p.next(i), b.next(i)) - i = i + 1 - } - } - } - - - private def boardCells() = { - val a = for (i <- Array.range(0,Board.size)) yield new BoardCell(i) - val m = (Board.size / Board.cols) - 1 - - for (i <- Iterator.range(0,a.length)){ - val row = i / Board.cols - val isFirst = i % Board.cols == 0 - val isLast = (i+1) % Board.cols == 0 - val c = a(i) - - if (row % 2 == 1) { - if (!isLast) c.next(Cell.NE) = a(i-(Board.cols-1)) - c.next(Cell.NW) = a(i-Board.cols) - if (row != m) { - if (!isLast) c.next(Cell.SE) = a(i+(Board.cols+1)) - c.next(Cell.SW) = a(i+Board.cols) - } - } else { - if (row != 0) { - if (!isFirst) c.next(Cell.NW) = a(i-(Board.cols+1)) - c.next(Cell.NE) = a(i-Board.cols) - } - if (row != m) { - if (!isFirst) c.next(Cell.SW) = a(i+(Board.cols-1)) - c.next(Cell.SE) = a(i+Board.cols) - } - } - if (!isFirst) c.next(Cell.W) = a(i-1) - if (!isLast) c.next(Cell.E) = a(i+1) - } - a - } - - -/* -// Printing all the board cells and their neighbours -// helps check that they are connected properly - - def printBoardCellsAndNeighbours() = { - Console.println("cell\tNW NE W E SW SE") - for (i <- Iterator.range(0,Board.size)){ - Console.print(i + "\t") - for (j <- Iterator.range(0,Cell.sides)){ - val c = cells(i).next(j) - if (c == null) - Console.print("-- ") - else - Console.printf("{0,number,00} ")(c.number) - } - Console.println("") - } - Console.println("") - } -*/ - -} - - - - -// Piece.scala - -object Piece { - val size = 5 - val rotations = Cell.sides - val flips = 2 - val orientations = rotations * flips -} - -final class Piece(_number: Int) { - val number = _number - - def unmark() = { - val c = cache(orientation) - var i = 0 - while (i < c.length){ - c(i).unmark - i = i + 1 - } - } - - def cells = cache(orientation) - - private val cache = - for (i <- Array.range(0,Piece.orientations)) - yield pieceOrientation(i) - - var orientation = 0 - - def nextOrientation() = { - orientation = (orientation + 1) % Piece.orientations - this - } - - - private def pieceOrientation(k: Int) = { - val cells = for (i <- Array.range(0,Piece.size)) yield new PieceCell() - makePiece(number,cells) - - var i = 0 - while (i < k){ - if (i % Piece.rotations == 0) - for (c <- cells) c.flip - else - for (c <- cells) c.rotate - - i = i + 1 - } - cells - } - - private def makePiece(number: Int, cells: Array[PieceCell]) = { - number match { - case 0 => make0(cells) - case 1 => make1(cells) - case 2 => make2(cells) - case 3 => make3(cells) - case 4 => make4(cells) - case 5 => make5(cells) - case 6 => make6(cells) - case 7 => make7(cells) - case 8 => make8(cells) - case 9 => make9(cells) - } - } - - private def make0(a: Array[PieceCell]) = { - a(0).next(Cell.E) = a(1) - a(1).next(Cell.W) = a(0) - a(1).next(Cell.E) = a(2) - a(2).next(Cell.W) = a(1) - a(2).next(Cell.E) = a(3) - a(3).next(Cell.W) = a(2) - a(3).next(Cell.SE) = a(4) - a(4).next(Cell.NW) = a(3) - } - - private def make1(a: Array[PieceCell]) = { - a(0).next(Cell.SE) = a(1) - a(1).next(Cell.NW) = a(0) - a(1).next(Cell.SW) = a(2) - a(2).next(Cell.NE) = a(1) - a(2).next(Cell.W) = a(3) - a(3).next(Cell.E) = a(2) - a(3).next(Cell.SW) = a(4) - a(4).next(Cell.NE) = a(3) - } - - private def make2(a: Array[PieceCell]) = { - a(0).next(Cell.W) = a(1) - a(1).next(Cell.E) = a(0) - a(1).next(Cell.SW) = a(2) - a(2).next(Cell.NE) = a(1) - a(2).next(Cell.SE) = a(3) - a(3).next(Cell.NW) = a(2) - a(3).next(Cell.SE) = a(4) - a(4).next(Cell.NW) = a(3) - } - - private def make3(a: Array[PieceCell]) = { - a(0).next(Cell.SW) = a(1) - a(1).next(Cell.NE) = a(0) - a(1).next(Cell.W) = a(2) - a(2).next(Cell.E) = a(1) - a(1).next(Cell.SW) = a(3) - a(3).next(Cell.NE) = a(1) - a(2).next(Cell.SE) = a(3) - a(3).next(Cell.NW) = a(2) - a(3).next(Cell.SE) = a(4) - a(4).next(Cell.NW) = a(3) - } - - private def make4(a: Array[PieceCell]) = { - a(0).next(Cell.SE) = a(1) - a(1).next(Cell.NW) = a(0) - a(1).next(Cell.SW) = a(2) - a(2).next(Cell.NE) = a(1) - a(1).next(Cell.E) = a(3) - a(3).next(Cell.W) = a(1) - a(3).next(Cell.SE) = a(4) - a(4).next(Cell.NW) = a(3) - } - - private def make5(a: Array[PieceCell]) = { - a(0).next(Cell.SW) = a(1) - a(1).next(Cell.NE) = a(0) - a(0).next(Cell.SE) = a(2) - a(2).next(Cell.NW) = a(0) - a(1).next(Cell.SE) = a(3) - a(3).next(Cell.NW) = a(1) - a(2).next(Cell.SW) = a(3) - a(3).next(Cell.NE) = a(2) - a(3).next(Cell.SW) = a(4) - a(4).next(Cell.NE) = a(3) - } - - private def make6(a: Array[PieceCell]) = { - a(0).next(Cell.SW) = a(1) - a(1).next(Cell.NE) = a(0) - a(2).next(Cell.SE) = a(1) - a(1).next(Cell.NW) = a(2) - a(1).next(Cell.SE) = a(3) - a(3).next(Cell.NW) = a(1) - a(3).next(Cell.SW) = a(4) - a(4).next(Cell.NE) = a(3) - } - - private def make7(a: Array[PieceCell]) = { - a(0).next(Cell.SE) = a(1) - a(1).next(Cell.NW) = a(0) - a(0).next(Cell.SW) = a(2) - a(2).next(Cell.NE) = a(0) - a(2).next(Cell.SW) = a(3) - a(3).next(Cell.NE) = a(2) - a(3).next(Cell.SE) = a(4) - a(4).next(Cell.NW) = a(3) - } - - private def make8(a: Array[PieceCell]) = { - a(0).next(Cell.E) = a(1) - a(1).next(Cell.W) = a(0) - a(1).next(Cell.E) = a(2) - a(2).next(Cell.W) = a(1) - a(2).next(Cell.NE) = a(3) - a(3).next(Cell.SW) = a(2) - a(3).next(Cell.E) = a(4) - a(4).next(Cell.W) = a(3) - } - - private def make9(a: Array[PieceCell]) = { - a(0).next(Cell.E) = a(1) - a(1).next(Cell.W) = a(0) - a(1).next(Cell.E) = a(2) - a(2).next(Cell.W) = a(1) - a(2).next(Cell.NE) = a(3) - a(3).next(Cell.SW) = a(2) - a(2).next(Cell.E) = a(4) - a(4).next(Cell.W) = a(2) - a(4).next(Cell.NW) = a(3) - a(3).next(Cell.SE) = a(4) - } - -/* - def print() = { - Console.println("Piece # " + number) - Console.println("cell\tNW NE W E SW SE") - for (i <- Iterator.range(0,Piece.size)){ - Console.print(i + "\t") - for (j <- Iterator.range(0,Cell.sides)){ - val c = cells(i).next(j) - if (c == null) - Console.print("-- ") - else - for (k <- Iterator.range(0,Piece.size)){ - if (cells(k) == c) Console.printf(" {0,number,0} ")(k) - } - } - Console.println("") - } - Console.println("") - } -*/ -} - - - - - -// Cell.scala - -object Cell { - val NW = 0; val NE = 1 - val W = 2; val E = 3 - val SW = 4; val SE = 5 - - val sides = 6 -} - -abstract class Cell { - var marked = false - - def mark() = marked = true - def unmark() = marked = false -} - - - - -// BoardCell.scala - -final class BoardCell(_number: Int) extends Cell { - val next = new Array[BoardCell](Cell.sides) - val number = _number - var piece: Piece = _ - - def isEmpty() = piece == null - def empty() = piece = null - - def contiguousEmptyCells(): Int = { - if (!marked && isEmpty){ - mark - var count = 1 - - var i = 0 - while (i < next.length){ - if (next(i) != null && next(i).isEmpty) - count = count + next(i).contiguousEmptyCells - i = i + 1 - } - - count } else { 0 } - } -} - - - - -// PieceCell.scala - -final class PieceCell extends Cell { - val next = new Array[PieceCell](Cell.sides) - - def flip = { - var swap = next(Cell.NE) - next(Cell.NE) = next(Cell.NW) - next(Cell.NW) = swap - - swap = next(Cell.E) - next(Cell.E) = next(Cell.W) - next(Cell.W) = swap - - swap = next(Cell.SE) - next(Cell.SE) = next(Cell.SW) - next(Cell.SW) = swap - } - - def rotate = { - var swap = next(Cell.E) - next(Cell.E) = next(Cell.NE) - next(Cell.NE) = next(Cell.NW) - next(Cell.NW) = next(Cell.W) - next(Cell.W) = next(Cell.SW) - next(Cell.SW) = next(Cell.SE) - next(Cell.SE) = swap - } -} - - - - diff --git a/test/pending/shootout/meteor.scala-4.scala.runner b/test/pending/shootout/meteor.scala-4.scala.runner deleted file mode 100644 index dae384311f..0000000000 --- a/test/pending/shootout/meteor.scala-4.scala.runner +++ /dev/null @@ -1,3 +0,0 @@ -object Test extends Application { - for(n <- List(0)) meteor.main(Array(n.toString)) -} diff --git a/test/pending/shootout/meteor.scala.runner b/test/pending/shootout/meteor.scala.runner deleted file mode 100644 index dae384311f..0000000000 --- a/test/pending/shootout/meteor.scala.runner +++ /dev/null @@ -1,3 +0,0 @@ -object Test extends Application { - for(n <- List(0)) meteor.main(Array(n.toString)) -} diff --git a/test/pending/shootout/methcall.scala b/test/pending/shootout/methcall.scala deleted file mode 100644 index 9f7234c72d..0000000000 --- a/test/pending/shootout/methcall.scala +++ /dev/null @@ -1,58 +0,0 @@ -/* The Computer Language Shootout - http://shootout.alioth.debian.org/ - contributed by Isaac Gouy (Scala novice) -*/ - -object methcall { - def main(args: Array[String]) = { - var n = toPositiveInt(args); - var v: Boolean = false - - val toggle = new Toggle(true); - for (i <- Iterator.range(1,n)) v = toggle.activate.value; - - Console println( toggle.activate.value ); - - val ntoggle = new NToggle(true,3); - for (i <- Iterator.range(1,n)) v = ntoggle.activate.value; - - Console println( ntoggle.activate.value ); - } - - - private def toPositiveInt(s: Array[String]) = { - val i = - try { Integer.parseInt(s(0)); } - catch { case _ => 1 } - if (i>0) i; else 1; - } -} - - -private class Toggle(b: Boolean) { - var state = b; - - def value = state; - - def activate = { - state = !state; - this - } -} - - -private class NToggle(b: Boolean, trigger: Int) -extends Toggle(b) { - - val toggleTrigger = trigger; - var count = 0; - - override def activate = { - count = count + 1; - if (count >= toggleTrigger) { - state = !state; - count = 0; - } - this - } -} diff --git a/test/pending/shootout/methcall.scala.runner b/test/pending/shootout/methcall.scala.runner deleted file mode 100644 index 555413cc6c..0000000000 --- a/test/pending/shootout/methcall.scala.runner +++ /dev/null @@ -1,3 +0,0 @@ -object Test extends Application { - for(n <- List(100000,400000,700000,1000000)) methcall.main(Array(n.toString)) -} diff --git a/test/pending/shootout/nsieve.scala-4.check b/test/pending/shootout/nsieve.scala-4.check deleted file mode 100644 index 5ae0440a5a..0000000000 --- a/test/pending/shootout/nsieve.scala-4.check +++ /dev/null @@ -1,9 +0,0 @@ -Primes up to 1280000 98610 -Primes up to 640000 52074 -Primes up to 320000 27608 -Primes up to 2560000 187134 -Primes up to 1280000 98610 -Primes up to 640000 52074 -Primes up to 5120000 356244 -Primes up to 2560000 187134 -Primes up to 1280000 98610 diff --git a/test/pending/shootout/nsieve.scala-4.scala b/test/pending/shootout/nsieve.scala-4.scala deleted file mode 100644 index 741eb80398..0000000000 --- a/test/pending/shootout/nsieve.scala-4.scala +++ /dev/null @@ -1,45 +0,0 @@ -/* The Computer Language Shootout - http://shootout.alioth.debian.org/ - contributed by Isaac Gouy -*/ - - -object nsieve { - - def nsieve(m: Int, isPrime: Array[Boolean]) = { - for (i <- List.range(2, m)) isPrime(i) = true - var count = 0 - - for (i <- List.range(2, m)){ - if (isPrime(i)){ - var k = i+i - while (k < m){ isPrime(k) = false; k = k+i } - count = count + 1 - } - } - count - } - - - def main(args: Array[String]) = { - val n = Integer.parseInt(args(0)) - val m = (1<<n)*10000 - val flags = new Array[Boolean](m+1) - - def printPrimes(m: Int) = { - - def pad(i: Int, width: Int) = { - val s = i.toString - List.range(0, width - s.length) - .map((i) => " ") .foldLeft("")((a,b) => a+b) + s - } - - Console.println("Primes up to " + pad(m,8) + pad(nsieve(m,flags),9)) - } - - - printPrimes(m) - printPrimes( (1<<n-1)*10000 ) - printPrimes( (1<<n-2)*10000 ) - } -} diff --git a/test/pending/shootout/nsieve.scala-4.scala.runner b/test/pending/shootout/nsieve.scala-4.scala.runner deleted file mode 100644 index 67be6d5844..0000000000 --- a/test/pending/shootout/nsieve.scala-4.scala.runner +++ /dev/null @@ -1,3 +0,0 @@ -object Test extends Application { - for(n <- List(7,8,9)) nsieve.main(Array(n.toString)) -} diff --git a/test/pending/shootout/pidigits.check b/test/pending/shootout/pidigits.check deleted file mode 100644 index ad4dc9962b..0000000000 --- a/test/pending/shootout/pidigits.check +++ /dev/null @@ -1,100 +0,0 @@ -3141592653 :10 -5897932384 :20 -6264338327 :30 -9502884197 :40 -1693993751 :50 -0582097494 :60 -4592307816 :70 -4062862089 :80 -9862803482 :90 -5342117067 :100 -9821480865 :110 -1328230664 :120 -7093844609 :130 -5505822317 :140 -2535940812 :150 -8481117450 :160 -2841027019 :170 -3852110555 :180 -9644622948 :190 -9549303819 :200 -6442881097 :210 -5665933446 :220 -1284756482 :230 -3378678316 :240 -5271201909 :250 -1456485669 :260 -2346034861 :270 -0454326648 :280 -2133936072 :290 -6024914127 :300 -3724587006 :310 -6063155881 :320 -7488152092 :330 -0962829254 :340 -0917153643 :350 -6789259036 :360 -0011330530 :370 -5488204665 :380 -2138414695 :390 -1941511609 :400 -4330572703 :410 -6575959195 :420 -3092186117 :430 -3819326117 :440 -9310511854 :450 -8074462379 :460 -9627495673 :470 -5188575272 :480 -4891227938 :490 -1830119491 :500 -2983367336 :510 -2440656643 :520 -0860213949 :530 -4639522473 :540 -7190702179 :550 -8609437027 :560 -7053921717 :570 -6293176752 :580 -3846748184 :590 -6766940513 :600 -2000568127 :610 -1452635608 :620 -2778577134 :630 -2757789609 :640 -1736371787 :650 -2146844090 :660 -1224953430 :670 -1465495853 :680 -7105079227 :690 -9689258923 :700 -5420199561 :710 -1212902196 :720 -0864034418 :730 -1598136297 :740 -7477130996 :750 -0518707211 :760 -3499999983 :770 -7297804995 :780 -1059731732 :790 -8160963185 :800 -9502445945 :810 -5346908302 :820 -6425223082 :830 -5334468503 :840 -5261931188 :850 -1710100031 :860 -3783875288 :870 -6587533208 :880 -3814206171 :890 -7766914730 :900 -3598253490 :910 -4287554687 :920 -3115956286 :930 -3882353787 :940 -5937519577 :950 -8185778053 :960 -2171226806 :970 -6130019278 :980 -7661119590 :990 -9216420198 :1000 diff --git a/test/pending/shootout/pidigits.scala b/test/pending/shootout/pidigits.scala deleted file mode 100644 index b0becafda8..0000000000 --- a/test/pending/shootout/pidigits.scala +++ /dev/null @@ -1,69 +0,0 @@ -/* ------------------------------------------------------------------ */ -/* The Computer Language Shootout */ -/* http://shootout.alioth.debian.org/ */ -/* */ -/* Contributed by Anthony Borla */ -/* ------------------------------------------------------------------ */ - -object pidigits -{ - def main(args: Array[String]): Unit = - { - val N: Int = Integer.parseInt(args(0)); var i: Int = 10 - - while (i <= N) - { - System.out.println(pi_digits(10) + "\t:" + i) - i = i + 10 - } - - i = i - 10 - - if (i < N) - { - System.out.println(pi_digits(N - i) + "\t:" + N) - } - } - - def compose(a: Array[BigInt], b: Array[BigInt]): Array[BigInt] = - { - return Array(a(0) * b(0), - a(0) * b(1) + a(1) * b(3), - a(2) * b(0) + a(3) * b(2), - a(2) * b(1) + a(3) * b(3)) - } - - def extract(a: Array[BigInt], j: Int): BigInt = - { - return (a(0) * j + a(1)) / (a(2) * j + a(3)) - } - - def pi_digits(c: Int): String = - { - val r: StringBuffer = new StringBuffer(); var i: Int = 0 - - while (i < c) - { - var y: BigInt = extract(Z, 3) - - while (y != extract(Z, 4)) - { - K = K + 1; Z = compose(Z, Array(K, 4 * K + 2, 0, 2 * K + 1)) - y = extract(Z, 3) - } - -// Z = compose(Array(10, (-y) * 10, 0, 1), Z) - - Z = compose(Array(10, y * (-10), 0, 1), Z) - - r.append(y); i = i + 1; - } - - return r.toString() - } - - var K: Int = 0 - - var Z: Array[BigInt] = Array(1, 0, 0, 1) -} - diff --git a/test/pending/shootout/pidigits.scala.runner b/test/pending/shootout/pidigits.scala.runner deleted file mode 100644 index 4bf5a8bde9..0000000000 --- a/test/pending/shootout/pidigits.scala.runner +++ /dev/null @@ -1,3 +0,0 @@ -object Test extends Application { - for(n <- List(600,800,1000)) pidigits.main(Array(n.toString)) -} diff --git a/test/pending/shootout/prodcons.scala b/test/pending/shootout/prodcons.scala deleted file mode 100644 index d48d3e94d8..0000000000 --- a/test/pending/shootout/prodcons.scala +++ /dev/null @@ -1,64 +0,0 @@ -/* The Computer Language Shootout - http://shootout.alioth.debian.org/ - contributed by Isaac Gouy (Scala novice) -*/ - -import concurrent.SyncVar; -import concurrent.ops._; - -object prodcons { - def main(args: Array[String]) = { - val n = toPositiveInt(args); - val buffer = new SharedBuffer(); - var p = 0; - var c = 0; - val cDone = new SyncVar[Boolean]; - - spawn { - while(p<n) { p=p+1; buffer put(p); } - } - - spawn { - var v: Int = _; - while(c<n) { c=c+1; v = buffer.get; } - cDone set true; - } - - cDone.get; - Console println(p + " " + c); - } - - - private def toPositiveInt(s: Array[String]) = { - val i = - try { Integer.parseInt(s(0)); } - catch { case _ => 1 } - if (i>0) i; else 1; - } -} - - -private class SharedBuffer() { - var contents: Int = _; - var available = false; - - def get = synchronized { - while (available == false) wait(); - available = false; - // Console println("\t" + "get " + contents); - notifyAll(); - contents - } - - def put(value: Int) = synchronized { - while (available == true) wait(); - contents = value; - available = true; - // Console println("put " + value); - notifyAll(); - } -} - - - - diff --git a/test/pending/shootout/prodcons.scala.runner b/test/pending/shootout/prodcons.scala.runner deleted file mode 100644 index 75faf8ca6e..0000000000 --- a/test/pending/shootout/prodcons.scala.runner +++ /dev/null @@ -1,3 +0,0 @@ -object Test extends Application { - for(n <- List(30000,70000,100000,150000)) prodcons.main(Array(n.toString)) -} diff --git a/test/pending/shootout/random.scala b/test/pending/shootout/random.scala deleted file mode 100644 index 0a86a35637..0000000000 --- a/test/pending/shootout/random.scala +++ /dev/null @@ -1,32 +0,0 @@ -/* The Computer Language Shootout - http://shootout.alioth.debian.org/ - contributed by Isaac Gouy (Scala novice) -*/ - -object random { - def main(args: Array[String]) = { - var n = toPositiveInt(args); - var result: Double = 0 - - while (n>0) { result=generate(100.0); n=n-1; } - - Console.printf("{0,number,#.000000000}\n", result) - } - - private val IM = 139968; - private val IA = 3877; - private val IC = 29573; - private var seed = 42; - - def generate(max: Double) = { - seed = (seed * IA + IC) % IM; - max * seed / IM; - } - - private def toPositiveInt(s: Array[String]) = { - val i = - try { Integer.parseInt(s(0)); } - catch { case _ => 1 } - if (i>0) i; else 1; - } -} diff --git a/test/pending/shootout/random.scala.runner b/test/pending/shootout/random.scala.runner deleted file mode 100644 index 11cbeef0f6..0000000000 --- a/test/pending/shootout/random.scala.runner +++ /dev/null @@ -1,3 +0,0 @@ -object Test extends Application { - for(n <- List(9000,300000,600000,900000)) random.main(Array(n.toString)) -} diff --git a/test/pending/shootout/revcomp.scala-2.check b/test/pending/shootout/revcomp.scala-2.check deleted file mode 100644 index 14d792ade8..0000000000 --- a/test/pending/shootout/revcomp.scala-2.check +++ /dev/null @@ -1,171 +0,0 @@ ->ONE Homo sapiens alu -CGGAGTCTCGCTCTGTCGCCCAGGCTGGAGTGCAGTGGCGCGATCTCGGCTCACTGCAAC -CTCCGCCTCCCGGGTTCAAGCGATTCTCCTGCCTCAGCCTCCCGAGTAGCTGGGATTACA -GGCGCGCGCCACCACGCCCGGCTAATTTTTGTATTTTTAGTAGAGACGGGGTTTCACCAT -GTTGGCCAGGCTGGTCTCGAACTCCTGACCTCAGGTGATCCGCCCGCCTCGGCCTCCCAA -AGTGCTGGGATTACAGGCGTGAGCCACCGCGCCCGGCCTTTTTGAGACGGAGTCTCGCTC -TGTCGCCCAGGCTGGAGTGCAGTGGCGCGATCTCGGCTCACTGCAACCTCCGCCTCCCGG -GTTCAAGCGATTCTCCTGCCTCAGCCTCCCGAGTAGCTGGGATTACAGGCGCGCGCCACC -ACGCCCGGCTAATTTTTGTATTTTTAGTAGAGACGGGGTTTCACCATGTTGGCCAGGCTG -GTCTCGAACTCCTGACCTCAGGTGATCCGCCCGCCTCGGCCTCCCAAAGTGCTGGGATTA -CAGGCGTGAGCCACCGCGCCCGGCCTTTTTGAGACGGAGTCTCGCTCTGTCGCCCAGGCT -GGAGTGCAGTGGCGCGATCTCGGCTCACTGCAACCTCCGCCTCCCGGGTTCAAGCGATTC -TCCTGCCTCAGCCTCCCGAGTAGCTGGGATTACAGGCGCGCGCCACCACGCCCGGCTAAT -TTTTGTATTTTTAGTAGAGACGGGGTTTCACCATGTTGGCCAGGCTGGTCTCGAACTCCT -GACCTCAGGTGATCCGCCCGCCTCGGCCTCCCAAAGTGCTGGGATTACAGGCGTGAGCCA -CCGCGCCCGGCCTTTTTGAGACGGAGTCTCGCTCTGTCGCCCAGGCTGGAGTGCAGTGGC -GCGATCTCGGCTCACTGCAACCTCCGCCTCCCGGGTTCAAGCGATTCTCCTGCCTCAGCC -TCCCGAGTAGCTGGGATTACAGGCGCGCGCCACCACGCCCGGCTAATTTTTGTATTTTTA -GTAGAGACGGGGTTTCACCATGTTGGCCAGGCTGGTCTCGAACTCCTGACCTCAGGTGAT -CCGCCCGCCTCGGCCTCCCAAAGTGCTGGGATTACAGGCGTGAGCCACCGCGCCCGGCCT -TTTTGAGACGGAGTCTCGCTCTGTCGCCCAGGCTGGAGTGCAGTGGCGCGATCTCGGCTC -ACTGCAACCTCCGCCTCCCGGGTTCAAGCGATTCTCCTGCCTCAGCCTCCCGAGTAGCTG -GGATTACAGGCGCGCGCCACCACGCCCGGCTAATTTTTGTATTTTTAGTAGAGACGGGGT -TTCACCATGTTGGCCAGGCTGGTCTCGAACTCCTGACCTCAGGTGATCCGCCCGCCTCGG -CCTCCCAAAGTGCTGGGATTACAGGCGTGAGCCACCGCGCCCGGCCTTTTTGAGACGGAG -TCTCGCTCTGTCGCCCAGGCTGGAGTGCAGTGGCGCGATCTCGGCTCACTGCAACCTCCG -CCTCCCGGGTTCAAGCGATTCTCCTGCCTCAGCCTCCCGAGTAGCTGGGATTACAGGCGC -GCGCCACCACGCCCGGCTAATTTTTGTATTTTTAGTAGAGACGGGGTTTCACCATGTTGG -CCAGGCTGGTCTCGAACTCCTGACCTCAGGTGATCCGCCCGCCTCGGCCTCCCAAAGTGC -TGGGATTACAGGCGTGAGCCACCGCGCCCGGCCTTTTTGAGACGGAGTCTCGCTCTGTCG -CCCAGGCTGGAGTGCAGTGGCGCGATCTCGGCTCACTGCAACCTCCGCCTCCCGGGTTCA -AGCGATTCTCCTGCCTCAGCCTCCCGAGTAGCTGGGATTACAGGCGCGCGCCACCACGCC -CGGCTAATTTTTGTATTTTTAGTAGAGACGGGGTTTCACCATGTTGGCCAGGCTGGTCTC -GAACTCCTGACCTCAGGTGATCCGCCCGCCTCGGCCTCCCAAAGTGCTGGGATTACAGGC -GTGAGCCACCGCGCCCGGCC ->TWO IUB ambiguity codes -TAGGDHACHATCRGTRGVTGAGWTATGYTGCTGTCABACDWVTRTAAGAVVAGATTTNDA -GASMTCTGCATBYTTCAAKTTACMTATTACTTCATARGGYACMRTGTTTTYTATACVAAT -TTCTAKGDACKADACTATATNTANTCGTTCACGBCGYSCBHTANGGTGATCGTAAAGTAA -CTATBAAAAGATSTGWATBCSGAKHTTABBAACGTSYCATGCAAVATKTSKTASCGGAAT -WVATTTNTCCTTCTTCTTDDAGTGGTTGGATACVGTTAYMTMTBTACTTTHAGCTAGBAA -AAGAGKAAGTTRATWATCAGATTMDDTTTAAAVAAATATTKTCYTAAATTVCNKTTRACG -ADTATATTTATGATSADSCAATAWAGCGRTAGTGTAAGTGACVGRADYGTGCTACHVSDT -CTVCARCSYTTAATATARAAAATTTAATTTACDAATTGBACAGTAYAABATBTGCAGBVG -TGATGGDCAAAATBNMSTTABKATTGGSTCCTAGBTTACTTGTTTAGTTTATHCGATSTA -AAGTCGAKAAASTGTTTTAWAKCAGATATACTTTTMTTTTGBATAGAGGAGCMATGATRA -AAGGNCAYDCCDDGAAAGTHGBTAATCKYTBTACBGTBCTTTTTGDTAASSWTAAWAARA -TTGGCTAAGWGRADTYACATAGCTCBTAGATAWAGCAATNGTATMATGTTKMMAGTAWTC -CCNTSGAAWATWCAAAAMACTGAADNTYGATNAATCCGAYWNCTAACGTTAGAGDTTTTC -ATCTGGKRTAVGAABVCTGWGBTCTDVGKATTBTCTAAGGVADAAAVWTCTAGGGGAGGG -TTAGAACAATTAAHTAATNAAATGCATKATCTAAYRTDTCAGSAYTTYHGATRTTWAVTA -BGNTCDACAGBCCRCAGWCRTCABTGMMAWGMCTCAACCGATRTGBCAVAATCGTDWDAA -CAYAWAATWCTGGTAHCCCTAAGATAACSCTTAGTGSAACAWTBGTCDTTDGACWDBAAC -HTTTNGSKTYYAAYGGATNTGATTTAARTTAMBAATCTAAGTBTCATYTAACTTADTGTT -TCGATACGAAHGGCYATATACCWDTKYATDCSHTDTCAAAATGTGBACTGSCCVGATGTA -TCMMAGCCTTDAAABAATGAAGAGTAACTHATMGVTTAATAACCCGGTTVSANTGCAATT -GTGAGATTTAMGTTTAMAAYGCTGACAYAAAAAGGCACAMYTAAGVGGCTGGAABVTACG -GATTSTYGTBVAKTATWACCGTGTKAGTDTGTATGTTTAAAGGAAAAAGTAACATARAAA -GGTYCAMNYAAABTATAGNTSATANAGTCATCCTATWADKAACTRGTMSACDGTATSAYT -AAHSHGTAABYGACTYTATADTGSTATAGAGAAATCGNTAAAGGAAATCAGTTGTNCYMV -TNACDRTATBNATATASTAGAAMSCGGGANRCKKMCAAACATTNAGTCTRMAATBMTACC -CGTACTTCTBGDSYAATWGAAAATGACADDCHAKAAAYATATTKTTTTCACANACWAGAA -AKATCCTTATTAYKHKCTAAACARTATTTTDATBTVWCYGCAATACTAGGKAAASTTDGA -MGGCHTTHAATVCAHDRYAGGRCTATACGTCMAGAGAGCTBTHGNACARTCCBDCTAAGA -GCGGCTTTARTAAAGAATCCNAGTAWBTGACTTGAATTACWTVACAGAAABCAATNAAAC -CGTNTRANTTGAYCMAWBADTANABRGGTKTHTWTAGTTVCTMBKTAGMTVKCCAGCANT -TVAGSWTTAGCCGCRHTTTCCTTHNTATTAAGAAGAATAGGMTRAARTCTABGTACDTTT -TATAAVDHAHTATAGATCCTAGTAAGYTWATDWCATGAGGGATAGTAAMDMNGBASTWAM -TSTATRBAYDABATGTATATYCGCACTGTTTTAACMCWBTATAWAGTATBTSTATVTTAR -CCTMTTAAKADATCAACTAATYTSVTAKGDATTATGCKTCAYCAKAATACTTKAANGAGT -ATTSDAGATCGGAAATACTTAAYAAVGTATMCGCTTGTGTDCTAATYTATTTTATTTWAA -CAGWRCTATGTAGMTGTTTGTTYKTNGTTKTCAGAACNTRACCTACKTGSRATGTGGGGG -CTGTCATTAAGTAAATNGSTTABCCCCTCGCAGCTCWHTCGCGAAGCAVATGCKACGHCA -ACAKTTAATAACASAAADATTWNYTGTAATTGTTCGTMHACHTWATGTGCWTTTTGAAHY -ACTTTGTAYAMSAAACTTAADAAATATAGTABMATATYAATGSGGTAGTTTGTGTBYGGT -TWSGSVGWMATTDMTCCWWCABTCSVACAGBAATGTTKATBGTCAATAATCTTCTTAAAC -ARVAATHAGYBWCTRWCABGTWWAATCTAAGTCASTAAAKTAAGVKBAATTBGABACGTA -AGGTTAAATAAAAACTRMDTWBCTTTTTAATAAAAGATMGCCTACKAKNTBAGYRASTGT -ASSTCGTHCGAAKTTATTATATTYTTTGTAGAACATGTCAAAACTWTWTHGKTCCYAATA -AAGTGGAYTMCYTAARCSTAAATWAKTGAATTTRAGTCTSSATACGACWAKAASATDAAA -TGYYACTSAACAAHAKTSHYARGASTATTATTHAGGYGGASTTTBGAKGATSANAACACD -TRGSTTRAAAAAAAACAAGARTCVTAGTAAGATAWATGVHAAKATWGAAAAGTYAHVTAC -TCTGRTGTCAWGATRVAAKTCGCAAVCGASWGGTTRTCSAMCCTAACASGWKKAWDAATG -ACRCBACTATGTGTCTTCAAAHGSCTATATTTCGTVWAGAAGTAYCKGARAKSGKAGTAN -TTTCYACATWATGTCTAAAADMDTWCAATSTKDACAMAADADBSAAATAGGCTHAHAGTA -CGACVGAATTATAAAGAHCCVAYHGHTTTACATSTTTATGNCCMTAGCATATGATAVAAG ->THREE Homo sapiens frequency -ATATTTATCTTTTCACTTCCTACATTGGTCAGACCATTATTCGACACGTGGCGTCATTTT -GTCATACCGGGTAATGTTGGAAACAAAACGTACTGATAAAATACTGAGTTGTAAACTCTA -ATCAGATAACGCGCTTGGATATTAAGATTCACACAGGGGTTTCGGCTGTAAAAAAACTTG -TGGAGCTGTTCTGGGACAGATAAGTTGTACCTCGTACTTAGCTAATTAATGAACCAACTG -ATTACGATAGAACAATTCTGAGGCCGCCAGGACAGCCAAATTTTAATCTTATAAAGCTGG -AAACAGCCGGTATTAGCTTCTCGCATACTTTGCCTGCATTGGTACCTTACAGATATCAGC -GTAGTCATATACACCTCGGTCTCAGCTAAGCTTGTATCTCTTAGAGTAGTTCAAAGATAG -TGGACAATACCTGTGGAATCGATTGCAGATATGGATTTATTTAACTACTGAGTCTCATTC -ACAAGCTAAGCAAGGAGCACGTTTTGGTGCCGGCATACCGATTTGCTATCATGTCAGCAA -ATTTGCGTTGTATTCCTAGTTGCACCCATTAAGGCCACACTCCGAACCTAATTATTACAT -CGCAAAGACATGTACGAAGGACCCGATGTCGAATAGAAGGGAGGACTGTTCATTGGAAGC -TAGACCAGAGGAATCGCAAAGATGCAACTCTTACAATAAAAATCTAATTTCAGTCAACAC -GCAATTTCTATAAGGTTTCCGATAATAATGAACCGTCTTCCACAGGGGAATTTGCCATGC -TCGTAAAAGTAGTTAATCCAAGTAGAAGAAATTTTGATAATGTTTTAAGTTGGCACGAAG -GAATTCAGAGAGATCTTACCTAACAAAGGCATTAGTAGATGTTCCTTGGTTCACACTCGG -TCAATCAGAGCACATACTACGGGCGATACCGGGAATGACACAACATCAATGAGATTGTTA -AGTGAGGTAATTGACTTTAGAGGACTCGATCAGTATACTGTCACTATGAACATCGTATTA -ATTGTTATCCGATATATACACCACCGATTTGCTTGTGCAAGGTTACAGACCCATTCGATA -AATACAAACACGGAGCGATATTATTTAAGGAGTGCTGTCTTCAAAAGAATTATTCCCACA -CCGACATAAGAACTTCGCTCCGTCATTCCAGATTTAAATAACATAACGTAACGCTTTGCT -GATAACATAACATAACCGAGAATTTGCTTAGGAAATTTGGAGCAATATTGCATTGTTTCT -CAGTCATCACAAGGCCCGCCAAAGAACTCTGAGAATCAGGATTCAACATGATTGGTAAGA -CTCTATATATATAACTTAATTCTTGTGTCCGGAGATAGAAAGAGGACGAGAGATACTACG -AAAGAAAGTGTACTTCGATGTATCAATTCAGACGCCTTCTCTATCATCAACATTATAGGT -CTCGTATATGCTCGGCGCGATCTGCTTCTCTCCGCCAATAGCCCCATAGTGTATTTCAAG -CGCAGTAACAGTGAAATCGTTACGAAGGTAGGGATGTTGCTTATAATTGTCGTAACTTAT -CGCTTATGTATCTTTCAAGAATGAACGGCAGCATATACATACGTTCTACCTTTAGCTACA -AAGCATCCATATACTCCCTCTCATGATTGAAACTCTTCCCTATTTTGTAGCCAATAGTGA -AAGCGTATTAGTATAAATTCGTCGGTTTTTCACTCGCAACTGTTATACTCTGCAAACAAA -CGAAAGCCTCATAGTACAAACCTAAAGCTACATACTTCATCATTGGCAGACCAGTGGCGG -TATTTCTACGGAAGCATCACTATAGATATAAAGTTTCCCTTCATGTACGTCTGTTAACCA -TATCACAAGAAACTGCTATCTCTGTCACGTAACAATTCACGCGCCTTATCGCCAAATGTT -CATATATGCGCGGTATACGTATGAACGAATACTAATTAGTATAACGGAGGATTCACGGGA -GGGATACTTGGGGCATTTATAAATCGTCTAAAAATTTTCTATCAGCACTTGCGGGTTATA -GTGGATTACTAGGCAACATAATATTCTGTATTGGTCCAAATGACGCTATAGATAAATTAG -CAAAATACATTGTTTCCATTTATGTAAGTCGAAACTCCAGGACTCCCGGGAACCAGTTAA -ACCGTCTGGAAAAGACACATTGTGAGCGGGACTTCAATGATAGCTTTCAATGAGCTTCTC -ATGCTTGGGGTCTGTACATATATGTTGGCGAAATTATCGTCTGTATTCTGTTATGCTTTG -ATCATGGGTTATTAGTATAGTGTCCGGTTAAGTACCAATACCGCTAGAGACCCGACCTAA -GTCGATAACTAACGATCATCGACGTAAGGATCGTCTCGATCAGTACTTCAGTCTAGATCT -GGGAATAGTAACTCGTTAGTGAACTATGTCGTGTCATAACTCTAAAATGCAATCAAATCT -TATTATTGAGTATTGATTATATAAAGCATCCGCTTAGCTTTACCCTCAAATGTTATATGC -AATTTAAAGCGCTTGATATCGTCTACTCAAGTTCAGGTTTCACATGGCCGCAACGTGACG -TTATTAGAGGTGGGTCATCATCTCTGAGGCTAGTGATGTTGAATACTCATTGAATGGGAA -GTGGAATACCATGCTCGTAGGTAACAGCATGACCTATAAAATATACTATGGGTGTGTGGT -AGATCAATATTGTTCAAGCATATCGTAACAATAACGGCTGAAATGTTACTGACATGAAAG -AGGGAGTCCAAACCATTCTAACAGCTGATCAAGTCGTCTAAAAACGCCTGGTTCAGCCTT -AAGAGTTATAAGCCAGACAAATTGTATCAATAGAGAATCCGTAAATTCCTCGGCCAACCT -CTTGCAAAGACATCACTATCAATATACTACCGTGATCTTAATTAGTGAACTTATATAAAT -ATCTACAACCAGATTCAACGGAAAAGCTTTAGTGGATTAGAAATTGCCAAGAATCACATT -CATGTGGGTTCGAATGCTTTAGTAATACCATTTCGCCGAGTAGTCACTTCGCTGAACTGT -CGTAAATTGCTATGACATAATCGAAAAGGATTGTCAAGAGTCGATTACTGCGGACTAATA -ATCCCCACGGGGGTGGTCTCATGTCTCCCCAGGCGAGTGGGGACGGTTGATAAACACGCT -GCATCGCGGACTGATGTTCCCAGTATTACATAGTCACATTGGATTGCGAGTAGTCTACCT -ATTTATGAGCGAGAGATGCCTCTAACTACTTCGACTTTTAAAACCTTTCCACGCCAGTAT -TCGGCGAAAGGGAAGTATTAAGGGTTGTCATAATTAAGCTGATACCACTTCAGACTTTGC -TCTACTTCTGTCTTTCATTGGTTTAGTAAAGTCTGTCCATTCGTCGAGACCGTCTTTTGC -AGCCTCATTCTACCAACTGCTCCGACTCTTAGTCTGCTTCTCCCAGCGTTATAACAAGAG -GCATTTTGTCATCCTTAAAACAATAATAAAGAACTCGGAGCACTGATATAATGACTGAAT -TAGAACCGCTTAAAAATACAACGAATAGATAAGACTATCGGATAAGATCTAATATGTAGT -GATTAAGCCCTTTATTAATTAATAATAGTTACCCTTTCTGATGTAACGCGACATATTACG -ATTTAGTGGCACGTCTGAATTGCAAAGCAGATCTCTACCCGATTTTTATTATAAATCCCG -TATACATCTTGACTTGAGTAATTGTTCATCTTTTTATATCTCTTCGTACTACAAATAATT -AATATCTCAACCCGTATTGTGTGATTCTAATTACCAACAGAATACGAGGAGGTTTTTGCT -TAGGGCCATATATAATGAATCTATCTCGTTTATTCGCGGAACCCGAGATAACATTACGAT -GTAACTATTTTAGAGAACTTAATACAAGAAACATTGCTGATTACTCATAACTAAATGCTT -GGTAATATATCCTCAGTGCCCCTACCATCTTTTACGCAGGGATGTAATTACTTAGGATTC -ATTGTGTAAGAATTACAATGAACGATGGATATGAAGGCATGTTGCGAGGTGTTCCTTGGT -ATGTGAAGTTCGCAGGGCAACAAAAATTTCGCAGAATAGGCCTCAAAGTATTGGTAAAGA -AGACAACTAATCATCACGAGCTTCTGATATCAATACGAACGAGTCCTGTGATGGATGAAA -GAAAGTCGTATCGAAAATGTCAAGAGTCTGCCCAATGTAACTTACTTCAAAAAATAACGC -TTCCGCCAAGTACGTTCGAATAAACGTAATTTTAAAAATACATAAGGGGTGTTAGAAAGT -AAGCGACGGGATATAAGTTAGACTCAAGATTCCGCCGTAAAACGAGACTGATTCCGAAGA -TTGTTCGTGGATCTGGTCATGACTTTCACTGAGTAAGGAGTTTCGACATATGTCAATAAA -CACAAAAATAGAAGCTATTCGATCTGAAAAATATTAGGACAAGAAACTATCTCACGCTAG -CCCAGAATATTCACTCACCCACGGGCGATACTAAAGCACTATATAGTCGCGTGATTACTA -TACATATGGTACACATAAGAATCACGATCAGGTTCTCAATTTTCAACAATATATGTTTAT -TTGCATAGGTAATATTAGGCCTTTAAGAGAAGGATGGGTGAGATACTCCGGGGATGGCGG -CAATAAAGAAAAACACGATATGAGTAATAGGATCCTAATATCTTGGCGAGAGACTTAAGG -TACGAATTTTGCGCAATCTATTTTTTACTTGGCCAGAATTCATGTATGGTATAAGTACGA -ACTTTTTTGATCACTTTCATGGCTACCTGATTAGGATAGTTTGAGGAATTTCCCAAATAT -ACCGATTTAATATACACTAGGGCTTGTCACTTTGAGTCAGAAAAAGAATATAATTACTTA -GGGTAATGCTGCATACATATTCTTATATTGCAAAGGTTCTCTGGGTAATCTTGAGCCTTC -ACGATACCTGGTGAAGTGTT diff --git a/test/pending/shootout/revcomp.scala-2.scala b/test/pending/shootout/revcomp.scala-2.scala deleted file mode 100644 index 03fb25af1b..0000000000 --- a/test/pending/shootout/revcomp.scala-2.scala +++ /dev/null @@ -1,92 +0,0 @@ -/* The Computer Language Shootout - http://shootout.alioth.debian.org/ - contributed by Isaac Gouy -*/ - -import java.io._ -import scala.collection.mutable.Stack - -object revcomp { - - val IUB = IUBCodeComplements - - def IUBCodeComplements() = { - val code = "ABCDGHKMNRSTVWYabcdghkmnrstvwy".getBytes - val comp = "TVGHCDMKNYSABWRTVGHCDMKNYSABWR".getBytes - val a: Array[Byte] = new Array( 'z'.toByte ) - - for (indexValue <- code zip comp) - indexValue match { case (i,v) => a(i) = v } - - a - } - - - type LineStack = Stack[Array[Byte]] - - def main(args: Array[String]) = { - val r = new BufferedReader(new InputStreamReader(System.in)) - val w = new BufferedOutputStream(System.out) - - var lines: LineStack = new Stack - var desc = "" - - var line = r.readLine - while (line != null) { - val c = line.charAt(0) - if (c == '>'){ - if (desc.length > 0){ - complementReverseWrite(desc, lines, w) - lines = new Stack - } - desc = line - } else { - if (c != ';') lines += line.getBytes - } - line = r.readLine - } - r.close - - if (desc.length > 0) complementReverseWrite(desc, lines, w) - w.close - } - - - def complementReverseWrite(desc: String, lines: LineStack, - w: BufferedOutputStream) = { - - def inplaceComplementReverse(b: Array[Byte]) = { - var i = 0 - var j = b.length - 1 - while (i < j){ - val swap = b(i) - b(i) = IUB( b(j) ) - b(j) = IUB( swap ) - i = i + 1 - j = j - 1 - } - if (i == j) b(i) = IUB( b(i) ) - } - - val nl = '\n'.toByte - w.write(desc.getBytes); w.write(nl) - - val n = 60 - val k = if (lines.isEmpty) 0 else lines.top.length - val isSplitLine = k < n - var isFirstLine = true - - while (!lines.isEmpty) { - val line = lines.pop - inplaceComplementReverse(line) - - if (isSplitLine){ - if (isFirstLine){ w.write(line); isFirstLine = false } - else { w.write(line,0,n-k); w.write(nl); w.write(line,n-k,k) } - } - else { w.write(line); w.write(nl) } - } - if (isSplitLine && !isFirstLine) w.write(nl) - } - -} diff --git a/test/pending/shootout/revcomp.scala-2.scala.runner b/test/pending/shootout/revcomp.scala-2.scala.runner deleted file mode 100644 index f51d6170c8..0000000000 --- a/test/pending/shootout/revcomp.scala-2.scala.runner +++ /dev/null @@ -1,6 +0,0 @@ -object Test extends Application { - for(n <- List(25000,250000,2500000)) { - System.setIn(new java.io.FileInputStream(System.getProperty("partest.cwd")+"/revcomp-input"+n+".txt")) - revcomp.main(Array(n.toString)) - } -} diff --git a/test/pending/shootout/revcomp.scala-3.check b/test/pending/shootout/revcomp.scala-3.check deleted file mode 100644 index 14d792ade8..0000000000 --- a/test/pending/shootout/revcomp.scala-3.check +++ /dev/null @@ -1,171 +0,0 @@ ->ONE Homo sapiens alu -CGGAGTCTCGCTCTGTCGCCCAGGCTGGAGTGCAGTGGCGCGATCTCGGCTCACTGCAAC -CTCCGCCTCCCGGGTTCAAGCGATTCTCCTGCCTCAGCCTCCCGAGTAGCTGGGATTACA -GGCGCGCGCCACCACGCCCGGCTAATTTTTGTATTTTTAGTAGAGACGGGGTTTCACCAT -GTTGGCCAGGCTGGTCTCGAACTCCTGACCTCAGGTGATCCGCCCGCCTCGGCCTCCCAA -AGTGCTGGGATTACAGGCGTGAGCCACCGCGCCCGGCCTTTTTGAGACGGAGTCTCGCTC -TGTCGCCCAGGCTGGAGTGCAGTGGCGCGATCTCGGCTCACTGCAACCTCCGCCTCCCGG -GTTCAAGCGATTCTCCTGCCTCAGCCTCCCGAGTAGCTGGGATTACAGGCGCGCGCCACC -ACGCCCGGCTAATTTTTGTATTTTTAGTAGAGACGGGGTTTCACCATGTTGGCCAGGCTG -GTCTCGAACTCCTGACCTCAGGTGATCCGCCCGCCTCGGCCTCCCAAAGTGCTGGGATTA -CAGGCGTGAGCCACCGCGCCCGGCCTTTTTGAGACGGAGTCTCGCTCTGTCGCCCAGGCT -GGAGTGCAGTGGCGCGATCTCGGCTCACTGCAACCTCCGCCTCCCGGGTTCAAGCGATTC -TCCTGCCTCAGCCTCCCGAGTAGCTGGGATTACAGGCGCGCGCCACCACGCCCGGCTAAT -TTTTGTATTTTTAGTAGAGACGGGGTTTCACCATGTTGGCCAGGCTGGTCTCGAACTCCT -GACCTCAGGTGATCCGCCCGCCTCGGCCTCCCAAAGTGCTGGGATTACAGGCGTGAGCCA -CCGCGCCCGGCCTTTTTGAGACGGAGTCTCGCTCTGTCGCCCAGGCTGGAGTGCAGTGGC -GCGATCTCGGCTCACTGCAACCTCCGCCTCCCGGGTTCAAGCGATTCTCCTGCCTCAGCC -TCCCGAGTAGCTGGGATTACAGGCGCGCGCCACCACGCCCGGCTAATTTTTGTATTTTTA -GTAGAGACGGGGTTTCACCATGTTGGCCAGGCTGGTCTCGAACTCCTGACCTCAGGTGAT -CCGCCCGCCTCGGCCTCCCAAAGTGCTGGGATTACAGGCGTGAGCCACCGCGCCCGGCCT -TTTTGAGACGGAGTCTCGCTCTGTCGCCCAGGCTGGAGTGCAGTGGCGCGATCTCGGCTC -ACTGCAACCTCCGCCTCCCGGGTTCAAGCGATTCTCCTGCCTCAGCCTCCCGAGTAGCTG -GGATTACAGGCGCGCGCCACCACGCCCGGCTAATTTTTGTATTTTTAGTAGAGACGGGGT -TTCACCATGTTGGCCAGGCTGGTCTCGAACTCCTGACCTCAGGTGATCCGCCCGCCTCGG -CCTCCCAAAGTGCTGGGATTACAGGCGTGAGCCACCGCGCCCGGCCTTTTTGAGACGGAG -TCTCGCTCTGTCGCCCAGGCTGGAGTGCAGTGGCGCGATCTCGGCTCACTGCAACCTCCG -CCTCCCGGGTTCAAGCGATTCTCCTGCCTCAGCCTCCCGAGTAGCTGGGATTACAGGCGC -GCGCCACCACGCCCGGCTAATTTTTGTATTTTTAGTAGAGACGGGGTTTCACCATGTTGG -CCAGGCTGGTCTCGAACTCCTGACCTCAGGTGATCCGCCCGCCTCGGCCTCCCAAAGTGC -TGGGATTACAGGCGTGAGCCACCGCGCCCGGCCTTTTTGAGACGGAGTCTCGCTCTGTCG -CCCAGGCTGGAGTGCAGTGGCGCGATCTCGGCTCACTGCAACCTCCGCCTCCCGGGTTCA -AGCGATTCTCCTGCCTCAGCCTCCCGAGTAGCTGGGATTACAGGCGCGCGCCACCACGCC -CGGCTAATTTTTGTATTTTTAGTAGAGACGGGGTTTCACCATGTTGGCCAGGCTGGTCTC -GAACTCCTGACCTCAGGTGATCCGCCCGCCTCGGCCTCCCAAAGTGCTGGGATTACAGGC -GTGAGCCACCGCGCCCGGCC ->TWO IUB ambiguity codes -TAGGDHACHATCRGTRGVTGAGWTATGYTGCTGTCABACDWVTRTAAGAVVAGATTTNDA -GASMTCTGCATBYTTCAAKTTACMTATTACTTCATARGGYACMRTGTTTTYTATACVAAT -TTCTAKGDACKADACTATATNTANTCGTTCACGBCGYSCBHTANGGTGATCGTAAAGTAA -CTATBAAAAGATSTGWATBCSGAKHTTABBAACGTSYCATGCAAVATKTSKTASCGGAAT -WVATTTNTCCTTCTTCTTDDAGTGGTTGGATACVGTTAYMTMTBTACTTTHAGCTAGBAA -AAGAGKAAGTTRATWATCAGATTMDDTTTAAAVAAATATTKTCYTAAATTVCNKTTRACG -ADTATATTTATGATSADSCAATAWAGCGRTAGTGTAAGTGACVGRADYGTGCTACHVSDT -CTVCARCSYTTAATATARAAAATTTAATTTACDAATTGBACAGTAYAABATBTGCAGBVG -TGATGGDCAAAATBNMSTTABKATTGGSTCCTAGBTTACTTGTTTAGTTTATHCGATSTA -AAGTCGAKAAASTGTTTTAWAKCAGATATACTTTTMTTTTGBATAGAGGAGCMATGATRA -AAGGNCAYDCCDDGAAAGTHGBTAATCKYTBTACBGTBCTTTTTGDTAASSWTAAWAARA -TTGGCTAAGWGRADTYACATAGCTCBTAGATAWAGCAATNGTATMATGTTKMMAGTAWTC -CCNTSGAAWATWCAAAAMACTGAADNTYGATNAATCCGAYWNCTAACGTTAGAGDTTTTC -ATCTGGKRTAVGAABVCTGWGBTCTDVGKATTBTCTAAGGVADAAAVWTCTAGGGGAGGG -TTAGAACAATTAAHTAATNAAATGCATKATCTAAYRTDTCAGSAYTTYHGATRTTWAVTA -BGNTCDACAGBCCRCAGWCRTCABTGMMAWGMCTCAACCGATRTGBCAVAATCGTDWDAA -CAYAWAATWCTGGTAHCCCTAAGATAACSCTTAGTGSAACAWTBGTCDTTDGACWDBAAC -HTTTNGSKTYYAAYGGATNTGATTTAARTTAMBAATCTAAGTBTCATYTAACTTADTGTT -TCGATACGAAHGGCYATATACCWDTKYATDCSHTDTCAAAATGTGBACTGSCCVGATGTA -TCMMAGCCTTDAAABAATGAAGAGTAACTHATMGVTTAATAACCCGGTTVSANTGCAATT -GTGAGATTTAMGTTTAMAAYGCTGACAYAAAAAGGCACAMYTAAGVGGCTGGAABVTACG -GATTSTYGTBVAKTATWACCGTGTKAGTDTGTATGTTTAAAGGAAAAAGTAACATARAAA -GGTYCAMNYAAABTATAGNTSATANAGTCATCCTATWADKAACTRGTMSACDGTATSAYT -AAHSHGTAABYGACTYTATADTGSTATAGAGAAATCGNTAAAGGAAATCAGTTGTNCYMV -TNACDRTATBNATATASTAGAAMSCGGGANRCKKMCAAACATTNAGTCTRMAATBMTACC -CGTACTTCTBGDSYAATWGAAAATGACADDCHAKAAAYATATTKTTTTCACANACWAGAA -AKATCCTTATTAYKHKCTAAACARTATTTTDATBTVWCYGCAATACTAGGKAAASTTDGA -MGGCHTTHAATVCAHDRYAGGRCTATACGTCMAGAGAGCTBTHGNACARTCCBDCTAAGA -GCGGCTTTARTAAAGAATCCNAGTAWBTGACTTGAATTACWTVACAGAAABCAATNAAAC -CGTNTRANTTGAYCMAWBADTANABRGGTKTHTWTAGTTVCTMBKTAGMTVKCCAGCANT -TVAGSWTTAGCCGCRHTTTCCTTHNTATTAAGAAGAATAGGMTRAARTCTABGTACDTTT -TATAAVDHAHTATAGATCCTAGTAAGYTWATDWCATGAGGGATAGTAAMDMNGBASTWAM -TSTATRBAYDABATGTATATYCGCACTGTTTTAACMCWBTATAWAGTATBTSTATVTTAR -CCTMTTAAKADATCAACTAATYTSVTAKGDATTATGCKTCAYCAKAATACTTKAANGAGT -ATTSDAGATCGGAAATACTTAAYAAVGTATMCGCTTGTGTDCTAATYTATTTTATTTWAA -CAGWRCTATGTAGMTGTTTGTTYKTNGTTKTCAGAACNTRACCTACKTGSRATGTGGGGG -CTGTCATTAAGTAAATNGSTTABCCCCTCGCAGCTCWHTCGCGAAGCAVATGCKACGHCA -ACAKTTAATAACASAAADATTWNYTGTAATTGTTCGTMHACHTWATGTGCWTTTTGAAHY -ACTTTGTAYAMSAAACTTAADAAATATAGTABMATATYAATGSGGTAGTTTGTGTBYGGT -TWSGSVGWMATTDMTCCWWCABTCSVACAGBAATGTTKATBGTCAATAATCTTCTTAAAC -ARVAATHAGYBWCTRWCABGTWWAATCTAAGTCASTAAAKTAAGVKBAATTBGABACGTA -AGGTTAAATAAAAACTRMDTWBCTTTTTAATAAAAGATMGCCTACKAKNTBAGYRASTGT -ASSTCGTHCGAAKTTATTATATTYTTTGTAGAACATGTCAAAACTWTWTHGKTCCYAATA -AAGTGGAYTMCYTAARCSTAAATWAKTGAATTTRAGTCTSSATACGACWAKAASATDAAA -TGYYACTSAACAAHAKTSHYARGASTATTATTHAGGYGGASTTTBGAKGATSANAACACD -TRGSTTRAAAAAAAACAAGARTCVTAGTAAGATAWATGVHAAKATWGAAAAGTYAHVTAC -TCTGRTGTCAWGATRVAAKTCGCAAVCGASWGGTTRTCSAMCCTAACASGWKKAWDAATG -ACRCBACTATGTGTCTTCAAAHGSCTATATTTCGTVWAGAAGTAYCKGARAKSGKAGTAN -TTTCYACATWATGTCTAAAADMDTWCAATSTKDACAMAADADBSAAATAGGCTHAHAGTA -CGACVGAATTATAAAGAHCCVAYHGHTTTACATSTTTATGNCCMTAGCATATGATAVAAG ->THREE Homo sapiens frequency -ATATTTATCTTTTCACTTCCTACATTGGTCAGACCATTATTCGACACGTGGCGTCATTTT -GTCATACCGGGTAATGTTGGAAACAAAACGTACTGATAAAATACTGAGTTGTAAACTCTA -ATCAGATAACGCGCTTGGATATTAAGATTCACACAGGGGTTTCGGCTGTAAAAAAACTTG -TGGAGCTGTTCTGGGACAGATAAGTTGTACCTCGTACTTAGCTAATTAATGAACCAACTG -ATTACGATAGAACAATTCTGAGGCCGCCAGGACAGCCAAATTTTAATCTTATAAAGCTGG -AAACAGCCGGTATTAGCTTCTCGCATACTTTGCCTGCATTGGTACCTTACAGATATCAGC -GTAGTCATATACACCTCGGTCTCAGCTAAGCTTGTATCTCTTAGAGTAGTTCAAAGATAG -TGGACAATACCTGTGGAATCGATTGCAGATATGGATTTATTTAACTACTGAGTCTCATTC -ACAAGCTAAGCAAGGAGCACGTTTTGGTGCCGGCATACCGATTTGCTATCATGTCAGCAA -ATTTGCGTTGTATTCCTAGTTGCACCCATTAAGGCCACACTCCGAACCTAATTATTACAT -CGCAAAGACATGTACGAAGGACCCGATGTCGAATAGAAGGGAGGACTGTTCATTGGAAGC -TAGACCAGAGGAATCGCAAAGATGCAACTCTTACAATAAAAATCTAATTTCAGTCAACAC -GCAATTTCTATAAGGTTTCCGATAATAATGAACCGTCTTCCACAGGGGAATTTGCCATGC -TCGTAAAAGTAGTTAATCCAAGTAGAAGAAATTTTGATAATGTTTTAAGTTGGCACGAAG -GAATTCAGAGAGATCTTACCTAACAAAGGCATTAGTAGATGTTCCTTGGTTCACACTCGG -TCAATCAGAGCACATACTACGGGCGATACCGGGAATGACACAACATCAATGAGATTGTTA -AGTGAGGTAATTGACTTTAGAGGACTCGATCAGTATACTGTCACTATGAACATCGTATTA -ATTGTTATCCGATATATACACCACCGATTTGCTTGTGCAAGGTTACAGACCCATTCGATA -AATACAAACACGGAGCGATATTATTTAAGGAGTGCTGTCTTCAAAAGAATTATTCCCACA -CCGACATAAGAACTTCGCTCCGTCATTCCAGATTTAAATAACATAACGTAACGCTTTGCT -GATAACATAACATAACCGAGAATTTGCTTAGGAAATTTGGAGCAATATTGCATTGTTTCT -CAGTCATCACAAGGCCCGCCAAAGAACTCTGAGAATCAGGATTCAACATGATTGGTAAGA -CTCTATATATATAACTTAATTCTTGTGTCCGGAGATAGAAAGAGGACGAGAGATACTACG -AAAGAAAGTGTACTTCGATGTATCAATTCAGACGCCTTCTCTATCATCAACATTATAGGT -CTCGTATATGCTCGGCGCGATCTGCTTCTCTCCGCCAATAGCCCCATAGTGTATTTCAAG -CGCAGTAACAGTGAAATCGTTACGAAGGTAGGGATGTTGCTTATAATTGTCGTAACTTAT -CGCTTATGTATCTTTCAAGAATGAACGGCAGCATATACATACGTTCTACCTTTAGCTACA -AAGCATCCATATACTCCCTCTCATGATTGAAACTCTTCCCTATTTTGTAGCCAATAGTGA -AAGCGTATTAGTATAAATTCGTCGGTTTTTCACTCGCAACTGTTATACTCTGCAAACAAA -CGAAAGCCTCATAGTACAAACCTAAAGCTACATACTTCATCATTGGCAGACCAGTGGCGG -TATTTCTACGGAAGCATCACTATAGATATAAAGTTTCCCTTCATGTACGTCTGTTAACCA -TATCACAAGAAACTGCTATCTCTGTCACGTAACAATTCACGCGCCTTATCGCCAAATGTT -CATATATGCGCGGTATACGTATGAACGAATACTAATTAGTATAACGGAGGATTCACGGGA -GGGATACTTGGGGCATTTATAAATCGTCTAAAAATTTTCTATCAGCACTTGCGGGTTATA -GTGGATTACTAGGCAACATAATATTCTGTATTGGTCCAAATGACGCTATAGATAAATTAG -CAAAATACATTGTTTCCATTTATGTAAGTCGAAACTCCAGGACTCCCGGGAACCAGTTAA -ACCGTCTGGAAAAGACACATTGTGAGCGGGACTTCAATGATAGCTTTCAATGAGCTTCTC -ATGCTTGGGGTCTGTACATATATGTTGGCGAAATTATCGTCTGTATTCTGTTATGCTTTG -ATCATGGGTTATTAGTATAGTGTCCGGTTAAGTACCAATACCGCTAGAGACCCGACCTAA -GTCGATAACTAACGATCATCGACGTAAGGATCGTCTCGATCAGTACTTCAGTCTAGATCT -GGGAATAGTAACTCGTTAGTGAACTATGTCGTGTCATAACTCTAAAATGCAATCAAATCT -TATTATTGAGTATTGATTATATAAAGCATCCGCTTAGCTTTACCCTCAAATGTTATATGC -AATTTAAAGCGCTTGATATCGTCTACTCAAGTTCAGGTTTCACATGGCCGCAACGTGACG -TTATTAGAGGTGGGTCATCATCTCTGAGGCTAGTGATGTTGAATACTCATTGAATGGGAA -GTGGAATACCATGCTCGTAGGTAACAGCATGACCTATAAAATATACTATGGGTGTGTGGT -AGATCAATATTGTTCAAGCATATCGTAACAATAACGGCTGAAATGTTACTGACATGAAAG -AGGGAGTCCAAACCATTCTAACAGCTGATCAAGTCGTCTAAAAACGCCTGGTTCAGCCTT -AAGAGTTATAAGCCAGACAAATTGTATCAATAGAGAATCCGTAAATTCCTCGGCCAACCT -CTTGCAAAGACATCACTATCAATATACTACCGTGATCTTAATTAGTGAACTTATATAAAT -ATCTACAACCAGATTCAACGGAAAAGCTTTAGTGGATTAGAAATTGCCAAGAATCACATT -CATGTGGGTTCGAATGCTTTAGTAATACCATTTCGCCGAGTAGTCACTTCGCTGAACTGT -CGTAAATTGCTATGACATAATCGAAAAGGATTGTCAAGAGTCGATTACTGCGGACTAATA -ATCCCCACGGGGGTGGTCTCATGTCTCCCCAGGCGAGTGGGGACGGTTGATAAACACGCT -GCATCGCGGACTGATGTTCCCAGTATTACATAGTCACATTGGATTGCGAGTAGTCTACCT -ATTTATGAGCGAGAGATGCCTCTAACTACTTCGACTTTTAAAACCTTTCCACGCCAGTAT -TCGGCGAAAGGGAAGTATTAAGGGTTGTCATAATTAAGCTGATACCACTTCAGACTTTGC -TCTACTTCTGTCTTTCATTGGTTTAGTAAAGTCTGTCCATTCGTCGAGACCGTCTTTTGC -AGCCTCATTCTACCAACTGCTCCGACTCTTAGTCTGCTTCTCCCAGCGTTATAACAAGAG -GCATTTTGTCATCCTTAAAACAATAATAAAGAACTCGGAGCACTGATATAATGACTGAAT -TAGAACCGCTTAAAAATACAACGAATAGATAAGACTATCGGATAAGATCTAATATGTAGT -GATTAAGCCCTTTATTAATTAATAATAGTTACCCTTTCTGATGTAACGCGACATATTACG -ATTTAGTGGCACGTCTGAATTGCAAAGCAGATCTCTACCCGATTTTTATTATAAATCCCG -TATACATCTTGACTTGAGTAATTGTTCATCTTTTTATATCTCTTCGTACTACAAATAATT -AATATCTCAACCCGTATTGTGTGATTCTAATTACCAACAGAATACGAGGAGGTTTTTGCT -TAGGGCCATATATAATGAATCTATCTCGTTTATTCGCGGAACCCGAGATAACATTACGAT -GTAACTATTTTAGAGAACTTAATACAAGAAACATTGCTGATTACTCATAACTAAATGCTT -GGTAATATATCCTCAGTGCCCCTACCATCTTTTACGCAGGGATGTAATTACTTAGGATTC -ATTGTGTAAGAATTACAATGAACGATGGATATGAAGGCATGTTGCGAGGTGTTCCTTGGT -ATGTGAAGTTCGCAGGGCAACAAAAATTTCGCAGAATAGGCCTCAAAGTATTGGTAAAGA -AGACAACTAATCATCACGAGCTTCTGATATCAATACGAACGAGTCCTGTGATGGATGAAA -GAAAGTCGTATCGAAAATGTCAAGAGTCTGCCCAATGTAACTTACTTCAAAAAATAACGC -TTCCGCCAAGTACGTTCGAATAAACGTAATTTTAAAAATACATAAGGGGTGTTAGAAAGT -AAGCGACGGGATATAAGTTAGACTCAAGATTCCGCCGTAAAACGAGACTGATTCCGAAGA -TTGTTCGTGGATCTGGTCATGACTTTCACTGAGTAAGGAGTTTCGACATATGTCAATAAA -CACAAAAATAGAAGCTATTCGATCTGAAAAATATTAGGACAAGAAACTATCTCACGCTAG -CCCAGAATATTCACTCACCCACGGGCGATACTAAAGCACTATATAGTCGCGTGATTACTA -TACATATGGTACACATAAGAATCACGATCAGGTTCTCAATTTTCAACAATATATGTTTAT -TTGCATAGGTAATATTAGGCCTTTAAGAGAAGGATGGGTGAGATACTCCGGGGATGGCGG -CAATAAAGAAAAACACGATATGAGTAATAGGATCCTAATATCTTGGCGAGAGACTTAAGG -TACGAATTTTGCGCAATCTATTTTTTACTTGGCCAGAATTCATGTATGGTATAAGTACGA -ACTTTTTTGATCACTTTCATGGCTACCTGATTAGGATAGTTTGAGGAATTTCCCAAATAT -ACCGATTTAATATACACTAGGGCTTGTCACTTTGAGTCAGAAAAAGAATATAATTACTTA -GGGTAATGCTGCATACATATTCTTATATTGCAAAGGTTCTCTGGGTAATCTTGAGCCTTC -ACGATACCTGGTGAAGTGTT diff --git a/test/pending/shootout/revcomp.scala-3.scala b/test/pending/shootout/revcomp.scala-3.scala deleted file mode 100644 index 39a0409127..0000000000 --- a/test/pending/shootout/revcomp.scala-3.scala +++ /dev/null @@ -1,147 +0,0 @@ -/* The Computer Language Shootout - http://shootout.alioth.debian.org/ - contributed by Isaac Gouy -*/ - -import java.io._ -import scala.collection.mutable.Stack - -object revcomp { - def main(args: Array[String]) = { - val out = new FastaOutputStream(System.out) - val in = new FastaInputStream(System.in) - - out.writeReverseComplement( in.readSequenceStack ) - out.writeReverseComplement( in.readSequenceStack ) - out.writeReverseComplement( in.readSequenceStack ) - - in.close - out.close - } -} - - -trait FastaByteStream { - val nl = '\n'.toByte - - type Line = Array[Byte] - type LineStack = Stack[Line] -} - - -// extend the Java BufferedInputStream class - -final class FastaInputStream(in: InputStream) - extends BufferedInputStream(in) with FastaByteStream { - - val gt = '>'.toByte - val sc = ';'.toByte - - def readSequenceStack(): Tuple2[Line,LineStack] = { - var header: Line = null - val lines: LineStack = new Stack - - var line = readLine() - while (line != null) { - val c = line(0) - if (c == gt){ // '>' - if (header == null){ - header = line - } else { - pos = pos - line.length - 1 // reposition to start of line - return (header,lines) - } - } else { - if (c != sc) lines push line // ';' - } - line = readLine() - } - return (header,lines) - } - - def readLine() = { - var bytes: Line = null - if (in == null) bytes - else { - mark(128) // mark the start of the line - if (count == 0) read() // fill buffer - - var i = markpos - while (i < count && buf(i) != nl) i = i + 1 - - if (i >= count){ // line extends past end of buffer - pos = i; read(); i = pos; // fill buffer again - while (i < count && buf(i) != nl) i = i + 1 - } - - if (i < count){ - bytes = new Array(i - markpos) - System.arraycopy(buf, markpos, bytes, 0, i - markpos); - pos = i+1 - } - } - bytes - } -} - - -// extend the Java BufferedOutputStream class - -final class FastaOutputStream(in: OutputStream) - extends BufferedOutputStream(in) with FastaByteStream { - - private val IUB = IUBCodeComplements - - private def IUBCodeComplements() = { - val code = "ABCDGHKMNRSTVWYabcdghkmnrstvwy".getBytes - val comp = "TVGHCDMKNYSABWRTVGHCDMKNYSABWR".getBytes - val iub: Array[Byte] = new Array( 'z'.toByte ) - - for (indexValue <- code zip comp) - indexValue match { case (i,v) => iub(i) = v } - - iub - } - - def writeReverseComplement(sequence: Tuple2[Line,LineStack]) = { - - def inplaceComplementReverse(b: Array[Byte]) = { - var i = 0 - var j = b.length - 1 - while (i < j){ - val swap = b(i) - b(i) = IUB( b(j) ) - b(j) = IUB( swap ) - i = i + 1 - j = j - 1 - } - if (i == j) b(i) = IUB( b(i) ) - } - - sequence match { - case (header,lines) => { - - write(header); write(nl) - - val k = if (lines.isEmpty) 0 else lines.top.length - val LineLength = 60 - val isSplitLine = k < LineLength - var isFirstLine = true - - while (!lines.isEmpty) { - val line = lines.pop - inplaceComplementReverse(line) - - if (isSplitLine){ - if (isFirstLine){ write(line); isFirstLine = false } - else { write(line,0,LineLength-k); write(nl); write(line,LineLength-k,k) } - } - else { write(line); write(nl) } - } - - if (isSplitLine && !isFirstLine) write(nl) - } - } - } - -} diff --git a/test/pending/shootout/revcomp.scala-3.scala.runner b/test/pending/shootout/revcomp.scala-3.scala.runner deleted file mode 100644 index f51d6170c8..0000000000 --- a/test/pending/shootout/revcomp.scala-3.scala.runner +++ /dev/null @@ -1,6 +0,0 @@ -object Test extends Application { - for(n <- List(25000,250000,2500000)) { - System.setIn(new java.io.FileInputStream(System.getProperty("partest.cwd")+"/revcomp-input"+n+".txt")) - revcomp.main(Array(n.toString)) - } -} diff --git a/test/pending/shootout/sieve.scala b/test/pending/shootout/sieve.scala deleted file mode 100644 index b494980ee4..0000000000 --- a/test/pending/shootout/sieve.scala +++ /dev/null @@ -1,43 +0,0 @@ -/* The Computer Language Shootout - http://shootout.alioth.debian.org/ - contributed by Isaac Gouy (Scala novice) -*/ - -object sieve { - def main(args: Array[String]) = { - var n = toPositiveInt(args); - val start = 2; - val stop = 8192; - val isPrime = new Array[Boolean](stop+1); - var count: Int = 0; - - while (n>0) { - count = 0; - - for (i <- Iterator.range(start,stop+1)) - isPrime(i)=true; - - for (i <- Iterator.range(start,stop+1)) { - if( isPrime(i) ) { - var k = i+i; - while (k<=stop) { isPrime(k)=false; k=k+i; } - count = count+1; - } - } - n=n-1; - } - - Console.println("Count: " + count); - } - - - private def toPositiveInt(s: Array[String]) = { - val i = - try { Integer.parseInt(s(0)); } - catch { case _ => 1 } - if (i>0) i; else 1; - } -} - - - diff --git a/test/pending/shootout/sieve.scala.runner b/test/pending/shootout/sieve.scala.runner deleted file mode 100644 index 893c3abe90..0000000000 --- a/test/pending/shootout/sieve.scala.runner +++ /dev/null @@ -1,3 +0,0 @@ -object Test extends Application { - for(n <- List(300,600,900,1200)) sieve.main(Array(n.toString)) -} diff --git a/test/pending/specialized/SI-5005.check b/test/pending/specialized/SI-5005.check deleted file mode 100644 index 81e8342dad..0000000000 --- a/test/pending/specialized/SI-5005.check +++ /dev/null @@ -1,33 +0,0 @@ -[[syntax trees at end of specialize]] // newSource1 -package <empty> { - class C2[@specialized(scala.Boolean) U >: Nothing <: Any] extends Object { - def <init>(): C2[U] = { - C2.super.<init>(); - () - }; - def apply(x: U): U = x; - <specialized> def apply$mcZ$sp(x: Boolean): Boolean = C2.this.apply(x.asInstanceOf[U]()).asInstanceOf[Boolean]() - }; - class B extends Object { - def <init>(): B = { - B.super.<init>(); - () - }; - new C2$mcZ$sp().apply$mcZ$sp(true) - }; - <specialized> class C2$mcZ$sp extends C2[Boolean] { - <specialized> def <init>(): C2$mcZ$sp = { - C2$mcZ$sp.super.<init>(); - () - }; - @inline final override <specialized> def apply(x: Boolean): Boolean = C2$mcZ$sp.this.apply$mcZ$sp(x); - @inline final override <specialized> def apply$mcZ$sp(x: Boolean): Boolean = x - } -} - -[log inliner] Analyzing C2.apply count 0 with 1 blocks -[log inliner] C2.apply blocks before inlining: 1 (2) after: 1 (2) -[log inliner] Analyzing C2.apply$mcZ$sp count 0 with 1 blocks -[log inliner] C2.apply$mcZ$sp blocks before inlining: 1 (8) after: 1 (8) -[log inliner] Not inlining into apply because it is marked @inline. -[log inliner] Not inlining into apply$mcZ$sp because it is marked @inline. diff --git a/test/pending/specialized/SI-5005.scala b/test/pending/specialized/SI-5005.scala deleted file mode 100644 index 280bf0aa2d..0000000000 --- a/test/pending/specialized/SI-5005.scala +++ /dev/null @@ -1,36 +0,0 @@ -import scala.tools.partest._ -import java.io._ - - - -// I think this may be due to a bug in partest where it uses some other version -// of the scala-library.jar - _hashCode is in line 202 currently, not 212! -// -// [partest] testing: [...]/files/specialized/SI-5005.scala [FAILED] -// [partest] java.lang.NoClassDefFoundError: scala/util/MurmurHash3$ -// [partest] java.lang.NoClassDefFoundError: scala/util/MurmurHash3$ -// [partest] at scala.runtime.ScalaRunTime$._hashCode(ScalaRunTime.scala:212) -object Test extends DirectTest { - - override def extraSettings: String = "-usejavacp -Xprint:spec -optimize -Ylog:inliner -d " + testOutput.path - - override def code = """ - class C2[@specialized(Boolean) U]() { - @inline final def apply(x: U): U = x - } - - class B { - (new C2[Boolean]())(true) - } - """ - - override def show(): Unit = { - // redirect err to out, for inliner log - val prevErr = System.err - System.setErr(System.out) - compile() - System.setErr(prevErr) - } - - override def isDebug = false // so we don't get the newSettings warning -} diff --git a/test/pending/t7629-view-bounds-removal.check b/test/pending/t7629-view-bounds-removal.check deleted file mode 100644 index dc52105eaf..0000000000 --- a/test/pending/t7629-view-bounds-removal.check +++ /dev/null @@ -1,9 +0,0 @@ -t7629-view-bounds-removal.scala:2: error: View bounds have been removed. Use an implicit parameter instead. -Example: Instead of `def f[A <% Int](a: A)` use `def f[A](a: A)(implicit ev: A => Int)`. - def f[A <% Int](a: A) = null - ^ -t7629-view-bounds-removal.scala:3: error: View bounds have been removed. Use an implicit parameter instead. -Example: Instead of `def f[A <% Int](a: A)` use `def f[A](a: A)(implicit ev: A => Int)`. - def g[C, B <: C, A <% B : Numeric](a: A) = null - ^ -two errors found diff --git a/test/pending/t7629-view-bounds-removal.flags b/test/pending/t7629-view-bounds-removal.flags deleted file mode 100644 index 29f4ede37a..0000000000 --- a/test/pending/t7629-view-bounds-removal.flags +++ /dev/null @@ -1 +0,0 @@ --Xfuture diff --git a/test/pending/t7629-view-bounds-removal.scala b/test/pending/t7629-view-bounds-removal.scala deleted file mode 100644 index a6ede1fcc3..0000000000 --- a/test/pending/t7629-view-bounds-removal.scala +++ /dev/null @@ -1,4 +0,0 @@ -object Test { - def f[A <% Int](a: A) = null - def g[C, B <: C, A <% B : Numeric](a: A) = null -} diff --git a/test/pending/typetags_typeof_x.check b/test/pending/typetags_typeof_x.check deleted file mode 100644 index 832a8bc63c..0000000000 --- a/test/pending/typetags_typeof_x.check +++ /dev/null @@ -1,8 +0,0 @@ -List[T] -C -Int -List[Any] -AnyRef{def x: Int} -Null -Nothing -Null diff --git a/test/pending/typetags_typeof_x.scala b/test/pending/typetags_typeof_x.scala deleted file mode 100644 index 08be6d4527..0000000000 --- a/test/pending/typetags_typeof_x.scala +++ /dev/null @@ -1,14 +0,0 @@ -import scala.reflect.runtime.universe._ - -object Test extends App { - def foo[T](x: T) = weakTypeOf(List(x)) - println(foo(2)) - locally { class C; println(weakTypeOf(new C)) } - - println(typeOf(2)) - println(typeOf(List(1, "1"))) - println(typeOf(new { def x = 2 })) - println(typeOf[Null]) - println(typeOf[Nothing]) - println(typeOf(null)) -}
\ No newline at end of file |