diff options
author | michelou <michelou@epfl.ch> | 2006-11-29 13:11:31 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2006-11-29 13:11:31 +0000 |
commit | f9da023c4e7d57e38ba0041e0ee31b9ee46ec4a9 (patch) | |
tree | 46e7bc64451aec5325e0d06a671cd5b549ab29fd /test/files/resident | |
parent | 50c411759b491a88d7ffca8fcda9bce9d22ac22c (diff) | |
download | scala-f9da023c4e7d57e38ba0041e0ee31b9ee46ec4a9.tar.gz scala-f9da023c4e7d57e38ba0041e0ee31b9ee46ec4a9.tar.bz2 scala-f9da023c4e7d57e38ba0041e0ee31b9ee46ec4a9.zip |
renamed directory 'resident' to match '--res' o...
renamed directory 'resident' to match '--res' option
Diffstat (limited to 'test/files/resident')
29 files changed, 0 insertions, 216 deletions
diff --git a/test/files/resident/bug597.check b/test/files/resident/bug597.check deleted file mode 100644 index ed46e87f5d..0000000000 --- a/test/files/resident/bug597.check +++ /dev/null @@ -1,4 +0,0 @@ - -nsc> -nsc> -nsc>
\ No newline at end of file diff --git a/test/files/resident/bug597.res b/test/files/resident/bug597.res deleted file mode 100644 index 0db355cd0f..0000000000 --- a/test/files/resident/bug597.res +++ /dev/null @@ -1,2 +0,0 @@ -bug597/Test.scala -bug597/Main.scala diff --git a/test/files/resident/bug597/Main.scala b/test/files/resident/bug597/Main.scala deleted file mode 100644 index 24d1327135..0000000000 --- a/test/files/resident/bug597/Main.scala +++ /dev/null @@ -1,10 +0,0 @@ -package test; - -object Main { - def main(args : Array[String]) : Unit = { - new ExtC { - type A = Ax; - class Ax extends super.Ax; - } - } -} diff --git a/test/files/resident/bug597/Test.scala b/test/files/resident/bug597/Test.scala deleted file mode 100644 index 2f63f46c3d..0000000000 --- a/test/files/resident/bug597/Test.scala +++ /dev/null @@ -1,27 +0,0 @@ -package test; - -abstract class Base { - type A <: Ax; - - abstract class Ax { - def a = null; - def string = "A"; - } -} -trait ExtB extends Base { - type A <: Ax; - trait Ax extends super.Ax { - def c = null; - override def string = super.string + "C"; - } -} - -trait ExtC extends /*ExtA with*/ ExtB { - type A <: Ax; - trait Ax extends super.Ax { - a - c - def d = null; - override def string = super.string + "D"; - } -} diff --git a/test/files/resident/bug687.check b/test/files/resident/bug687.check deleted file mode 100644 index 7bea791077..0000000000 --- a/test/files/resident/bug687.check +++ /dev/null @@ -1,11 +0,0 @@ - -nsc> -nsc> bug687/QueryB.scala:3 error: name clash between defined and inherited member: -method equals:(java.lang.Object)scala.Boolean and -method equals:(scala.Any)scala.Boolean in class Any -have same type after erasure: (java.lang.Object)scala.Boolean - override def equals(o : Object) = false; - ^ - -nsc> -nsc>
\ No newline at end of file diff --git a/test/files/resident/bug687.res b/test/files/resident/bug687.res deleted file mode 100644 index ba8ba76995..0000000000 --- a/test/files/resident/bug687.res +++ /dev/null @@ -1,3 +0,0 @@ -bug687/QueryA.scala -bug687/QueryB.scala -bug687/QueryA.scala diff --git a/test/files/resident/bug687/QueryA.scala b/test/files/resident/bug687/QueryA.scala deleted file mode 100644 index 2899f7e196..0000000000 --- a/test/files/resident/bug687/QueryA.scala +++ /dev/null @@ -1,4 +0,0 @@ -package bug687; -trait Query { - override def equals(o : Any) = false; -} diff --git a/test/files/resident/bug687/QueryB.scala b/test/files/resident/bug687/QueryB.scala deleted file mode 100644 index ce93005bb3..0000000000 --- a/test/files/resident/bug687/QueryB.scala +++ /dev/null @@ -1,4 +0,0 @@ -package bug687; -trait Query { - override def equals(o : Object) = false; -}
\ No newline at end of file diff --git a/test/files/resident/bug722.check b/test/files/resident/bug722.check deleted file mode 100644 index ed46e87f5d..0000000000 --- a/test/files/resident/bug722.check +++ /dev/null @@ -1,4 +0,0 @@ - -nsc> -nsc> -nsc>
\ No newline at end of file diff --git a/test/files/resident/bug722.res b/test/files/resident/bug722.res deleted file mode 100644 index dbc785c171..0000000000 --- a/test/files/resident/bug722.res +++ /dev/null @@ -1,2 +0,0 @@ -bug722/Parser.scala bug722/IfElse.scala -bug722/Parser.scala bug722/IfElse.scala diff --git a/test/files/resident/bug722/IfElse.scala b/test/files/resident/bug722/IfElse.scala deleted file mode 100644 index a10607a38d..0000000000 --- a/test/files/resident/bug722/IfElse.scala +++ /dev/null @@ -1,4 +0,0 @@ -package bug722; -trait IfEse extends ScanBased { - object condition extends WhitespaceLink; -}
\ No newline at end of file diff --git a/test/files/resident/bug722/Parser.scala b/test/files/resident/bug722/Parser.scala deleted file mode 100644 index 6d9739ed04..0000000000 --- a/test/files/resident/bug722/Parser.scala +++ /dev/null @@ -1,8 +0,0 @@ - -package bug722; -trait Parser { - trait Link { - def foo = {} - } -} - diff --git a/test/files/resident/bug722/ScanBased.scala b/test/files/resident/bug722/ScanBased.scala deleted file mode 100644 index fcb853f96d..0000000000 --- a/test/files/resident/bug722/ScanBased.scala +++ /dev/null @@ -1,10 +0,0 @@ -package bug722; -trait ScanBased extends Parser { - trait AdjacentLink extends Link { - override def foo = super.foo; - } - trait WhitespaceLink extends AdjacentLink { - override def foo = super.foo; - } -} - diff --git a/test/files/resident/bug735.check b/test/files/resident/bug735.check deleted file mode 100644 index ed46e87f5d..0000000000 --- a/test/files/resident/bug735.check +++ /dev/null @@ -1,4 +0,0 @@ - -nsc> -nsc> -nsc>
\ No newline at end of file diff --git a/test/files/resident/bug735.res b/test/files/resident/bug735.res deleted file mode 100644 index d477e6fd47..0000000000 --- a/test/files/resident/bug735.res +++ /dev/null @@ -1,2 +0,0 @@ -bug735/ScalaTyper.scala -bug735/ScalaTyper.scala diff --git a/test/files/resident/bug735/ScalaExpressions.scala b/test/files/resident/bug735/ScalaExpressions.scala deleted file mode 100644 index aacc412b68..0000000000 --- a/test/files/resident/bug735/ScalaExpressions.scala +++ /dev/null @@ -1,11 +0,0 @@ -package bug735; -trait ScalaExpressions { - trait ExpressionFactory { - def foo = 10; - def bar : Int; - } - val values : ValueFactory; - trait ValueFactory extends ExpressionFactory { - def bar = 42; - } -} diff --git a/test/files/resident/bug735/ScalaTyper.scala b/test/files/resident/bug735/ScalaTyper.scala deleted file mode 100644 index 29c4bb37cb..0000000000 --- a/test/files/resident/bug735/ScalaTyper.scala +++ /dev/null @@ -1,5 +0,0 @@ - -package bug735; -trait ScalaTyper extends ScalaExpressions { - val values = new ValueFactory {} -}
\ No newline at end of file diff --git a/test/files/resident/bug743.check b/test/files/resident/bug743.check deleted file mode 100644 index ed46e87f5d..0000000000 --- a/test/files/resident/bug743.check +++ /dev/null @@ -1,4 +0,0 @@ - -nsc> -nsc> -nsc>
\ No newline at end of file diff --git a/test/files/resident/bug743.res b/test/files/resident/bug743.res deleted file mode 100644 index f1dd2462e4..0000000000 --- a/test/files/resident/bug743.res +++ /dev/null @@ -1,2 +0,0 @@ -bug743/ParserXXX.scala -bug743/BracesXXX.scala diff --git a/test/files/resident/bug743/BracesXXX.scala b/test/files/resident/bug743/BracesXXX.scala deleted file mode 100644 index 8a2416caa8..0000000000 --- a/test/files/resident/bug743/BracesXXX.scala +++ /dev/null @@ -1,6 +0,0 @@ -package bug743; -trait BracesXXX extends ParserXXX { - trait Matchable extends IsLinked { - def foo : NodeImpl = null; - } -} diff --git a/test/files/resident/bug743/ParserXXX.scala b/test/files/resident/bug743/ParserXXX.scala deleted file mode 100644 index 6ecf13c1e1..0000000000 --- a/test/files/resident/bug743/ParserXXX.scala +++ /dev/null @@ -1,15 +0,0 @@ -package bug743; -trait ParserXXX { - val foo = null; - trait NodeImpl { - trait Link extends ParserXXX.this.Link { - val from = null; - } - } - trait Link { - val to0 = null; - } - trait IsLinked extends NodeImpl { - trait Link extends super.Link; - } -} diff --git a/test/files/resident/bug785.check b/test/files/resident/bug785.check deleted file mode 100644 index ed46e87f5d..0000000000 --- a/test/files/resident/bug785.check +++ /dev/null @@ -1,4 +0,0 @@ - -nsc> -nsc> -nsc>
\ No newline at end of file diff --git a/test/files/resident/bug785.res b/test/files/resident/bug785.res deleted file mode 100644 index 7e5da1c453..0000000000 --- a/test/files/resident/bug785.res +++ /dev/null @@ -1,2 +0,0 @@ -bug785/ScalaTrees.scala -bug785/ScalaTrees.scala diff --git a/test/files/resident/bug785/ScalaNewTyper.scala b/test/files/resident/bug785/ScalaNewTyper.scala deleted file mode 100644 index fb955572ed..0000000000 --- a/test/files/resident/bug785/ScalaNewTyper.scala +++ /dev/null @@ -1,10 +0,0 @@ -package bug785; -trait ScalaNewTyper { - private var typed : String = null; - trait HasSymbol { - protected def foo : Unit = {} - } - trait HasArgsTypeParametersImpl extends HasSymbol { - private var argss : List[List[String]] = Nil; - } -} diff --git a/test/files/resident/bug785/ScalaTrees.scala b/test/files/resident/bug785/ScalaTrees.scala deleted file mode 100644 index ade58e65c6..0000000000 --- a/test/files/resident/bug785/ScalaTrees.scala +++ /dev/null @@ -1,7 +0,0 @@ -package bug785; -trait ScalaTrees extends ScalaNewTyper { - trait TraitClassImpl extends HasArgsTypeParametersImpl { - argss(null); - protected def argss(tree : String) : List[List[String]] = Nil; - } -} diff --git a/test/files/resident/bug831.check b/test/files/resident/bug831.check deleted file mode 100644 index ed46e87f5d..0000000000 --- a/test/files/resident/bug831.check +++ /dev/null @@ -1,4 +0,0 @@ - -nsc> -nsc> -nsc>
\ No newline at end of file diff --git a/test/files/resident/bug831.res b/test/files/resident/bug831.res deleted file mode 100644 index 0cc6c398ab..0000000000 --- a/test/files/resident/bug831.res +++ /dev/null @@ -1,2 +0,0 @@ -bug831/NewScalaTestXXX.scala -bug831/NewScalaTestXXX.scala diff --git a/test/files/resident/bug831/NewScalaParserXXX.scala b/test/files/resident/bug831/NewScalaParserXXX.scala deleted file mode 100644 index 88c81637f0..0000000000 --- a/test/files/resident/bug831/NewScalaParserXXX.scala +++ /dev/null @@ -1,43 +0,0 @@ -package bug831; - -trait ScalaNodeScannerXXX { - type Node <: NodeImpl; - trait NodeImpl { def self : Node; } - type Unfixed <: Node with UnfixedImpl; - trait UnfixedImpl extends NodeImpl { def self : Unfixed; } -} -//def f = { Console.println("hello"); 42; } -//for (val ns <-n; val i <- 0.until(ns)) yield f; - - -trait NewScalaScannerXXX extends ScalaNodeScannerXXX { - type Unfixed <: Node with UnfixedImpl; - trait UnfixedImpl extends super.UnfixedImpl with NodeImpl; - type Statement <: Unfixed with StatementImpl; - trait StatementImpl extends UnfixedImpl { def self : Statement; } - type NewLine <: Statement with NewLineImpl; - trait NewLineImpl extends StatementImpl { - def self : NewLine; - def isActive : Boolean = true; - } - object ArrowMode extends Enumeration { val Def, Case, Expr = Value } -} - -trait ScalaPrecedenceXXX extends NewScalaScannerXXX { - type NewLine <: Statement with NewLineImpl; - trait NewLineImpl extends super.NewLineImpl with StatementImpl { - def self : NewLine; - override def isActive = super[NewLineImpl].isActive; - } -} -trait NewScalaParserXXX extends NewScalaScannerXXX with ScalaPrecedenceXXX { - type NewLine <: Statement with NewLineImpl; - trait MyNewLine extends super[NewScalaScannerXXX].NewLineImpl; - trait NewLineImpl extends MyNewLine with - super[ScalaPrecedenceXXX].NewLineImpl with - StatementImpl { - def self : NewLine; - override def isActive = super[MyNewLine].isActive; - } -} - diff --git a/test/files/resident/bug831/NewScalaTestXXX.scala b/test/files/resident/bug831/NewScalaTestXXX.scala deleted file mode 100644 index e5cc79970f..0000000000 --- a/test/files/resident/bug831/NewScalaTestXXX.scala +++ /dev/null @@ -1,2 +0,0 @@ -package bug831; -abstract class NewScalaTestXXX extends NewScalaParserXXX;
\ No newline at end of file |