[Checkins] SVN: Sandbox/ocql-foliage/src/ocql/engine/queryobject.py marked not implemented stuff

[Adam Groszer]

Log message for revision 79999:
  marked not implemented stuff

Changed:
  U   Sandbox/ocql-foliage/src/ocql/engine/queryobject.py

-=-
Modified: Sandbox/ocql-foliage/src/ocql/engine/queryobject.py
===================================================================
--- Sandbox/ocql-foliage/src/ocql/engine/queryobject.py	2007-09-25 13:04:48 UTC (rev 79998)
+++ Sandbox/ocql-foliage/src/ocql/engine/queryobject.py	2007-09-25 13:18:51 UTC (rev 79999)
@@ -19,6 +19,7 @@
 # General
 # 
 class hasClassWith(Expression):
+    #NotImplemented
     def __init__(self, expr, klass, conditional):
         self.expression = expression
         self.klass = klass
@@ -32,6 +33,7 @@
         return algebra.Identifier(self.name)
 
 class Constant(Expression):
+    #this shall be abstract?
     def __init__(self, value):
         self.value=value
     
@@ -95,11 +97,13 @@
 
 class In(Term):
     def __init__(self, identifier, expression):
+        raise NotImplemented()
         self.identifier = identifier
         self.expression = expression
 
 class Alias(Term):
     def __init__(self, identifier, expression):
+        raise NotImplemented()
         self.identifier = identifier
         self.expression = expression
 
@@ -144,6 +148,7 @@
             '.'.join([self.left.name, self.right.name]))
 
 class Index(Binary):
+    #NotImplemented
     pass
 
 
@@ -192,6 +197,7 @@
         )
 
 class Sum(Aggregate):
+    #NotImplemented
     pass
 
 #
@@ -209,21 +215,9 @@
     def rewrite(self, algebra, expression, operator):
         return self.quantor.rewrite(algebra, expression, self.expression, operator)
 
-class Condition(Expression):
-    def __init__(self, left, right):
-        self.left = left
-        self.right = right
-
-    def rewrite(self, algebra):
-        if isinstance(self.left,Quanted):
-            return self.left.rewrite(algebra, self.right, self)
-        if isinstance(self.right,Quanted):
-            return self.right.rewrite(algebra, self.left, self)
-        else:
-            return algebra.Binary(self.left.rewrite(algebra),self.get_operator(algebra),self.right.rewrite(algebra))
-
 # Quantors
 class Every(Quantor):
+    #NotImplemented
     pass
 
 class Some(Quantor):
@@ -243,17 +237,33 @@
 
 class Atmost(Quantor):
     def __init__(self, expr):
+        raise NotImplemented(self) 
         self.expr = expr
 
 class Atleast(Quantor):
     def __init__(self, expr):
+        raise NotImplemented(self) 
         self.expr = expr
 
 class Just(Quantor):
     def __init__(self, expr):
+        raise NotImplemented(self) 
         self.expr = expr
 
 # Logical operators
+class Condition(Expression):
+    def __init__(self, left, right):
+        self.left = left
+        self.right = right
+
+    def rewrite(self, algebra):
+        if isinstance(self.left,Quanted):
+            return self.left.rewrite(algebra, self.right, self)
+        if isinstance(self.right,Quanted):
+            return self.right.rewrite(algebra, self.left, self)
+        else:
+            return algebra.Binary(self.left.rewrite(algebra),self.get_operator(algebra),self.right.rewrite(algebra))
+
 class Eq(Condition):
     def get_operator(self,algebra):
         return algebra.Operator('==')