[Checkins] SVN: Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/ minor changes, remove mixups in the code

Charith Paranaliyanage paranaliyanage at gmail.com
Wed Jul 9 04:18:37 EDT 2008


Log message for revision 88132:
  minor changes, remove mixups in the code 

Changed:
  U   Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/queryobject/queryobject.py
  U   Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/rewriter/algebra.py

-=-
Modified: Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/queryobject/queryobject.py
===================================================================
--- Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/queryobject/queryobject.py	2008-07-09 07:49:00 UTC (rev 88131)
+++ Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/queryobject/queryobject.py	2008-07-09 08:18:36 UTC (rev 88132)
@@ -20,20 +20,22 @@
 from ocql.interfaces import IObjectQuery, IObjectQueryHead, IObjectQueyChild
 from ocql.queryobject.interfaces import *
 
-class Head:
+class Head(Location):
     implements(IObjectQueryHead)
     def __init__(self, tree):
         self.name = 'head'
         self.tree = tree
+        locate(tree, self, 'tree')
         
+        
     def rewrite(self):
         return self.tree
 
-class Child:
+class Child(Location):
     implements(IObjectQueyChild)
     children = []
 
-class QueryObject(Child, Location):
+class QueryObject(Child):
     #TODO: this is dirty here, at the end we'll need to have a tree of
     #QueryObject's whose topmost element will only get this IF
     implements(IObjectQuery)
@@ -108,6 +110,7 @@
         self.klass = klass
         self.conditional = conditional
         locate(expr, self, 'expr')
+        locate(klass, self, 'klass')
         locate(conditional, self, 'conditional')
         self.children.extend([expr, klass, conditional])
 

Modified: Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/rewriter/algebra.py
===================================================================
--- Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/rewriter/algebra.py	2008-07-09 07:49:00 UTC (rev 88131)
+++ Sandbox/adamg/ocql/branches/qo-compiler/src/ocql/rewriter/algebra.py	2008-07-09 08:18:36 UTC (rev 88132)
@@ -23,6 +23,7 @@
     def __init__(self, tree):
         name = 'head'
         self.tree = tree
+        locate(tree, self, 'tree')
 
     def __repr__(self):
         return ('%s') % (self.tree)



More information about the Checkins mailing list