summaryrefslogtreecommitdiff
path: root/test/files/jvm
diff options
context:
space:
mode:
authorburaq <buraq@epfl.ch>2004-06-14 09:12:37 +0000
committerburaq <buraq@epfl.ch>2004-06-14 09:12:37 +0000
commite56821baaf295980ff236373879a7c48ecc35d6f (patch)
treef3e5eafd4c389898b4651e272faa64fc768d0e89 /test/files/jvm
parent1fef47e7b018388df0f0c6b8ec43b753695aa127 (diff)
downloadscala-e56821baaf295980ff236373879a7c48ecc35d6f.tar.gz
scala-e56821baaf295980ff236373879a7c48ecc35d6f.tar.bz2
scala-e56821baaf295980ff236373879a7c48ecc35d6f.zip
proper XML patterns, bugfix in literal parser, ...
proper XML patterns, bugfix in literal parser, nodeBuffer added
Diffstat (limited to 'test/files/jvm')
-rw-r--r--test/files/jvm/xmlLiterals.scala6
-rw-r--r--test/files/jvm/xmlstuff.check1
-rw-r--r--test/files/jvm/xmlstuff.scala8
3 files changed, 11 insertions, 4 deletions
diff --git a/test/files/jvm/xmlLiterals.scala b/test/files/jvm/xmlLiterals.scala
index f3ee124d33..c751a5c8a7 100644
--- a/test/files/jvm/xmlLiterals.scala
+++ b/test/files/jvm/xmlLiterals.scala
@@ -160,7 +160,7 @@ object Test03Servlet {
{headerMsg }
</p>
<p>
- { ns:_* }
+ { ns }
</p>
<hr/>
<p>
@@ -179,10 +179,10 @@ object Test03Servlet {
*/
def beautify( n:Node ):Node = n match {
case <td>{xs @ _* }</td> =>
- <td bgcolor="#AAAAFF" color="#222255">{ xs:_* }</td>
+ <td bgcolor="#AAAAFF" color="#222255">{ xs }</td>
case <table>{ xs @ _* }</table> =>
- <table align="center">{ beautify( xs ):_*}</table>
+ <table align="center">{ beautify( xs )}</table>
case Elem( label, _, xs @ _* ) =>
new Elem( label, beautify( xs ):_*)
diff --git a/test/files/jvm/xmlstuff.check b/test/files/jvm/xmlstuff.check
index 9429214ffe..f8bab77aac 100644
--- a/test/files/jvm/xmlstuff.check
+++ b/test/files/jvm/xmlstuff.check
@@ -30,3 +30,4 @@ passed ok
<title>Blubabla</title>
<remarks>rem 2</remarks>
</result>
+List(<book><title>Blabla</title></book>)
diff --git a/test/files/jvm/xmlstuff.scala b/test/files/jvm/xmlstuff.scala
index 3e482e62b1..95295838af 100644
--- a/test/files/jvm/xmlstuff.scala
+++ b/test/files/jvm/xmlstuff.scala
@@ -226,8 +226,14 @@ object Test with Application {
r \ "title" == t) yield
<result>
{ t }
- { (r \ "remarks"):_* }
+ { r \ "remarks" }
</result>
));
+ // example
+ Console.println(
+ for( val t @ <book><title>Blabla</title></book> <- new NodeSeq( books.child ).asList)
+ yield t
+ );
+
}