summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorSean McDirmid <sean.mcdirmid@gmail.com>2006-11-25 07:17:35 +0000
committerSean McDirmid <sean.mcdirmid@gmail.com>2006-11-25 07:17:35 +0000
commit086f1209bf3303f19c36d802b383de229a985183 (patch)
treef0357557c100d4b11bc78f1727f63cab291bbdcb /test
parent24561d55b00f2c0154a6cb051ee6f1571671bc6b (diff)
downloadscala-086f1209bf3303f19c36d802b383de229a985183.tar.gz
scala-086f1209bf3303f19c36d802b383de229a985183.tar.bz2
scala-086f1209bf3303f19c36d802b383de229a985183.zip
Adding passing resident tests.
Diffstat (limited to 'test')
-rw-r--r--test/files/resident/bug597.check4
-rw-r--r--test/files/resident/bug597.res2
-rw-r--r--test/files/resident/bug687.check11
-rw-r--r--test/files/resident/bug687.res3
-rw-r--r--test/files/resident/bug687/QueryA.scala4
-rw-r--r--test/files/resident/bug687/QueryB.scala4
-rw-r--r--test/files/resident/bug722.check4
-rw-r--r--test/files/resident/bug722.res2
-rw-r--r--test/files/resident/bug722/IfElse.scala4
-rw-r--r--test/files/resident/bug722/Parser.scala8
-rw-r--r--test/files/resident/bug722/ScanBased.scala10
-rw-r--r--test/files/resident/bug735.check4
-rw-r--r--test/files/resident/bug735.res2
-rw-r--r--test/files/resident/bug735/ScalaExpressions.scala11
-rw-r--r--test/files/resident/bug735/ScalaTyper.scala5
-rw-r--r--test/files/resident/bug743.check4
-rw-r--r--test/files/resident/bug743.res2
-rw-r--r--test/files/resident/bug743/BracesXXX.scala6
-rw-r--r--test/files/resident/bug743/ParserXXX.scala15
-rw-r--r--test/files/resident/bug785.check4
-rw-r--r--test/files/resident/bug785.res2
-rw-r--r--test/files/resident/bug785/ScalaNewTyper.scala10
-rw-r--r--test/files/resident/bug785/ScalaTrees.scala7
-rw-r--r--test/files/resident/bug831.check4
-rw-r--r--test/files/resident/bug831.res2
-rw-r--r--test/files/resident/bug831/NewScalaParserXXX.scala43
-rw-r--r--test/files/resident/bug831/NewScalaTestXXX.scala2
27 files changed, 179 insertions, 0 deletions
diff --git a/test/files/resident/bug597.check b/test/files/resident/bug597.check
new file mode 100644
index 0000000000..ed46e87f5d
--- /dev/null
+++ b/test/files/resident/bug597.check
@@ -0,0 +1,4 @@
+
+nsc>
+nsc>
+nsc> \ No newline at end of file
diff --git a/test/files/resident/bug597.res b/test/files/resident/bug597.res
new file mode 100644
index 0000000000..0db355cd0f
--- /dev/null
+++ b/test/files/resident/bug597.res
@@ -0,0 +1,2 @@
+bug597/Test.scala
+bug597/Main.scala
diff --git a/test/files/resident/bug687.check b/test/files/resident/bug687.check
new file mode 100644
index 0000000000..7bea791077
--- /dev/null
+++ b/test/files/resident/bug687.check
@@ -0,0 +1,11 @@
+
+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
new file mode 100644
index 0000000000..ba8ba76995
--- /dev/null
+++ b/test/files/resident/bug687.res
@@ -0,0 +1,3 @@
+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
new file mode 100644
index 0000000000..2899f7e196
--- /dev/null
+++ b/test/files/resident/bug687/QueryA.scala
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000000..ce93005bb3
--- /dev/null
+++ b/test/files/resident/bug687/QueryB.scala
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000000..ed46e87f5d
--- /dev/null
+++ b/test/files/resident/bug722.check
@@ -0,0 +1,4 @@
+
+nsc>
+nsc>
+nsc> \ No newline at end of file
diff --git a/test/files/resident/bug722.res b/test/files/resident/bug722.res
new file mode 100644
index 0000000000..dbc785c171
--- /dev/null
+++ b/test/files/resident/bug722.res
@@ -0,0 +1,2 @@
+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
new file mode 100644
index 0000000000..a10607a38d
--- /dev/null
+++ b/test/files/resident/bug722/IfElse.scala
@@ -0,0 +1,4 @@
+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
new file mode 100644
index 0000000000..6d9739ed04
--- /dev/null
+++ b/test/files/resident/bug722/Parser.scala
@@ -0,0 +1,8 @@
+
+package bug722;
+trait Parser {
+ trait Link {
+ def foo = {}
+ }
+}
+
diff --git a/test/files/resident/bug722/ScanBased.scala b/test/files/resident/bug722/ScanBased.scala
new file mode 100644
index 0000000000..fcb853f96d
--- /dev/null
+++ b/test/files/resident/bug722/ScanBased.scala
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000000..ed46e87f5d
--- /dev/null
+++ b/test/files/resident/bug735.check
@@ -0,0 +1,4 @@
+
+nsc>
+nsc>
+nsc> \ No newline at end of file
diff --git a/test/files/resident/bug735.res b/test/files/resident/bug735.res
new file mode 100644
index 0000000000..d477e6fd47
--- /dev/null
+++ b/test/files/resident/bug735.res
@@ -0,0 +1,2 @@
+bug735/ScalaTyper.scala
+bug735/ScalaTyper.scala
diff --git a/test/files/resident/bug735/ScalaExpressions.scala b/test/files/resident/bug735/ScalaExpressions.scala
new file mode 100644
index 0000000000..aacc412b68
--- /dev/null
+++ b/test/files/resident/bug735/ScalaExpressions.scala
@@ -0,0 +1,11 @@
+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
new file mode 100644
index 0000000000..29c4bb37cb
--- /dev/null
+++ b/test/files/resident/bug735/ScalaTyper.scala
@@ -0,0 +1,5 @@
+
+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
new file mode 100644
index 0000000000..ed46e87f5d
--- /dev/null
+++ b/test/files/resident/bug743.check
@@ -0,0 +1,4 @@
+
+nsc>
+nsc>
+nsc> \ No newline at end of file
diff --git a/test/files/resident/bug743.res b/test/files/resident/bug743.res
new file mode 100644
index 0000000000..f1dd2462e4
--- /dev/null
+++ b/test/files/resident/bug743.res
@@ -0,0 +1,2 @@
+bug743/ParserXXX.scala
+bug743/BracesXXX.scala
diff --git a/test/files/resident/bug743/BracesXXX.scala b/test/files/resident/bug743/BracesXXX.scala
new file mode 100644
index 0000000000..8a2416caa8
--- /dev/null
+++ b/test/files/resident/bug743/BracesXXX.scala
@@ -0,0 +1,6 @@
+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
new file mode 100644
index 0000000000..6ecf13c1e1
--- /dev/null
+++ b/test/files/resident/bug743/ParserXXX.scala
@@ -0,0 +1,15 @@
+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
new file mode 100644
index 0000000000..ed46e87f5d
--- /dev/null
+++ b/test/files/resident/bug785.check
@@ -0,0 +1,4 @@
+
+nsc>
+nsc>
+nsc> \ No newline at end of file
diff --git a/test/files/resident/bug785.res b/test/files/resident/bug785.res
new file mode 100644
index 0000000000..7e5da1c453
--- /dev/null
+++ b/test/files/resident/bug785.res
@@ -0,0 +1,2 @@
+bug785/ScalaTrees.scala
+bug785/ScalaTrees.scala
diff --git a/test/files/resident/bug785/ScalaNewTyper.scala b/test/files/resident/bug785/ScalaNewTyper.scala
new file mode 100644
index 0000000000..fb955572ed
--- /dev/null
+++ b/test/files/resident/bug785/ScalaNewTyper.scala
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000000..ade58e65c6
--- /dev/null
+++ b/test/files/resident/bug785/ScalaTrees.scala
@@ -0,0 +1,7 @@
+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
new file mode 100644
index 0000000000..ed46e87f5d
--- /dev/null
+++ b/test/files/resident/bug831.check
@@ -0,0 +1,4 @@
+
+nsc>
+nsc>
+nsc> \ No newline at end of file
diff --git a/test/files/resident/bug831.res b/test/files/resident/bug831.res
new file mode 100644
index 0000000000..0cc6c398ab
--- /dev/null
+++ b/test/files/resident/bug831.res
@@ -0,0 +1,2 @@
+bug831/NewScalaTestXXX.scala
+bug831/NewScalaTestXXX.scala
diff --git a/test/files/resident/bug831/NewScalaParserXXX.scala b/test/files/resident/bug831/NewScalaParserXXX.scala
new file mode 100644
index 0000000000..88c81637f0
--- /dev/null
+++ b/test/files/resident/bug831/NewScalaParserXXX.scala
@@ -0,0 +1,43 @@
+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
new file mode 100644
index 0000000000..e5cc79970f
--- /dev/null
+++ b/test/files/resident/bug831/NewScalaTestXXX.scala
@@ -0,0 +1,2 @@
+package bug831;
+abstract class NewScalaTestXXX extends NewScalaParserXXX; \ No newline at end of file