From b9785280a7138a2bb52060faf94807aa0d07dec1 Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Wed, 24 Aug 2011 17:11:55 +0000 Subject: Renamed tests named bugXXX to tXXX, no review. --- test/files/res/bug597.check | 4 --- test/files/res/bug597.res | 2 -- test/files/res/bug597/Main.scala | 10 ------- test/files/res/bug597/Test.scala | 27 ----------------- test/files/res/bug687.check | 8 ----- test/files/res/bug687.res | 3 -- test/files/res/bug687/QueryA.scala | 4 --- test/files/res/bug687/QueryB.scala | 4 --- test/files/res/bug722.check | 4 --- test/files/res/bug722.res | 2 -- test/files/res/bug722/IfElse.scala | 4 --- test/files/res/bug722/Parser.scala | 8 ----- test/files/res/bug722/ScanBased.scala | 10 ------- test/files/res/bug735.check | 4 --- test/files/res/bug735.res | 2 -- test/files/res/bug735/ScalaExpressions.scala | 11 ------- test/files/res/bug735/ScalaTyper.scala | 5 ---- test/files/res/bug743.check | 4 --- test/files/res/bug743.res | 2 -- test/files/res/bug743/BracesXXX.scala | 6 ---- test/files/res/bug743/ParserXXX.scala | 15 ---------- test/files/res/bug785.check | 4 --- test/files/res/bug785.res | 2 -- test/files/res/bug785/ScalaNewTyper.scala | 10 ------- test/files/res/bug785/ScalaTrees.scala | 7 ----- test/files/res/bug831.check | 4 --- test/files/res/bug831.res | 2 -- test/files/res/bug831/NewScalaParserXXX.scala | 43 --------------------------- test/files/res/bug831/NewScalaTestXXX.scala | 2 -- test/files/res/t597.check | 4 +++ test/files/res/t597.res | 2 ++ test/files/res/t597/Main.scala | 10 +++++++ test/files/res/t597/Test.scala | 27 +++++++++++++++++ test/files/res/t687.check | 8 +++++ test/files/res/t687.res | 3 ++ test/files/res/t687/QueryA.scala | 4 +++ test/files/res/t687/QueryB.scala | 4 +++ test/files/res/t722.check | 4 +++ test/files/res/t722.res | 2 ++ test/files/res/t722/IfElse.scala | 4 +++ test/files/res/t722/Parser.scala | 8 +++++ test/files/res/t722/ScanBased.scala | 10 +++++++ test/files/res/t735.check | 4 +++ test/files/res/t735.res | 2 ++ test/files/res/t735/ScalaExpressions.scala | 11 +++++++ test/files/res/t735/ScalaTyper.scala | 5 ++++ test/files/res/t743.check | 4 +++ test/files/res/t743.res | 2 ++ test/files/res/t743/BracesXXX.scala | 6 ++++ test/files/res/t743/ParserXXX.scala | 15 ++++++++++ test/files/res/t785.check | 4 +++ test/files/res/t785.res | 2 ++ test/files/res/t785/ScalaNewTyper.scala | 10 +++++++ test/files/res/t785/ScalaTrees.scala | 7 +++++ test/files/res/t831.check | 4 +++ test/files/res/t831.res | 2 ++ test/files/res/t831/NewScalaParserXXX.scala | 43 +++++++++++++++++++++++++++ test/files/res/t831/NewScalaTestXXX.scala | 2 ++ 58 files changed, 213 insertions(+), 213 deletions(-) delete mode 100644 test/files/res/bug597.check delete mode 100644 test/files/res/bug597.res delete mode 100644 test/files/res/bug597/Main.scala delete mode 100644 test/files/res/bug597/Test.scala delete mode 100644 test/files/res/bug687.check delete mode 100644 test/files/res/bug687.res delete mode 100644 test/files/res/bug687/QueryA.scala delete mode 100644 test/files/res/bug687/QueryB.scala delete mode 100644 test/files/res/bug722.check delete mode 100644 test/files/res/bug722.res delete mode 100644 test/files/res/bug722/IfElse.scala delete mode 100644 test/files/res/bug722/Parser.scala delete mode 100644 test/files/res/bug722/ScanBased.scala delete mode 100644 test/files/res/bug735.check delete mode 100644 test/files/res/bug735.res delete mode 100644 test/files/res/bug735/ScalaExpressions.scala delete mode 100644 test/files/res/bug735/ScalaTyper.scala delete mode 100644 test/files/res/bug743.check delete mode 100644 test/files/res/bug743.res delete mode 100644 test/files/res/bug743/BracesXXX.scala delete mode 100644 test/files/res/bug743/ParserXXX.scala delete mode 100644 test/files/res/bug785.check delete mode 100644 test/files/res/bug785.res delete mode 100644 test/files/res/bug785/ScalaNewTyper.scala delete mode 100644 test/files/res/bug785/ScalaTrees.scala delete mode 100644 test/files/res/bug831.check delete mode 100644 test/files/res/bug831.res delete mode 100644 test/files/res/bug831/NewScalaParserXXX.scala delete mode 100644 test/files/res/bug831/NewScalaTestXXX.scala create mode 100644 test/files/res/t597.check create mode 100644 test/files/res/t597.res create mode 100644 test/files/res/t597/Main.scala create mode 100644 test/files/res/t597/Test.scala create mode 100644 test/files/res/t687.check create mode 100644 test/files/res/t687.res create mode 100644 test/files/res/t687/QueryA.scala create mode 100644 test/files/res/t687/QueryB.scala create mode 100644 test/files/res/t722.check create mode 100644 test/files/res/t722.res create mode 100644 test/files/res/t722/IfElse.scala create mode 100644 test/files/res/t722/Parser.scala create mode 100644 test/files/res/t722/ScanBased.scala create mode 100644 test/files/res/t735.check create mode 100644 test/files/res/t735.res create mode 100644 test/files/res/t735/ScalaExpressions.scala create mode 100644 test/files/res/t735/ScalaTyper.scala create mode 100644 test/files/res/t743.check create mode 100644 test/files/res/t743.res create mode 100644 test/files/res/t743/BracesXXX.scala create mode 100644 test/files/res/t743/ParserXXX.scala create mode 100644 test/files/res/t785.check create mode 100644 test/files/res/t785.res create mode 100644 test/files/res/t785/ScalaNewTyper.scala create mode 100644 test/files/res/t785/ScalaTrees.scala create mode 100644 test/files/res/t831.check create mode 100644 test/files/res/t831.res create mode 100644 test/files/res/t831/NewScalaParserXXX.scala create mode 100644 test/files/res/t831/NewScalaTestXXX.scala (limited to 'test/files/res') diff --git a/test/files/res/bug597.check b/test/files/res/bug597.check deleted file mode 100644 index 6cf64f734b..0000000000 --- a/test/files/res/bug597.check +++ /dev/null @@ -1,4 +0,0 @@ - -nsc> -nsc> -nsc> diff --git a/test/files/res/bug597.res b/test/files/res/bug597.res deleted file mode 100644 index 0db355cd0f..0000000000 --- a/test/files/res/bug597.res +++ /dev/null @@ -1,2 +0,0 @@ -bug597/Test.scala -bug597/Main.scala diff --git a/test/files/res/bug597/Main.scala b/test/files/res/bug597/Main.scala deleted file mode 100644 index 24d1327135..0000000000 --- a/test/files/res/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/res/bug597/Test.scala b/test/files/res/bug597/Test.scala deleted file mode 100644 index 2f63f46c3d..0000000000 --- a/test/files/res/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/res/bug687.check b/test/files/res/bug687.check deleted file mode 100644 index a905c3fbf0..0000000000 --- a/test/files/res/bug687.check +++ /dev/null @@ -1,8 +0,0 @@ - -nsc> -nsc> bug687/QueryB.scala:3: error: name clash between defined and inherited member: -method equals:(o: java.lang.Object)Boolean and -method equals:(x$1: Any)Boolean in class Any -have same type after erasure: (o: java.lang.Object)Boolean - override def equals(o : Object) = false; - ^ diff --git a/test/files/res/bug687.res b/test/files/res/bug687.res deleted file mode 100644 index ba8ba76995..0000000000 --- a/test/files/res/bug687.res +++ /dev/null @@ -1,3 +0,0 @@ -bug687/QueryA.scala -bug687/QueryB.scala -bug687/QueryA.scala diff --git a/test/files/res/bug687/QueryA.scala b/test/files/res/bug687/QueryA.scala deleted file mode 100644 index 2899f7e196..0000000000 --- a/test/files/res/bug687/QueryA.scala +++ /dev/null @@ -1,4 +0,0 @@ -package bug687; -trait Query { - override def equals(o : Any) = false; -} diff --git a/test/files/res/bug687/QueryB.scala b/test/files/res/bug687/QueryB.scala deleted file mode 100644 index 3e1e0b7a34..0000000000 --- a/test/files/res/bug687/QueryB.scala +++ /dev/null @@ -1,4 +0,0 @@ -package bug687; -trait Query { - override def equals(o : Object) = false; -} diff --git a/test/files/res/bug722.check b/test/files/res/bug722.check deleted file mode 100644 index 6cf64f734b..0000000000 --- a/test/files/res/bug722.check +++ /dev/null @@ -1,4 +0,0 @@ - -nsc> -nsc> -nsc> diff --git a/test/files/res/bug722.res b/test/files/res/bug722.res deleted file mode 100644 index dbc785c171..0000000000 --- a/test/files/res/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/res/bug722/IfElse.scala b/test/files/res/bug722/IfElse.scala deleted file mode 100644 index 1515ecf422..0000000000 --- a/test/files/res/bug722/IfElse.scala +++ /dev/null @@ -1,4 +0,0 @@ -package bug722; -trait IfEse extends ScanBased { - object condition extends WhitespaceLink; -} diff --git a/test/files/res/bug722/Parser.scala b/test/files/res/bug722/Parser.scala deleted file mode 100644 index 7f84cb2b63..0000000000 --- a/test/files/res/bug722/Parser.scala +++ /dev/null @@ -1,8 +0,0 @@ - -package bug722; -trait Parser { - trait Link { - def foo() = {} - } -} - diff --git a/test/files/res/bug722/ScanBased.scala b/test/files/res/bug722/ScanBased.scala deleted file mode 100644 index 4793a04914..0000000000 --- a/test/files/res/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/res/bug735.check b/test/files/res/bug735.check deleted file mode 100644 index 6cf64f734b..0000000000 --- a/test/files/res/bug735.check +++ /dev/null @@ -1,4 +0,0 @@ - -nsc> -nsc> -nsc> diff --git a/test/files/res/bug735.res b/test/files/res/bug735.res deleted file mode 100644 index d477e6fd47..0000000000 --- a/test/files/res/bug735.res +++ /dev/null @@ -1,2 +0,0 @@ -bug735/ScalaTyper.scala -bug735/ScalaTyper.scala diff --git a/test/files/res/bug735/ScalaExpressions.scala b/test/files/res/bug735/ScalaExpressions.scala deleted file mode 100644 index aacc412b68..0000000000 --- a/test/files/res/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/res/bug735/ScalaTyper.scala b/test/files/res/bug735/ScalaTyper.scala deleted file mode 100644 index 75e7a1855a..0000000000 --- a/test/files/res/bug735/ScalaTyper.scala +++ /dev/null @@ -1,5 +0,0 @@ - -package bug735; -trait ScalaTyper extends ScalaExpressions { - val values = new ValueFactory {} -} diff --git a/test/files/res/bug743.check b/test/files/res/bug743.check deleted file mode 100644 index 6cf64f734b..0000000000 --- a/test/files/res/bug743.check +++ /dev/null @@ -1,4 +0,0 @@ - -nsc> -nsc> -nsc> diff --git a/test/files/res/bug743.res b/test/files/res/bug743.res deleted file mode 100644 index f1dd2462e4..0000000000 --- a/test/files/res/bug743.res +++ /dev/null @@ -1,2 +0,0 @@ -bug743/ParserXXX.scala -bug743/BracesXXX.scala diff --git a/test/files/res/bug743/BracesXXX.scala b/test/files/res/bug743/BracesXXX.scala deleted file mode 100644 index 8a2416caa8..0000000000 --- a/test/files/res/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/res/bug743/ParserXXX.scala b/test/files/res/bug743/ParserXXX.scala deleted file mode 100644 index 6ecf13c1e1..0000000000 --- a/test/files/res/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/res/bug785.check b/test/files/res/bug785.check deleted file mode 100644 index 6cf64f734b..0000000000 --- a/test/files/res/bug785.check +++ /dev/null @@ -1,4 +0,0 @@ - -nsc> -nsc> -nsc> diff --git a/test/files/res/bug785.res b/test/files/res/bug785.res deleted file mode 100644 index 7e5da1c453..0000000000 --- a/test/files/res/bug785.res +++ /dev/null @@ -1,2 +0,0 @@ -bug785/ScalaTrees.scala -bug785/ScalaTrees.scala diff --git a/test/files/res/bug785/ScalaNewTyper.scala b/test/files/res/bug785/ScalaNewTyper.scala deleted file mode 100644 index d55d60a8d0..0000000000 --- a/test/files/res/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/res/bug785/ScalaTrees.scala b/test/files/res/bug785/ScalaTrees.scala deleted file mode 100644 index ade58e65c6..0000000000 --- a/test/files/res/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/res/bug831.check b/test/files/res/bug831.check deleted file mode 100644 index 6cf64f734b..0000000000 --- a/test/files/res/bug831.check +++ /dev/null @@ -1,4 +0,0 @@ - -nsc> -nsc> -nsc> diff --git a/test/files/res/bug831.res b/test/files/res/bug831.res deleted file mode 100644 index 0cc6c398ab..0000000000 --- a/test/files/res/bug831.res +++ /dev/null @@ -1,2 +0,0 @@ -bug831/NewScalaTestXXX.scala -bug831/NewScalaTestXXX.scala diff --git a/test/files/res/bug831/NewScalaParserXXX.scala b/test/files/res/bug831/NewScalaParserXXX.scala deleted file mode 100644 index e5af487def..0000000000 --- a/test/files/res/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 (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/res/bug831/NewScalaTestXXX.scala b/test/files/res/bug831/NewScalaTestXXX.scala deleted file mode 100644 index a1dafa8eac..0000000000 --- a/test/files/res/bug831/NewScalaTestXXX.scala +++ /dev/null @@ -1,2 +0,0 @@ -package bug831; -abstract class NewScalaTestXXX extends NewScalaParserXXX; diff --git a/test/files/res/t597.check b/test/files/res/t597.check new file mode 100644 index 0000000000..6cf64f734b --- /dev/null +++ b/test/files/res/t597.check @@ -0,0 +1,4 @@ + +nsc> +nsc> +nsc> diff --git a/test/files/res/t597.res b/test/files/res/t597.res new file mode 100644 index 0000000000..1081b59b8b --- /dev/null +++ b/test/files/res/t597.res @@ -0,0 +1,2 @@ +t597/Test.scala +t597/Main.scala diff --git a/test/files/res/t597/Main.scala b/test/files/res/t597/Main.scala new file mode 100644 index 0000000000..24d1327135 --- /dev/null +++ b/test/files/res/t597/Main.scala @@ -0,0 +1,10 @@ +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/res/t597/Test.scala b/test/files/res/t597/Test.scala new file mode 100644 index 0000000000..2f63f46c3d --- /dev/null +++ b/test/files/res/t597/Test.scala @@ -0,0 +1,27 @@ +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/res/t687.check b/test/files/res/t687.check new file mode 100644 index 0000000000..f7b8c9292e --- /dev/null +++ b/test/files/res/t687.check @@ -0,0 +1,8 @@ + +nsc> +nsc> t687/QueryB.scala:3: error: name clash between defined and inherited member: +method equals:(o: java.lang.Object)Boolean and +method equals:(x$1: Any)Boolean in class Any +have same type after erasure: (o: java.lang.Object)Boolean + override def equals(o : Object) = false; + ^ diff --git a/test/files/res/t687.res b/test/files/res/t687.res new file mode 100644 index 0000000000..222297965a --- /dev/null +++ b/test/files/res/t687.res @@ -0,0 +1,3 @@ +t687/QueryA.scala +t687/QueryB.scala +t687/QueryA.scala diff --git a/test/files/res/t687/QueryA.scala b/test/files/res/t687/QueryA.scala new file mode 100644 index 0000000000..72365c7e7f --- /dev/null +++ b/test/files/res/t687/QueryA.scala @@ -0,0 +1,4 @@ +package t687; +trait Query { + override def equals(o : Any) = false; +} diff --git a/test/files/res/t687/QueryB.scala b/test/files/res/t687/QueryB.scala new file mode 100644 index 0000000000..8f6f2d9ebf --- /dev/null +++ b/test/files/res/t687/QueryB.scala @@ -0,0 +1,4 @@ +package t687; +trait Query { + override def equals(o : Object) = false; +} diff --git a/test/files/res/t722.check b/test/files/res/t722.check new file mode 100644 index 0000000000..6cf64f734b --- /dev/null +++ b/test/files/res/t722.check @@ -0,0 +1,4 @@ + +nsc> +nsc> +nsc> diff --git a/test/files/res/t722.res b/test/files/res/t722.res new file mode 100644 index 0000000000..e2873a556c --- /dev/null +++ b/test/files/res/t722.res @@ -0,0 +1,2 @@ +t722/Parser.scala t722/IfElse.scala +t722/Parser.scala t722/IfElse.scala diff --git a/test/files/res/t722/IfElse.scala b/test/files/res/t722/IfElse.scala new file mode 100644 index 0000000000..c0128deab4 --- /dev/null +++ b/test/files/res/t722/IfElse.scala @@ -0,0 +1,4 @@ +package t722; +trait IfEse extends ScanBased { + object condition extends WhitespaceLink; +} diff --git a/test/files/res/t722/Parser.scala b/test/files/res/t722/Parser.scala new file mode 100644 index 0000000000..5dfcd57367 --- /dev/null +++ b/test/files/res/t722/Parser.scala @@ -0,0 +1,8 @@ + +package t722; +trait Parser { + trait Link { + def foo() = {} + } +} + diff --git a/test/files/res/t722/ScanBased.scala b/test/files/res/t722/ScanBased.scala new file mode 100644 index 0000000000..8e55b800ac --- /dev/null +++ b/test/files/res/t722/ScanBased.scala @@ -0,0 +1,10 @@ +package t722; +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/res/t735.check b/test/files/res/t735.check new file mode 100644 index 0000000000..6cf64f734b --- /dev/null +++ b/test/files/res/t735.check @@ -0,0 +1,4 @@ + +nsc> +nsc> +nsc> diff --git a/test/files/res/t735.res b/test/files/res/t735.res new file mode 100644 index 0000000000..6ef42ffef0 --- /dev/null +++ b/test/files/res/t735.res @@ -0,0 +1,2 @@ +t735/ScalaTyper.scala +t735/ScalaTyper.scala diff --git a/test/files/res/t735/ScalaExpressions.scala b/test/files/res/t735/ScalaExpressions.scala new file mode 100644 index 0000000000..f9c8ac733c --- /dev/null +++ b/test/files/res/t735/ScalaExpressions.scala @@ -0,0 +1,11 @@ +package t735; +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/res/t735/ScalaTyper.scala b/test/files/res/t735/ScalaTyper.scala new file mode 100644 index 0000000000..0369c5f19d --- /dev/null +++ b/test/files/res/t735/ScalaTyper.scala @@ -0,0 +1,5 @@ + +package t735; +trait ScalaTyper extends ScalaExpressions { + val values = new ValueFactory {} +} diff --git a/test/files/res/t743.check b/test/files/res/t743.check new file mode 100644 index 0000000000..6cf64f734b --- /dev/null +++ b/test/files/res/t743.check @@ -0,0 +1,4 @@ + +nsc> +nsc> +nsc> diff --git a/test/files/res/t743.res b/test/files/res/t743.res new file mode 100644 index 0000000000..7772a4b321 --- /dev/null +++ b/test/files/res/t743.res @@ -0,0 +1,2 @@ +t743/ParserXXX.scala +t743/BracesXXX.scala diff --git a/test/files/res/t743/BracesXXX.scala b/test/files/res/t743/BracesXXX.scala new file mode 100644 index 0000000000..ed7b386a88 --- /dev/null +++ b/test/files/res/t743/BracesXXX.scala @@ -0,0 +1,6 @@ +package t743; +trait BracesXXX extends ParserXXX { + trait Matchable extends IsLinked { + def foo : NodeImpl = null; + } +} diff --git a/test/files/res/t743/ParserXXX.scala b/test/files/res/t743/ParserXXX.scala new file mode 100644 index 0000000000..d132bdbf1d --- /dev/null +++ b/test/files/res/t743/ParserXXX.scala @@ -0,0 +1,15 @@ +package t743; +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/res/t785.check b/test/files/res/t785.check new file mode 100644 index 0000000000..6cf64f734b --- /dev/null +++ b/test/files/res/t785.check @@ -0,0 +1,4 @@ + +nsc> +nsc> +nsc> diff --git a/test/files/res/t785.res b/test/files/res/t785.res new file mode 100644 index 0000000000..cfac559d4b --- /dev/null +++ b/test/files/res/t785.res @@ -0,0 +1,2 @@ +t785/ScalaTrees.scala +t785/ScalaTrees.scala diff --git a/test/files/res/t785/ScalaNewTyper.scala b/test/files/res/t785/ScalaNewTyper.scala new file mode 100644 index 0000000000..acdba0f25d --- /dev/null +++ b/test/files/res/t785/ScalaNewTyper.scala @@ -0,0 +1,10 @@ +package t785; +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/res/t785/ScalaTrees.scala b/test/files/res/t785/ScalaTrees.scala new file mode 100644 index 0000000000..fdf32b5234 --- /dev/null +++ b/test/files/res/t785/ScalaTrees.scala @@ -0,0 +1,7 @@ +package t785; +trait ScalaTrees extends ScalaNewTyper { + trait TraitClassImpl extends HasArgsTypeParametersImpl { + argss(null); + protected def argss(tree : String) : List[List[String]] = Nil; + } +} diff --git a/test/files/res/t831.check b/test/files/res/t831.check new file mode 100644 index 0000000000..6cf64f734b --- /dev/null +++ b/test/files/res/t831.check @@ -0,0 +1,4 @@ + +nsc> +nsc> +nsc> diff --git a/test/files/res/t831.res b/test/files/res/t831.res new file mode 100644 index 0000000000..9b9bd69530 --- /dev/null +++ b/test/files/res/t831.res @@ -0,0 +1,2 @@ +t831/NewScalaTestXXX.scala +t831/NewScalaTestXXX.scala diff --git a/test/files/res/t831/NewScalaParserXXX.scala b/test/files/res/t831/NewScalaParserXXX.scala new file mode 100644 index 0000000000..958e4f99c1 --- /dev/null +++ b/test/files/res/t831/NewScalaParserXXX.scala @@ -0,0 +1,43 @@ +package t831; + +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 (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/res/t831/NewScalaTestXXX.scala b/test/files/res/t831/NewScalaTestXXX.scala new file mode 100644 index 0000000000..24d864f298 --- /dev/null +++ b/test/files/res/t831/NewScalaTestXXX.scala @@ -0,0 +1,2 @@ +package t831; +abstract class NewScalaTestXXX extends NewScalaParserXXX; -- cgit v1.2.3