Changeset bfcf68 in git

Timestamp:

Jun 14, 2005, 2:22:52 PM (18 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'f6c3dc58b0df4bd712574325fe76d0626174ad97')

Children:

9b973c144b1c3a7ddd2df88833b75055fc1688ae

Parents:

bb3e2b01b8b571e1ce0e1df85bcb71fb0ccb8e9d

Message:

*bricken: can do this all day


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

Location:

modules/openmathserver

Files:

• context.py (modified) (2 diffs)
• objects.py (modified) (5 diffs)
• omexceptions.py (modified) (1 diff)
• xmlencodetest.py (modified) (1 diff)

modules/openmathserver/context.py

@@ -43 +43 @@
             return impl
         except NotImplementedError:
-            print "not found"
+            #TODO log this, report it
             return oms
     def evaluate(self,omobject):
@@ -61 +61 @@
                 return OMint(val)
     def apply(self,func,args):
-        return func(self,*args)
+        try:
+            return func(self,*args)
+        except:
+            raise EvaluationFailedError
     def XMLEncodeBody(self,body):
         return self.XMLEncoder.encode(body)
-    def XMLEncode(self, obj):
-        obj.XMLencode(self)
+    def XMLEncodeObject(self, obj):
+        return obj.XMLencode(self)
 class SimpleXMLEncoder(object):
     def encode(self, string):

modules/openmathserver/objects.py

@@ -95 +95 @@
         children=self.children
         if children:
-            body="".join([context.XMLencode(c) for c in children])
+            body="".join([context.XMLEncodeObject(c) for c in children])
         else:
             body=self.body
@@ -131 +131 @@
                 return context.apply(efunc, eargs)
             except EvaluationFailedError, NotImplementedError:
-                return self
+                return OMapplication(efunc, eargs)
+                #return self
         else:
             return OMapplication(efunc, eargs)
+    XMLtag="OMA"
+    def getChildren(self):
+        return [self.func]+self.args
+    def setChildren(self):
+        raise UnsupportedOperationError
 class OMsymbol(OMobject):
     def __init__(self,name,cd=None):
@@ -147 +153 @@
     def evaluate(self,context):
         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):
+        raise UnsupportedOperationError
 class SimpleValue(OMobject):
     def __init__(self,value):
@@ -172 +185 @@
         return str(self.value)
     def setBody(self, value):
-        raise OperationNotPossibleError
+        raise UnsupportedOperationError
     XMLtag="OMI"
 class OMfloat(SimpleValue):
@@ -183 +196 @@
     def __str__(self):
         return "OMfloat("+repr(self.value)+")"
+    XMLtag="OMF"
+    def getXMLattributes(self):
+        return [XMLattribute("dec",str(self.value))]
         
 if __name__=='__main__':

modules/openmathserver/omexceptions.py

@@ -7 +7 @@
 class PackagingFailedError(Exception):
     pass
-class OperationNotPossibleError(Exception):
+class UnsupportedOperationError(Exception):
     pass

modules/openmathserver/xmlencodetest.py

@@ -1 +1 @@
 from objects import *
 from context import *
+import arith1
 context=Context()
 context.push({})
 i=OMint(22482489)
-print i.body
+#print i.body
 print i.XMLencode(context)
+print context.XMLEncodeObject(i)
 v=OMvar("x")
 print v.XMLencode(context)
-print v.XMLattributes
+x=v
+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])
+context.addCDImplementation(arith1.implementation)
+print "a3", context.XMLEncodeObject(context.evaluate(a3))
+print "a2", context.XMLEncodeObject(context.evaluate(a2))
+print "a1", context.XMLEncodeObject(context.evaluate(a1))
+
+f=OMfloat(1.23434)
+print context.XMLEncodeObject(f)
+#print v.XMLattributes
+