Changeset aeb6d3 in git

Timestamp:

Jun 15, 2005, 1:55:14 PM (18 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

b1b9c0df208edd2e29beb3a44d02c10061ac160b

Parents:

01cd17fd67cfda8867350bb5007624dde10be224

Message:

*bricken: refactoring


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

Location:

modules/openmathserver

Files:

• arith1.py (modified) (1 diff)
• binding.py (modified) (1 diff)
• omxmlreader.py (modified) (1 diff)
• xmlencodetest.py (modified) (2 diffs)

modules/openmathserver/arith1.py

@@ -5 +5 @@
 from omexceptions import *
 
-content=OMcd("arith1")
-implementation=OMcdImplementation(content)
+content=OMCD("arith1")
+implementation=OMCDImplementation(content)
 
 plussym=OMSymbol("plus",content)

modules/openmathserver/binding.py

@@ -4 +4 @@
 from itertools import izip
 from copy import copy
-cdFns1=OMcd("fns1")
+cdFns1=OMCD("fns1")
 lambdasym=OMSymbol("lambda",cdFns1)
 

modules/openmathserver/omxmlreader.py

@@ -70 +70 @@
         if (node.nodeName=="OMA"):
             children=[self.buildFromNode(c) for c in node.childNodes]
-            erg= OMapplication(children[0],children[1:])
+            erg= OMApply(children[0],children[1:])
         if (node.nodeName=="OMBIND"):
             children=[self.buildFromNode(c) for c in node.childNodes]

modules/openmathserver/xmlencodetest.py

@@ -12 +12 @@
 x=v
 y=OMVar("y")
-a=OMapplication(OMSymbol("plus",arith1.content),[x,y,i])
+a=OMApply(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=OMApply(OMSymbol("plus",arith1.content),[OMint(1),OMint(2)])
+a2=OMApply(OMSymbol("plus",arith1.content),[a1,OMint(2)])
+a3=OMApply(OMSymbol("plus",arith1.content),[a2,x])
 context.addCDImplementation(arith1.implementation)
 print "a3", context.XMLEncodeObject(context.evaluate(a3))
@@ -25 +25 @@
 f=OMfloat(1.23434)
 print context.XMLEncodeObject(f)
-#print v.XMLattributes
+#print v.XMLAttributes