diff options
author | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2011-11-02 14:34:35 +0000 |
---|---|---|
committer | Hubert Plociniczak <hubert.plociniczak@epfl.ch> | 2011-11-02 14:34:35 +0000 |
commit | b6778be91900b8161e705dc2598ef7af86842b0b (patch) | |
tree | d15e8ec18a37eec212f50f1ace27714d7e7d4d34 /docs/examples/xml | |
parent | ac6c76f26d884a94d0c9ff54f055d3f9ab750bac (diff) | |
download | scala-b6778be91900b8161e705dc2598ef7af86842b0b.tar.gz scala-b6778be91900b8161e705dc2598ef7af86842b0b.tar.bz2 scala-b6778be91900b8161e705dc2598ef7af86842b0b.zip |
Begone t1737...
Diffstat (limited to 'docs/examples/xml')
-rw-r--r-- | docs/examples/xml/phonebook/embeddedBook.scala | 8 | ||||
-rw-r--r-- | docs/examples/xml/phonebook/phonebook.scala | 14 | ||||
-rw-r--r-- | docs/examples/xml/phonebook/phonebook1.scala | 8 | ||||
-rw-r--r-- | docs/examples/xml/phonebook/phonebook2.scala | 10 | ||||
-rw-r--r-- | docs/examples/xml/phonebook/phonebook3.scala | 32 | ||||
-rw-r--r-- | docs/examples/xml/phonebook/verboseBook.scala | 12 |
6 files changed, 42 insertions, 42 deletions
diff --git a/docs/examples/xml/phonebook/embeddedBook.scala b/docs/examples/xml/phonebook/embeddedBook.scala index 8ea9628212..3286485f0b 100644 --- a/docs/examples/xml/phonebook/embeddedBook.scala +++ b/docs/examples/xml/phonebook/embeddedBook.scala @@ -1,5 +1,5 @@ /* examples/phonebook/embeddedBook.scala */ -package phonebook +package phonebook object embeddedBook { @@ -8,14 +8,14 @@ object embeddedBook { val last = "Emir" val location = "work" - val embBook = + val embBook = <phonebook> <descr> - This is the <b>phonebook</b> of the + This is the <b>phonebook</b> of the {company} corporation. </descr> <entry> - <name>{ first+" "+last }</name> + <name>{ first+" "+last }</name> <phone where={ location }>+41 21 693 68 {val x = 60 + 7; x}</phone> </entry> </phonebook>; diff --git a/docs/examples/xml/phonebook/phonebook.scala b/docs/examples/xml/phonebook/phonebook.scala index 4813c2d20d..3c0dfbd837 100644 --- a/docs/examples/xml/phonebook/phonebook.scala +++ b/docs/examples/xml/phonebook/phonebook.scala @@ -2,14 +2,14 @@ package phonebook ; object phonebook { - val labPhoneBook = + val labPhoneBook = <phonebook> <descr> - This is the <b>phonebook</b> of the + This is the <b>phonebook</b> of the <a href="http://acme.org">ACME</a> corporation. </descr> <entry> - <name>Burak</name> + <name>Burak</name> <phone where="work"> +41 21 693 68 67</phone> <phone where="mobile">+41 79 602 23 23</phone> </entry> @@ -22,14 +22,14 @@ object phonebook { import scala.xml.{ Node, Text }; def add( phonebook:Node, newEntry:Node ):Node = phonebook match { - case <phonebook>{ ch @ _* }</phonebook> => + case <phonebook>{ ch @ _* }</phonebook> => <phonebook>{ ch }{ newEntry }</phonebook> } - val pb2 = - add( labPhoneBook, + val pb2 = + add( labPhoneBook, <entry> - <name>Kim</name> + <name>Kim</name> <phone where="work"> +41 21 111 11 11</phone> </entry> ); diff --git a/docs/examples/xml/phonebook/phonebook1.scala b/docs/examples/xml/phonebook/phonebook1.scala index 3a7a165202..316c6c1995 100644 --- a/docs/examples/xml/phonebook/phonebook1.scala +++ b/docs/examples/xml/phonebook/phonebook1.scala @@ -1,16 +1,16 @@ /* examples/phonebook/phonebook1.scala */ -package phonebook +package phonebook object phonebook1 { - val labPhoneBook = + val labPhoneBook = <phonebook> <descr> - This is the <b>phonebook</b> of the + This is the <b>phonebook</b> of the <a href="http://acme.org">ACME</a> corporation. </descr> <entry> - <name>Burak Emir</name> + <name>Burak Emir</name> <phone where="work">+41 21 693 68 67</phone> </entry> </phonebook>; diff --git a/docs/examples/xml/phonebook/phonebook2.scala b/docs/examples/xml/phonebook/phonebook2.scala index ba50379369..2a708daf7c 100644 --- a/docs/examples/xml/phonebook/phonebook2.scala +++ b/docs/examples/xml/phonebook/phonebook2.scala @@ -8,18 +8,18 @@ object phonebook2 { /** adds an entry to a phonebook */ def add( p: Node, newEntry: Node ): Node = p match { - case <phonebook>{ ch @ _* }</phonebook> => + case <phonebook>{ ch @ _* }</phonebook> => <phonebook>{ ch }{ newEntry }</phonebook> } - val pb2 = - add( phonebook1.labPhoneBook, + val pb2 = + add( phonebook1.labPhoneBook, <entry> - <name>Kim</name> + <name>Kim</name> <phone where="work">+41 21 111 11 11</phone> </entry> ); - def main( args: Array[String] ) = + def main( args: Array[String] ) = Console.println( pb2 ) } diff --git a/docs/examples/xml/phonebook/phonebook3.scala b/docs/examples/xml/phonebook/phonebook3.scala index 0dfae351b5..12f2deaa79 100644 --- a/docs/examples/xml/phonebook/phonebook3.scala +++ b/docs/examples/xml/phonebook/phonebook3.scala @@ -17,57 +17,57 @@ object phonebook3 { import xml.Utility.{trim,trimProper} //removes whitespace nodes, which are annoying in matches - for( val c <- ch ) yield + for( val c <- ch ) yield trimProper(c) match { // if the node is the particular entry we are looking for, return an updated copy - case x @ <entry><name>{ Text(Name) }</name>{ ch1 @ _* }</entry> => + case x @ <entry><name>{ Text(Name) }</name>{ ch1 @ _* }</entry> => var updated = false; val ch2 = for(c <- ch1) yield c match { // does it have the phone number? - case y @ <phone>{ _* }</phone> if y \ "@where" == Where => + case y @ <phone>{ _* }</phone> if y \ "@where" == Where => updated = true <phone where={ Where }>{ newPhone }</phone> - + case y => y - + } if( !updated ) { // no, so we add as first entry - + <entry> <name>{ Name }</name> <phone where={ Where }>{ newPhone }</phone> { ch1 } </entry> - + } else { // yes, and we changed it as we should - + <entry> { ch2 } </entry> - - } + + } // end case x @ <entry>... - + // other entries are copied without changing them - case x => + case x => x - + } } ; // for ... yield ... returns an Iterator[Node] - + // decompose phonebook, apply updates phonebook match { case <phonebook>{ ch @ _* }</phonebook> => <phonebook>{ copyOrChange( ch.iterator ) }</phonebook> } - + } - val pb2 = + val pb2 = change( phonebook1.labPhoneBook, "John", "work", "+41 55 555 55 55" ); val pp = new PrettyPrinter( 80, 5 ); diff --git a/docs/examples/xml/phonebook/verboseBook.scala b/docs/examples/xml/phonebook/verboseBook.scala index 611cf5370e..2dcb155480 100644 --- a/docs/examples/xml/phonebook/verboseBook.scala +++ b/docs/examples/xml/phonebook/verboseBook.scala @@ -1,24 +1,24 @@ /* examples/xml/phonebook/verboseBook.scala */ -package phonebook +package phonebook object verboseBook { - import scala.xml.{ UnprefixedAttribute, Elem, Node, Null, Text, TopScope } + import scala.xml.{ UnprefixedAttribute, Elem, Node, Null, Text, TopScope } - val pbookVerbose = + val pbookVerbose = Elem(null, "phonebook", Null, TopScope, Elem(null, "descr", Null, TopScope, - Text("This is a "), + Text("This is a "), Elem(null, "b", Null, TopScope, Text("sample")), Text("description") ), Elem(null, "entry", Null, TopScope, Elem(null, "name", Null, TopScope, Text("Burak Emir")), - Elem(null, "phone", new UnprefixedAttribute("where","work", Null), TopScope, + Elem(null, "phone", new UnprefixedAttribute("where","work", Null), TopScope, Text("+41 21 693 68 67")) ) ) - def main(args: Array[String]) = + def main(args: Array[String]) = Console.println( pbookVerbose ) } |