modified xml parsing

Author: buraq

sources/scala/xml/Attribute.scala

@@ -29,8 +29,3 @@ case class Attribute(namespace:String, key:String, value:String) with Ordered[At
   }
 
 }
-
-class IntAttribute(namespace:String, key:String, theIntValue:Int)
-extends Attribute(namespace, key, theIntValue.toString()) {
-  final override def intValue = theIntValue;
-}

sources/scala/xml/AttributeSeq.scala

@@ -10,6 +10,7 @@
 package scala.xml ;
 
 import scala.collection.Map ;
+import scala.collection.mutable ;
 import scala.collection.immutable.TreeSet ;
 
 object AttributeSeq {
@@ -85,5 +86,16 @@ abstract class AttributeSeq with Seq[Attribute] {
   }
 
   override def hashCode():Int = sortedSeq.hashCode();
+
+  def toMap:Map[Pair[String,String],Attribute] =
+    new Map[Pair[String,String],Attribute] {
+      def elements = new Iterator[Pair[Pair[String,String],Attribute]] {
+        val it = AttributeSeq.this.sortedSeq.elements;
+        def hasNext = it.hasNext;
+        def next = { val a = it.next; Pair(Pair(a.namespace,a.key),a) }
+      }
+      def size = AttributeSeq.this.length;
+      def get(p:Pair[String,String]) = AttributeSeq.this.lookup(p._1, p._2);
+    }
 }
 

sources/scala/xml/NodeTraverser.scala

@@ -0,0 +1,25 @@
+/*                     __                                               *\
+**     ________ ___   / /  ___     Scala API                            **
+**    / __/ __// _ | / /  / _ |    (c) 2003-2004, LAMP/EPFL             **
+**  __\ \/ /__/ __ |/ /__/ __ |                                         **
+** /____/\___/_/ |_/____/_/ | |                                         **
+**                          |/                                          **
+** $Id$
+\*                                                                      */
+
+package scala.xml ;
+
+import scala.collection.mutable ;
+
+abstract class NodeTraverser[A](handle: parsing.MarkupHandler[A]) {
+
+  def traverse(n: Node): Iterable[A] = {
+    val nb = new mutable.ArrayBuffer[A]();
+    val it = n.child.elements;
+    while(it.hasNext) {
+      nb.appendAll(traverse(it.next));
+    }
+    handle.element(0, n.namespace, n.label, n.attributes.toMap, nb)
+  }
+
+}

sources/scala/xml/parsing/ConstructingHandler.scala

@@ -1,6 +1,6 @@
 package scala.xml.parsing;
 
-import scala.collection.immutable.Map ;
+import scala.collection.Map ;
 import scala.collection.mutable ;
 
 /** */
@@ -10,7 +10,7 @@ class ConstructingHandler extends MarkupHandler[Node] {
 
   //def attributeNamespaceDecl(pos: int, uri: String) = NamespaceDecl(uri);
 
-  def element(pos: int, uri: String, label: String, attrMap1: mutable.Map[Pair[String,String],Attribute], args: mutable.Buffer[Node]) = {
+  def element(pos: int, uri: String, label: String, attrMap1: Map[Pair[String,String],Attribute], args: mutable.Buffer[Node]) = {
 
     var attrs = new Array[Attribute](attrMap1.size);
     {

sources/scala/xml/parsing/MarkupHandler.scala

@@ -47,7 +47,7 @@ abstract class MarkupHandler[A] {
    *  @param attrMap1 the attribute map, from Pair(uri,label) to target
    *  @param args     the children of this element
    */
-  def element(pos: int, uri: String, label: String, attrMap1: mutable.Map[Pair[String,String],Attribute], args: mutable.Buffer[A]): Iterable[A];
+  def element(pos: int, uri: String, label: String, attrMap1: Map[Pair[String,String],Attribute], args: mutable.Buffer[A]): Iterable[A];
 
   def charData(pos: Int, txt: String ): Iterable[A];
   def procInstr(pos: Int, target: String, txt: String): Iterable[A];