summaryrefslogtreecommitdiff
path: root/test/files/pos
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2008-05-20 10:32:59 +0000
committermichelou <michelou@epfl.ch>2008-05-20 10:32:59 +0000
commit4686535142b380ccfad910250303e15bd41fb79d (patch)
tree210b6b24b42e837472ee03dfb98c045e2b882ec7 /test/files/pos
parent44fd5e7272f7fbcc901d1ecaf563351217a50e7d (diff)
downloadscala-4686535142b380ccfad910250303e15bd41fb79d.tar.gz
scala-4686535142b380ccfad910250303e15bd41fb79d.tar.bz2
scala-4686535142b380ccfad910250303e15bd41fb79d.zip
int -> Int, etc..
Diffstat (limited to 'test/files/pos')
-rw-r--r--test/files/pos/bug0036.scala6
-rw-r--r--test/files/pos/bug1237.scala7
-rw-r--r--test/files/pos/scoping3.scala36
3 files changed, 25 insertions, 24 deletions
diff --git a/test/files/pos/bug0036.scala b/test/files/pos/bug0036.scala
index 1d923b0017..3c9a84f8ad 100644
--- a/test/files/pos/bug0036.scala
+++ b/test/files/pos/bug0036.scala
@@ -1,8 +1,8 @@
object m {
- val xs: List[int] = Nil;
- def f(i: int) = 0;
- val v = xs map f;
+ val xs: List[Int] = Nil
+ def f(i: Int) = 0
+ val v = xs map f
def m() = {}
}
diff --git a/test/files/pos/bug1237.scala b/test/files/pos/bug1237.scala
index 01f656f580..7777372138 100644
--- a/test/files/pos/bug1237.scala
+++ b/test/files/pos/bug1237.scala
@@ -3,11 +3,10 @@ class HelloWorld {
object TypeBool;
- trait Fct
- {
- def g(x : int) = TypeBool // breaks.
+ trait Fct {
+ def g(x : Int) = TypeBool // breaks.
- // def g(x : int) = 3 // fine.
+ // def g(x : Int) = 3 // fine.
}
()
diff --git a/test/files/pos/scoping3.scala b/test/files/pos/scoping3.scala
index c1a65e287f..761d5c311e 100644
--- a/test/files/pos/scoping3.scala
+++ b/test/files/pos/scoping3.scala
@@ -1,21 +1,23 @@
// $Id$
object CI {
- trait TreeDisplay {
- type TreeNode <: ITreeNode;
- trait ITreeNode {
- def display(): unit;
- }
- }
- trait TreeDisplayExp {
- def getRoot(): TreeNode;
- type TreeNode <: ITreeNodeExp;
- trait ITreeNodeExp {}
- }
- trait TreeDisplayFinal extends TreeDisplay with TreeDisplayExp {
- type TreeNode <: ITreeNode with ITreeNodeExp;
- }
- abstract class SimpleTreeDisplay extends TreeDisplay { self: TreeDisplayFinal =>
- def display() = { this.getRoot().display(); }
- }
+ trait TreeDisplay {
+ type TreeNode <: ITreeNode
+ trait ITreeNode {
+ def display(): Unit
+ }
+ }
+
+ trait TreeDisplayExp {
+ def getRoot(): TreeNode
+ type TreeNode <: ITreeNodeExp
+ trait ITreeNodeExp {}
+ }
+
+ trait TreeDisplayFinal extends TreeDisplay with TreeDisplayExp {
+ type TreeNode <: ITreeNode with ITreeNodeExp
+ }
+ abstract class SimpleTreeDisplay extends TreeDisplay { self: TreeDisplayFinal =>
+ def display() { this.getRoot().display() }
+ }
}