[Checkins]
SVN: Sandbox/adamg/ocql/branches/alg-compiler/src/ocql/queryobject/queryobject.py
revert changes to previous revision
Charith Paranaliyanage
paranaliyanage at gmail.com
Thu Jul 3 05:07:36 EDT 2008
Log message for revision 87950:
revert changes to previous revision
Changed:
U Sandbox/adamg/ocql/branches/alg-compiler/src/ocql/queryobject/queryobject.py
-=-
Modified: Sandbox/adamg/ocql/branches/alg-compiler/src/ocql/queryobject/queryobject.py
===================================================================
--- Sandbox/adamg/ocql/branches/alg-compiler/src/ocql/queryobject/queryobject.py 2008-07-03 08:33:43 UTC (rev 87949)
+++ Sandbox/adamg/ocql/branches/alg-compiler/src/ocql/queryobject/queryobject.py 2008-07-03 09:07:34 UTC (rev 87950)
@@ -25,8 +25,6 @@
metadata = None
symbols = None
-
- __parent__ = __name__ = None
def __init__(self, metadata, symbols):
self.metadata = metadata
@@ -96,10 +94,7 @@
)
def rewrite(self, algebra):
- rv = algebra.Identifier(self.name)
- rv.__name__ = algebra.Identifier.__name__
- return rv
-
+ return algebra.Identifier(self.name)
class Constant(Expression):
#this shall be abstract?
@@ -115,9 +110,7 @@
self.__class__.__name__, self.value)
def rewrite(self, algebra):
- rv = algebra.Constant(self.value)
- rv.__name__ = algebra.Constant.__name__
- return rv
+ return algebra.Constant(self.value)
class StringConstant(Constant):
pass
@@ -210,12 +203,9 @@
algebra.Empty(self.collection_type, None)
)
else:
- child = self.target.rewrite(algebra)
rv = algebra.Single(
self.collection_type,
- child)
- rv.__name__ = algebra.Single.__name__
- child.__parent__ = rv
+ self.target.rewrite(algebra))
self.symbols.dellevel()
return rv
@@ -296,45 +286,25 @@
)
def rewrite(self, algebra):
- left_child = self.left.rewrite(algebra)
- right_child = self.right.rewrite(algebra)
- rv = algebra.Binary(
- left_child,
+ return algebra.Binary(
+ self.left.rewrite(algebra),
self.get_operator(algebra),
- right_child)
- rv.__name__ = algebra.Binary.__name__
- left_child.__parent__ = rv
- right_child.__parent__ = rv
- return rv
-
+ self.right.rewrite(algebra))
+
# Sets and properties
class Union(Binary):
def rewrite(self, algebra):
- left_child = self.left.rewrite(algebra)
- right_child = self.right.rewrite(algebra)
- rv = algebra.Union(
+ return algebra.Union(
self.left.get_collection_type(),
- left_child,
- right_child)
- rv.__name__ = algebra.Union.__name__
- left_child.__parent__ = rv
- right_child.__parent__ = rv
- return rv
-
+ self.left.rewrite(algebra),
+ self.right.rewrite(algebra))
class Differ(Binary):
def rewrite(self, algebra):
- left_child = self.left.rewrite(algebra)
- right_child = self.right.rewrite(algebra)
- rv = algebra.Differ(
+ return algebra.Differ(
self.left.get_collection_type(),
- left_child,
- right_child)
- rv.__name__ = algebra.Differ.__name__
- left_child.__parent__ = rv
- right_child.__parent__ = rv
- return rv
-
+ self.left.rewrite(algebra),
+ self.right.rewrite(algebra))
class And(Binary):
def get_operator(self, algebra):
@@ -346,11 +316,9 @@
class Property(Binary):
def rewrite(self, algebra): # FIXME: Ezt gondold at...
- rv = algebra.Identifier(
+ return algebra.Identifier(
'.'.join([self.left.name, self.right.name]))
- rv.__name__ = 'Property'
- return rv
-
+
def get_class(self):
t = self.left.get_class()
@@ -411,8 +379,7 @@
class Not(Unary):
def rewrite(self, algebra):
- rv = algebra.Not(self.expression.rewrite(algebra))
- rv.__name__ = algebra.Not.__name__
+ return algebra.Not(self.expression.rewrite(algebra))
class Aggregate(Unary):
pass
More information about the Checkins
mailing list