From 899e2bf1b2aac960ba459cc1e1667ac05cf5b2cc Mon Sep 17 00:00:00 2001
From: Burak Emir <emir@epfl.ch>
Date: Tue, 11 Oct 2005 19:42:36 +0000
Subject: NodeBuffer + => &+

---
 .../scala/tools/scalac/ast/parser/SymbolicXMLBuilder.scala |  2 +-
 sources/scala/xml/factory/Binder.scala                     | 10 +++++-----
 sources/scala/xml/parsing/MarkupParser.scala               | 14 +++++++-------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/sources/scala/tools/scalac/ast/parser/SymbolicXMLBuilder.scala b/sources/scala/tools/scalac/ast/parser/SymbolicXMLBuilder.scala
index 76f8c8d871..8a76eeaa59 100644
--- a/sources/scala/tools/scalac/ast/parser/SymbolicXMLBuilder.scala
+++ b/sources/scala/tools/scalac/ast/parser/SymbolicXMLBuilder.scala
@@ -46,7 +46,7 @@ class SymbolicXMLBuilder(make: TreeFactory, gen: TreeGen, p: Parser, preserveWS:
   val _immutable           = Name.fromString("immutable");
   val _mutable             = Name.fromString("mutable");
   val _append              = Name.fromString("append");
-  val _plus                = Name.fromString("$plus");
+  val _plus                = Name.fromString("$amp$plus");
   val _collection          = Name.fromString("collection");
   val _toList              = Name.fromString("toList");
   val _xml                 = Name.fromString("xml");
diff --git a/sources/scala/xml/factory/Binder.scala b/sources/scala/xml/factory/Binder.scala
index a9af7af3d3..d387e90139 100644
--- a/sources/scala/xml/factory/Binder.scala
+++ b/sources/scala/xml/factory/Binder.scala
@@ -21,17 +21,17 @@ abstract class Binder(val preserveWS: Boolean) extends ValidatingMarkupHandler {
     Text( txt );
 
   final def traverse(n:Node): Unit = n match {
-    case x:ProcInstr => result + procInstr(0, x.target, x.text)
-    case x:Comment   => result + comment(0, x.text)
-    case x:Text      => result + text(0, x.data)
-    case x:EntityRef => result + entityRef(0, x.entityName)
+    case x:ProcInstr => result &+ procInstr(0, x.target, x.text)
+    case x:Comment   => result &+ comment(0, x.text)
+    case x:Text      => result &+ text(0, x.data)
+    case x:EntityRef => result &+ entityRef(0, x.entityName)
     case _ =>
       elemStart(0, n.prefix, n.label, n.attributes, n.scope);
       val old = result;
       result = new NodeBuffer();
       for(val m <- n.child)
         traverse(m);
-      result = old + elem(0, n.prefix, n.label, n.attributes, n.scope, NodeSeq.fromSeq(result)).toList;
+      result = old &+ elem(0, n.prefix, n.label, n.attributes, n.scope, NodeSeq.fromSeq(result)).toList;
       elemEnd(0, n.prefix, n.label);
   }
 
diff --git a/sources/scala/xml/parsing/MarkupParser.scala b/sources/scala/xml/parsing/MarkupParser.scala
index 2ff647738d..6cf17ae6f4 100644
--- a/sources/scala/xml/parsing/MarkupParser.scala
+++ b/sources/scala/xml/parsing/MarkupParser.scala
@@ -451,10 +451,10 @@ import scala.xml.dtd._ ;
   /* todo: move this into the NodeBuffer class */
   def appendText(pos: Int, ts: NodeBuffer, txt: String): Unit = {
     if (preserveWS)
-      ts + handle.text(pos, txt);
+      ts &+ handle.text(pos, txt);
     else
       for (val t <- TextBuffer.fromString(txt).toText) {
-        ts + handle.text(pos, t.text);
+        ts &+ handle.text(pos, t.text);
       }
   }
 
@@ -464,16 +464,16 @@ import scala.xml.dtd._ ;
       case '!' =>
         nextch;
       if ('[' == ch)                 // CDATA
-        ts + xCharData;
+        ts &+ xCharData;
       else if ('D' == ch) // doctypedecl, parse DTD // @todo REMOVE HACK
         parseDTD();
       else // comment
-        ts + xComment;
+        ts &+ xComment;
       case '?' =>                       // PI
         nextch;
-        ts + xProcInstr;
+        ts &+ xProcInstr;
       case _   =>
-        ts + element1(pscope);     // child
+        ts &+ element1(pscope);     // child
     }
   }
 
@@ -515,7 +515,7 @@ import scala.xml.dtd._ ;
                 nextch;
               val theChar = handle.text( tmppos, xCharRef );
               xToken(';');
-              ts + theChar ;
+              ts &+ theChar ;
               case _ => // EntityRef
                 val n = xName ;
                 xToken(';');
-- 
cgit v1.2.3