diff options
| author | buraq <buraq@epfl.ch> | 2004-05-11 14:52:32 +0000 |
|---|---|---|
| committer | buraq <buraq@epfl.ch> | 2004-05-11 14:52:32 +0000 |
| commit | 1b9f47f3e3f015944b3b92c9d5d3fde552b110b2 (patch) | |
| tree | 8daa8f7dc3bb34c7808bbe51aabe95d1413d287a | |
| parent | 0214953367ada2ed41872129c00270f2c4a57079 (diff) | |
| download | scala-1b9f47f3e3f015944b3b92c9d5d3fde552b110b2.tar.gz scala-1b9f47f3e3f015944b3b92c9d5d3fde552b110b2.tar.bz2 scala-1b9f47f3e3f015944b3b92c9d5d3fde552b110b2.zip | |
uses new stack interface, removed ref to appendbuf
| -rw-r--r-- | sources/scala/xml/FactoryAdapter.scala | 8 | ||||
| -rw-r--r-- | sources/scala/xml/Node.scala | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sources/scala/xml/FactoryAdapter.scala b/sources/scala/xml/FactoryAdapter.scala index 7e0595fb3a..0b9dbcf7d6 100644 --- a/sources/scala/xml/FactoryAdapter.scala +++ b/sources/scala/xml/FactoryAdapter.scala @@ -187,14 +187,14 @@ abstract class FactoryAdapter captureText(); - val attribMap = attribStack.top; attribStack.pop; + val attribMap = attribStack.pop; // reverse order to get it right var v:List[Node] = Nil; - var child:Node = hStack.top; hStack.pop; + var child:Node = hStack.pop; while( child != null ) { v = child::v; - child = hStack.top; hStack.pop; + child = hStack.pop; } // create element @@ -202,7 +202,7 @@ abstract class FactoryAdapter hStack.push(rootElem); // set - curTag = tagStack.top; tagStack.pop; + curTag = tagStack.pop; if (curTag != null) // root level capture = nodeContainsText(curTag); diff --git a/sources/scala/xml/Node.scala b/sources/scala/xml/Node.scala index caa5dd6e4a..67f2b82e07 100644 --- a/sources/scala/xml/Node.scala +++ b/sources/scala/xml/Node.scala @@ -9,8 +9,6 @@ package scala.xml ; -import scala.collection.mutable.AppendBuffer ; - /** Trait for representing XML using nodes of a labelled tree. * This trait contains an implementation of a subset of XPath for navigation. */ |