From 44b32ff306ce4dfe171db00d6b37df65467f3f46 Mon Sep 17 00:00:00 2001 From: Antonio Cunei Date: Mon, 7 Nov 2011 09:55:53 +0000 Subject: Backport of r25948 --- docs/examples/xml/phonebook/embeddedBook.scala | 8 +++---- docs/examples/xml/phonebook/phonebook.scala | 14 +++++------ docs/examples/xml/phonebook/phonebook1.scala | 8 +++---- docs/examples/xml/phonebook/phonebook2.scala | 10 ++++---- docs/examples/xml/phonebook/phonebook3.scala | 32 +++++++++++++------------- docs/examples/xml/phonebook/verboseBook.scala | 12 +++++----- 6 files changed, 42 insertions(+), 42 deletions(-) (limited to 'docs/examples/xml') 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 = - This is the phonebook of the + This is the phonebook of the {company} corporation. - { first+" "+last } + { first+" "+last } +41 21 693 68 {val x = 60 + 7; x} ; 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 = - This is the phonebook of the + This is the phonebook of the ACME corporation. - Burak + Burak +41 21 693 68 67 +41 79 602 23 23 @@ -22,14 +22,14 @@ object phonebook { import scala.xml.{ Node, Text }; def add( phonebook:Node, newEntry:Node ):Node = phonebook match { - case { ch @ _* } => + case { ch @ _* } => { ch }{ newEntry } } - val pb2 = - add( labPhoneBook, + val pb2 = + add( labPhoneBook, - Kim + Kim +41 21 111 11 11 ); 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 = - This is the phonebook of the + This is the phonebook of the ACME corporation. - Burak Emir + Burak Emir +41 21 693 68 67 ; 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 { ch @ _* } => + case { ch @ _* } => { ch }{ newEntry } } - val pb2 = - add( phonebook1.labPhoneBook, + val pb2 = + add( phonebook1.labPhoneBook, - Kim + Kim +41 21 111 11 11 ); - 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 @ { Text(Name) }{ ch1 @ _* } => + case x @ { Text(Name) }{ ch1 @ _* } => var updated = false; val ch2 = for(c <- ch1) yield c match { // does it have the phone number? - case y @ { _* } if y \ "@where" == Where => + case y @ { _* } if y \ "@where" == Where => updated = true { newPhone } - + case y => y - + } if( !updated ) { // no, so we add as first entry - + { Name } { newPhone } { ch1 } - + } else { // yes, and we changed it as we should - + { ch2 } - - } + + } // end case x @ ... - + // 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 { ch @ _* } => { copyOrChange( ch.iterator ) } } - + } - 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 ) } -- cgit v1.2.3