Changeset 04f6a4 in git for modules/openmathserver/omxmlreader.py

Timestamp:

Jun 15, 2005, 12:37:39 PM (18 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '91e5db82acc17434e4062bcfa44e6efa7d41fd30')

Children:

16678227fe277530e8904f607ce8e6128f93df2a

Parents:

c0124632d28789a5766a1280af3eab471d401852

Message:

*bricken: references and scopes work


git-svn-id: file:///usr/local/Singular/svn/trunk@8369 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• modules/openmathserver/omxmlreader.py (modified) (4 diffs)

modules/openmathserver/omxmlreader.py

@@ -12 +12 @@
 from cd import *
 from exceptions import *
+from omexceptions import *
 def readFile(input_file_name):
     docstream = open(input_file_name)
@@ -43 +44 @@
 class OMFromXMLBuilder:
     def buildFromNode(self, node):
+        erg=None
         if (node.nodeName=="OMI"):
             content=get_text_in_children(node)
-            return OMint(content)
+            erg=OMint(content)
         if (node.nodeName=="OMV"):
             name=node.getAttribute("name") #node.attributes["name"]
             #print dir(name)
-            return OMvar(name)
+            erg= OMvar(name)
         if (node.nodeName=="OMS"):
             if node.hasAttribute("cdbase"):
@@ -65 +67 @@
             else:
                 cd=OMcd(cdname,cdbase)
-            return OMsymbol(name,cd)
+            erg=OMsymbol(name,cd)
         if (node.nodeName=="OMA"):
             children=[self.buildFromNode(c) for c in node.childNodes]
-            return OMapplication(children[0],children[1:])
+            erg= OMapplication(children[0],children[1:])
         if (node.nodeName=="OMBIND"):
             children=[self.buildFromNode(c) for c in node.childNodes]
-            return OMbinding(children[0],children[1:-1],children[-1])
+            erg= OMbinding(children[0],children[1:-1],children[-1])
         if (node.nodeName=="OMF"):
             if (node.hasAttribute("dec")):
@@ -77 +79 @@
             else:
                 raise NotImplementedError
-            return OMfloat(value)
-            
-        raise NotImplementedError
+            erg=OMfloat(value)
+        if (node.nodeName=="OMR"):
+            if node.hasAttribute("xref"):
+                erg=OMref(node.getAttribute("xref"))
+                self.refs.append(erg)
+            else:
+                raise UnresolvedReference
+        if None==erg:
+            raise NotImplementedError
+        else:
+            if node.hasAttribute("id"):
+                id=node.getAttribute("id")
+                self.ids[id]=erg
+            return erg
+    def __init__(self):
+        self.refs=[]
+        self.ids={}
     def build(self, root):
         remove_white_space(root)
-        return self.buildFromNode(root)
+        erg=self.buildFromNode(root)
+        for r in self.refs:
+            r.ref=self.ids[r.ref]
+        return erg
 #TODO: handle hex floats
 #TODO: handle floats