Changeset 01cd17f in git

Timestamp:

Jun 15, 2005, 1:52:50 PM (18 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

aeb6d365075d1f830530abf950058c3afdc8f977

Parents:

16678227fe277530e8904f607ce8e6128f93df2a

Message:

*bricken: refactoring


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

Location:

modules/openmathserver

Files:

• objects.py (modified) (8 diffs)
• omxmlreader.py (modified) (3 diffs)
• xmlencodetest.py (modified) (1 diff)

modules/openmathserver/objects.py

@@ -2 +2 @@
 from exceptions import *
 #from cd import *
-class XMLattribute(object):
+class XMLAttribute(object):
     def __init__(self, name, value):
         self.name=name
@@ -56 +56 @@
         except AttributeError:
                 raise UnsupportedOperationError
-    def __getXMLattributes(self):
-        try:
-            return self.getXMLattributes()
-        except AttributeError:
-            try:
-                return self.__XMLattributes
+    def __getXMLAttributes(self):
+        try:
+            return self.getXMLAttributes()
+        except AttributeError:
+            try:
+                return self.__XMLAttributes
             except AttributeError:
                 #do return None, cause if modifiying a new list, changes will not be saved
                 return []
-    def __delXMLattributes(self):
-        try:
-            self.delXMLattributes()
+    def __delXMLAttributes(self):
+        try:
+            self.delXMLAttributes()
             return
         except AttributeError:
             try:
-                del self.__XMLattributes
+                del self.__XMLAttributes
             except AttributeError:
                 pass
-    def __setXMLattributes(self,XMLattributes):
-        try:
-            self.setBody(XMLattributes)
+    def __setXMLAttributes(self,XMLAttributes):
+        try:
+            self.setBody(XMLAttributes)
         except AttributeError:
             raise UnsupportedOperationError
@@ -83 +83 @@
     body=property(__getBody,__setBody,__delBody,\
         "xml body,FIXME: at the moment only char data")
-    XMLattributes=property(__getXMLattributes,__setXMLattributes,__delXMLattributes,\
+    XMLAttributes=property(__getXMLAttributes,__setXMLAttributes,__delXMLAttributes,\
         "xml attributes")
     def XMLencode(self, context):
         
-        attr=self.XMLattributes
+        attr=self.XMLAttributes
         if attr:
             attrstr=" "+" ".join([a.encode(context) for a in attr])
@@ -117 +117 @@
         return "OMV(" + self.name +")"
     XMLtag="OMV"
-    def getXMLattributes(self):
-        return [XMLattribute("name", self.name)]
+    def getXMLAttributes(self):
+        return [XMLAttribute("name", self.name)]
         
-class OMapplication(OMObjectBase):
+class OMApply(OMObjectBase):
     def __init__(self, func, args):
-        super(OMapplication,self).__init__()
+        super(OMApply,self).__init__()
         self.func=func
         self.args=args
@@ -132 +132 @@
                 return context.apply(efunc, eargs)
             except EvaluationFailedError, NotImplementedError:
-                return OMapplication(efunc, eargs)
+                return OMApply(efunc, eargs)
                 #return self
         else:
-            return OMapplication(efunc, eargs)
+            return OMApply(efunc, eargs)
     XMLtag="OMA"
     def getChildren(self):
@@ -159 +159 @@
         return context.evaluateSymbol(self)
     XMLtag="OMS"
-    def getXMLattributes(self):
-        return [XMLattribute("name", self.name),\
-                 XMLattribute("cdbase",self.cd.base),\
-                 XMLattribute("cd",self.cd.name)]
-    def setXMLattributes(self):
+    def getXMLAttributes(self):
+        return [XMLAttribute("name", self.name),\
+                 XMLAttribute("cdbase",self.cd.base),\
+                 XMLAttribute("cd",self.cd.name)]
+    def setXMLAttributes(self):
         raise UnsupportedOperationError
 class SimpleValue(OMObjectBase):
@@ -204 +204 @@
         return "OMfloat("+repr(self.value)+")"
     XMLtag="OMF"
-    def getXMLattributes(self):
-        return [XMLattribute("dec",str(self.value))]
+    def getXMLAttributes(self):
+        return [XMLAttribute("dec",str(self.value))]
 class OMRef(OMObjectBase):
     def __init__(self, ref):
@@ -233 +233 @@
     firstArg=OMbinding(lambdasym,[OMVar("x"), OMVar("y")], OMVar("x"))
     #print context.evaluate(firstArg)
-    application=OMapplication(firstArg, [x,y])
-    print context.evaluate(application)
-    application=OMapplication(firstArg,[y,x])
+    application=OMApply(firstArg, [x,y])
+    print context.evaluate(application)
+    application=OMApply(firstArg,[y,x])
     print context.evaluate(application)
     import arith1
     context.addCDImplementation(arith1.implementation)
     #print type(context.lookupImplementation(arith1.plussym))
-    #application=OMapplication(arith1.plussym,[x])
-    #application=OMapplication(arith1.plussym,[x,x])
-    application=OMapplication(OMSymbol("plus",arith1.content),[x,x])
+    #application=OMApply(arith1.plussym,[x])
+    #application=OMApply(arith1.plussym,[x,x])
+    application=OMApply(OMSymbol("plus",arith1.content),[x,x])
     
     print context.evaluate(application)
-    application=OMapplication(OMSymbol("plus",arith1.content),[x,x,x])
+    application=OMApply(OMSymbol("plus",arith1.content),[x,x,x])
     
     print context.evaluate(application)

modules/openmathserver/omxmlreader.py

@@ -51 +51 @@
             name=node.getAttribute("name") #node.attributes["name"]
             #print dir(name)
-            erg= OMvar(name)
+            erg= OMVar(name)
         if (node.nodeName=="OMS"):
             if node.hasAttribute("cdbase"):
@@ -67 +67 @@
             else:
                 cd=OMcd(cdname,cdbase)
-            erg=OMsymbol(name,cd)
+            erg=OMSymbol(name,cd)
         if (node.nodeName=="OMA"):
             children=[self.buildFromNode(c) for c in node.childNodes]
@@ -82 +82 @@
         if (node.nodeName=="OMR"):
             if node.hasAttribute("xref"):
-                erg=OMref(node.getAttribute("xref"))
+                erg=OMRef(node.getAttribute("xref"))
                 self.refs.append(erg)
             else:

modules/openmathserver/xmlencodetest.py

@@ -8 +8 @@
 print i.XMLencode(context)
 print context.XMLEncodeObject(i)
-v=OMvar("x")
+v=OMVar("x")
 print v.XMLencode(context)
 x=v
-y=OMvar("y")
-a=OMapplication(OMsymbol("plus",arith1.content),[x,y,i])
+y=OMVar("y")
+a=OMapplication(OMSymbol("plus",arith1.content),[x,y,i])
 print a.XMLencode(context)
 print context.XMLEncodeObject(context.evaluate(a))
-a1=OMapplication(OMsymbol("plus",arith1.content),[OMint(1),OMint(2)])
-a2=OMapplication(OMsymbol("plus",arith1.content),[a1,OMint(2)])
-a3=OMapplication(OMsymbol("plus",arith1.content),[a2,x])
+a1=OMapplication(OMSymbol("plus",arith1.content),[OMint(1),OMint(2)])
+a2=OMapplication(OMSymbol("plus",arith1.content),[a1,OMint(2)])
+a3=OMapplication(OMSymbol("plus",arith1.content),[a2,x])
 context.addCDImplementation(arith1.implementation)
 print "a3", context.XMLEncodeObject(context.evaluate(a3))