X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=wrw%2Fsp%2Fcons.py;h=74a6ea6e30830ad324be9a51ee15beda2bc0fec8;hb=c4126c8a6fff40b684cb3332728510725b1a3738;hp=9e81677295a108458f9c9bc0fc8122c93abfe3d5;hpb=a878e812794ab36d47721a680a1bea5f4e1bcc45;p=wrw.git

diff --git a/wrw/sp/cons.py b/wrw/sp/cons.py
index 9e81677..74a6ea6 100644
--- a/wrw/sp/cons.py
+++ b/wrw/sp/cons.py
@@ -1,14 +1,16 @@
 import xml.dom.minidom
 
 class node(object):
-    def __str__(self):
-        doc = xml.dom.minidom.Document()
-        return self.__todom__(doc).toxml()
+    pass
 
 class text(node, str):
     def __todom__(self, doc):
         return doc.createTextNode(self)
 
+class raw(node, str):
+    def __todom__(self, doc):
+        raise Exception("Cannot convert raw code to DOM objects")
+
 class element(node):
     def __init__(self, ns, name, ctx):
         self.ns = ns
@@ -19,9 +21,9 @@ class element(node):
 
     def __call__(self, *children, **attrs):
         for child in children:
-            self.children.append(self.ctx.nodefrom(child))
+            self.ctx.addchild(self, child)
         for k, v in attrs.items():
-            self.attrs[str(k)] = str(v)
+            self.ctx.addattr(self, k, v)
         return self
 
     def __todom__(self, doc):
@@ -32,6 +34,10 @@ class element(node):
             el.appendChild(child.__todom__(doc))
         return el
 
+    def __str__(self):
+        doc = xml.dom.minidom.Document()
+        return self.__todom__(doc).toxml()
+
 class context(object):
     def __init__(self):
         self.nodeconv = {}
@@ -49,6 +55,12 @@ class context(object):
             return self.nodeconv[type(ob)](ob)
         raise Exception("No node conversion known for %s objects" % str(type(ob)))
 
+    def addchild(self, node, child):
+        node.children.append(self.nodefrom(child))
+
+    def addattr(self, node, k, v):
+        node.attrs[str(k)] = str(v)
+
 class constructor(object):
     def __init__(self, ns, elcls = element, ctx=None):
         self._ns = ns