Changeset 1667822 in git

Timestamp:

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

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

01cd17fd67cfda8867350bb5007624dde10be224

Parents:

04f6a4e219c5180c44ff638afd7e63cc8ffa3699

Message:

*bricken: refactoring


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

Location:

modules/openmathserver

Files:

• arith1.py (modified) (2 diffs)
• binding.py (modified) (2 diffs)
• cd.py (modified) (2 diffs)
• objects.py (modified) (5 diffs)

modules/openmathserver/arith1.py

@@ -8 +8 @@
 implementation=OMcdImplementation(content)
 
-plussym=OMsymbol("plus",content)
+plussym=OMSymbol("plus",content)
 
 def plusfunc(context, *args):
@@ -25 +25 @@
 #print sym==plussym
 #print implementation[plussym]
-#plusimpl=ImplementedOMsymbol(plussym,plusfunc)
+#plusimpl=ImplementedOMSymbol(plussym,plusfunc)
 #implementation[plussym]=plusimpl
 #print "Laenge", (len(implementation.implementations))
-#assert OMsymbol("plus",content)==OMsymbol("plus",content)
+#assert OMSymbol("plus",content)==OMSymbol("plus",content)

modules/openmathserver/binding.py

@@ -1 @@
-from objects import OMObjectBase, OMsymbol
+from objects import OMObjectBase, OMSymbol
 from cd import *
 from omexceptions import *
@@ -5 +5 @@
 from copy import copy
 cdFns1=OMcd("fns1")
-lambdasym=OMsymbol("lambda",cdFns1)
+lambdasym=OMSymbol("lambda",cdFns1)
 
 def islambda(sym):

modules/openmathserver/cd.py

@@ -1 @@
-from objects import OMsymbol
+from objects import OMSymbol
 from omexceptions import *
 class OMcd(object):
@@ -22 +22 @@
         self.implementations[name]=value
     def implement(self,symbolname, func):
-        symbol=OMsymbol(symbolname,self.cd)
-        impl=ImplementedOMsymbol(symbol,func)
+        symbol=OMSymbol(symbolname,self.cd)
+        impl=ImplementedOMSymbol(symbol,func)
         self[symbol]=impl
         
 
 
-class ImplementedOMsymbol(OMsymbol):
+class ImplementedOMSymbol(OMSymbol):
     def __init__(self,symbol, func):
-        super(ImplementedOMsymbol,self).__init__(symbol.name, symbol.cd)
+        super(ImplementedOMSymbol,self).__init__(symbol.name, symbol.cd)
         self.implementation=func
     def __str__(self):

modules/openmathserver/objects.py

@@ -105 +105 @@
         closing="".join(["</"+self.XMLtag+">"])
         return "".join([opening,body,closing])
-class OMvar(OMObjectBase):
+class OMVar(OMObjectBase):
     def __init__(self,name):
-        super(OMvar,self).__init__()
+        super(OMVar,self).__init__()
         self.name=name
     def evaluate(self,context):
@@ -142 +142 @@
         raise UnsupportedOperationError
         
-class OMsymbol(OMObjectBase):
+class OMSymbol(OMObjectBase):
     def __init__(self,name,cd=None):
-        super(OMsymbol,self).__init__()
+        super(OMSymbol,self).__init__()
         self.cd=cd
         self.name=name
@@ -206 +206 @@
     def getXMLattributes(self):
         return [XMLattribute("dec",str(self.value))]
-class OMref(OMObjectBase):
+class OMRef(OMObjectBase):
     def __init__(self, ref):
         self.ref=ref
@@ -225 +225 @@
     context["x"]=OMint(1)
 
-    x=OMvar("x")
-
-    y=OMvar("y")
+    x=OMVar("x")
+
+    y=OMVar("y")
 
     print context.evaluate(x)
     print context.evaluate(y)
-    firstArg=OMbinding(lambdasym,[OMvar("x"), OMvar("y")], OMvar("x"))
+    firstArg=OMbinding(lambdasym,[OMVar("x"), OMVar("y")], OMVar("x"))
     #print context.evaluate(firstArg)
     application=OMapplication(firstArg, [x,y])
@@ -242 +242 @@
     #application=OMapplication(arith1.plussym,[x])
     #application=OMapplication(arith1.plussym,[x,x])
-    application=OMapplication(OMsymbol("plus",arith1.content),[x,x])
+    application=OMapplication(OMSymbol("plus",arith1.content),[x,x])
     
     print context.evaluate(application)
-    application=OMapplication(OMsymbol("plus",arith1.content),[x,x,x])
+    application=OMapplication(OMSymbol("plus",arith1.content),[x,x,x])
     
     print context.evaluate(application)