From 943fbb1363345fdaca55e5df95059e8ce8c1344b Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Sat, 2 Oct 2010 23:19:16 +0000 Subject: The next batch of tests put up a little more st... The next batch of tests put up a little more struggle, but only a little. See test/pending/pos/unappgadteval.scala (the changes for which were in the previous commit) for an example of a test which might be on to something. Any idea what it would take to get it working? // the key lines case i @ Suc() => { (y: Int) => y + 1 } // a = Int => Int case f @ Lam[b,c](x, e) => { (y: b) => eval(e, env.extend(x, y)) } // a = b=>c No review. --- test/pending/res/bug1092.res | 1 - test/pending/res/bug1092/A.scala | 4 ---- test/pending/res/bug1092/B.scala | 4 ---- test/pending/res/bug1092/C.scala | 6 ------ test/pending/res/bug830/Bad.scala | 11 ----------- test/pending/res/bug830/Good.scala | 11 ----------- test/pending/res/bug830A.res | 13 ------------- test/pending/res/bug830B.res | 13 ------------- test/pending/res/bug837.res | 3 --- test/pending/res/bug837/DataFlowAnalysis.scala | 17 ----------------- test/pending/res/bug837/DeadCode.scala | 6 ------ 11 files changed, 89 deletions(-) delete mode 100644 test/pending/res/bug1092.res delete mode 100644 test/pending/res/bug1092/A.scala delete mode 100644 test/pending/res/bug1092/B.scala delete mode 100644 test/pending/res/bug1092/C.scala delete mode 100644 test/pending/res/bug830/Bad.scala delete mode 100644 test/pending/res/bug830/Good.scala delete mode 100644 test/pending/res/bug830A.res delete mode 100644 test/pending/res/bug830B.res delete mode 100644 test/pending/res/bug837.res delete mode 100644 test/pending/res/bug837/DataFlowAnalysis.scala delete mode 100644 test/pending/res/bug837/DeadCode.scala (limited to 'test/pending/res') diff --git a/test/pending/res/bug1092.res b/test/pending/res/bug1092.res deleted file mode 100644 index 6deef8afd0..0000000000 --- a/test/pending/res/bug1092.res +++ /dev/null @@ -1 +0,0 @@ -bug1092/A.scala bug1092/B.scala bug1092/C.scala diff --git a/test/pending/res/bug1092/A.scala b/test/pending/res/bug1092/A.scala deleted file mode 100644 index 192e7afe11..0000000000 --- a/test/pending/res/bug1092/A.scala +++ /dev/null @@ -1,4 +0,0 @@ -object HolderA { - class A(a: Int) -} - diff --git a/test/pending/res/bug1092/B.scala b/test/pending/res/bug1092/B.scala deleted file mode 100644 index 5c80e8e84d..0000000000 --- a/test/pending/res/bug1092/B.scala +++ /dev/null @@ -1,4 +0,0 @@ -object HolderB { - import HolderA.A - trait B extends A -} diff --git a/test/pending/res/bug1092/C.scala b/test/pending/res/bug1092/C.scala deleted file mode 100644 index f961a93b5b..0000000000 --- a/test/pending/res/bug1092/C.scala +++ /dev/null @@ -1,6 +0,0 @@ -object C extends Application { - import HolderA.A - import HolderB.B - - println(new A(4) with B) -} diff --git a/test/pending/res/bug830/Bad.scala b/test/pending/res/bug830/Bad.scala deleted file mode 100644 index 17632290ff..0000000000 --- a/test/pending/res/bug830/Bad.scala +++ /dev/null @@ -1,11 +0,0 @@ -package test; -trait HasNodeXXX { - type Node <: NodeImpl; - trait NodeImpl; -} -trait ScalaFlowScannerZZZ extends HasNodeXXX { - type Node <: NodeImpl; - trait NodeImplA extends super.NodeImpl; - trait NodeImplB extends NodeImpl; - trait NodeImpl extends NodeImplA with NodeImplB; -} diff --git a/test/pending/res/bug830/Good.scala b/test/pending/res/bug830/Good.scala deleted file mode 100644 index 84789bfc47..0000000000 --- a/test/pending/res/bug830/Good.scala +++ /dev/null @@ -1,11 +0,0 @@ -package test; -trait HasNodeXXX { - type Node <: NodeImpl; - trait NodeImpl; -} -trait ScalaFlowScannerZZZ extends HasNodeXXX { - type Node <: NodeImpl; - trait NodeImplA extends super.NodeImpl; - trait NodeImplB extends super.NodeImpl; - trait NodeImpl extends NodeImplA with NodeImplB; -} diff --git a/test/pending/res/bug830A.res b/test/pending/res/bug830A.res deleted file mode 100644 index 421e1a2fee..0000000000 --- a/test/pending/res/bug830A.res +++ /dev/null @@ -1,13 +0,0 @@ -bug830/Good.scala -bug830/Bad.scala -bug830/Good.scala -bug830/Bad.scala -bug830/Good.scala -bug830/Bad.scala -bug830/Good.scala -bug830/Bad.scala -bug830/Good.scala -bug830/Bad.scala -bug830/Good.scala -bug830/Bad.scala -bug830/Good.scala diff --git a/test/pending/res/bug830B.res b/test/pending/res/bug830B.res deleted file mode 100644 index 54c13801b6..0000000000 --- a/test/pending/res/bug830B.res +++ /dev/null @@ -1,13 +0,0 @@ -bug830/Good.scala -bug830/Good.scala -bug830/Good.scala -bug830/Bad.scala -bug830/Bad.scala -bug830/Bad.scala -bug830/Good.scala -bug830/Good.scala -bug830/Good.scala -bug830/Bad.scala -bug830/Bad.scala -bug830/Bad.scala -bug830/Good.scala diff --git a/test/pending/res/bug837.res b/test/pending/res/bug837.res deleted file mode 100644 index a0f5100843..0000000000 --- a/test/pending/res/bug837.res +++ /dev/null @@ -1,3 +0,0 @@ -DataFlowAnalysis.scala DeadCode.scala -DeadCode.scala - diff --git a/test/pending/res/bug837/DataFlowAnalysis.scala b/test/pending/res/bug837/DataFlowAnalysis.scala deleted file mode 100644 index 25c2fbc635..0000000000 --- a/test/pending/res/bug837/DataFlowAnalysis.scala +++ /dev/null @@ -1,17 +0,0 @@ -package test; -import scala.collection.mutable._; -trait CompleteLattice { - trait Elem; -} -trait DataFlowAnalysis[L <: CompleteLattice] { - type P; - val lattice : L; - val out: Map[P, lattice.Elem] = new HashMap; -} -abstract class Liveness { - object livenessLattice extends CompleteLattice; - final class LivenessAnalysis extends DataFlowAnalysis[livenessLattice.type] { - type P = String; - val lattice = livenessLattice; - } -} diff --git a/test/pending/res/bug837/DeadCode.scala b/test/pending/res/bug837/DeadCode.scala deleted file mode 100644 index 2978e24d42..0000000000 --- a/test/pending/res/bug837/DeadCode.scala +++ /dev/null @@ -1,6 +0,0 @@ -package test; -trait DeadcodeAnalysis { - object liveness extends Liveness; - val a = new liveness.LivenessAnalysis(); - var live = a.out("hello"); -} -- cgit v1.2.3