summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorburaq <buraq@epfl.ch>2004-06-03 20:05:08 +0000
committerburaq <buraq@epfl.ch>2004-06-03 20:05:08 +0000
commit1e59ef7fe08de15dd7a87d7b39f88d750c401c03 (patch)
treec398da5a87bf868e477fcc572a2ff10356538bb8 /test
parent608e922cbc95a64229f7c237702378d484e5b9ac (diff)
downloadscala-1e59ef7fe08de15dd7a87d7b39f88d750c401c03.tar.gz
scala-1e59ef7fe08de15dd7a87d7b39f88d750c401c03.tar.bz2
scala-1e59ef7fe08de15dd7a87d7b39f88d750c401c03.zip
*** empty log message ***
Diffstat (limited to 'test')
-rw-r--r--test/files/run/regularpatmat.check10
-rw-r--r--test/files/run/regularpatmat.scala28
2 files changed, 20 insertions, 18 deletions
diff --git a/test/files/run/regularpatmat.check b/test/files/run/regularpatmat.check
index 1226889f02..cc902ea473 100644
--- a/test/files/run/regularpatmat.check
+++ b/test/files/run/regularpatmat.check
@@ -39,6 +39,8 @@ passed ok
testWR_6
passed ok
passed ok
+testWR_7
+passed ok
testWS
passed ok
passed ok
@@ -63,9 +65,6 @@ passed ok
passed ok
passed ok
passed ok
-testWW
-passed ok
-passed ok
testBK
passed ok
passed ok
@@ -119,8 +118,3 @@ passed ok
passed ok
passed ok
passed ok
-testNN
-passed ok
-passed ok
-passed ok
-passed ok
diff --git a/test/files/run/regularpatmat.scala b/test/files/run/regularpatmat.scala
index db52c47723..4f358366fc 100644
--- a/test/files/run/regularpatmat.scala
+++ b/test/files/run/regularpatmat.scala
@@ -390,13 +390,21 @@ object testWR {
assertEquals( doit6( s10 ), "decimal number");
}
+ def test7:Unit = {
+ Console.println("testWR_7");
+ assertEquals( List(1,2) match {
+ case List(1,(3*,2))=> true; // test normalization (pattern normalizer)
+ case _ => false;
+ }, true);
+ }
def main( args:Array[String] ) = {
test1;
test2;
test3;
test4;
test5;
- test6
+ test6;
+ test7;
}
@@ -547,7 +555,7 @@ object testWV {
}
}
-
+/*
object testWW {
import values._ ;
@@ -582,7 +590,7 @@ object testWW {
}
}
-
+*/
object testMZ {
import scala.testing.UnitTest.assertEquals ;
class Expr;
@@ -601,7 +609,7 @@ object testMZ {
case class On();
case class Tw();
def testBar(xs: List[Any]) = xs match { // bug#180
- case List(((On(), Tw())* | (On(), On())), On()) => "case"
+ case List(((On(), Tw())* | (On(), On())), On()) => "caseBar"
case _ => "default";
}
@@ -632,9 +640,9 @@ object testMZ {
assertEquals(testFoo( List() ),"no match");
assertEquals(bind( List(OneN(),OneN()) ),"case");
assertEquals(testBar( List() ),"default");
- assertEquals(testBar( List(On()) ),"case");
+ assertEquals(testBar( List(On()) ),"caseBar");
assertEquals(testBar( List(On(), On())), "default");
- assertEquals(testBar( List(On(), On(), On()) ),"case");
+ assertEquals(testBar( List(On(), On(), On()) ),"caseBar");
assertEquals(testBar( List(On(), On(), On(), On()) ),"default");
assertEquals(testBar( List(On(), On(), On(), On(), On()) ),"default");
assertEquals(mat195( One(List(Two(),Two())) ),"x = List(Two,Two)");
@@ -647,7 +655,7 @@ object testMZ {
}
}
-
+/*
object testNN {
import scala.testing.UnitTest._ ;
abstract class K;
@@ -667,7 +675,7 @@ object testNN {
assertEquals(mtch( F(G()) ), false);
}
}
-
+*/
object testNO { // this does not need to be run, only compiled
trait Operator;
@@ -697,14 +705,14 @@ object Test {
testWS.main( args );
testWT.main( args );
testWV.main( args );
- testWW.main( args );
+ //testWW.main( args );
testBK.main( args );
testBL.main( args );
testBM.main( args );
testBN.main( args );
testBO.main( args );
testMZ.main;
- testNN.main;
+ //testNN.main;
()
}
}