lib/activefacts/cql/Expressions.treetop in activefacts-0.7.3 vs lib/activefacts/cql/Expressions.treetop in activefacts-0.8.5

@@ -28,18 +28,18 @@
       rule expression
         sum
       end
 
       rule sum
-        t0:term s tail:( o:add_op s t1:term s )*
+        t0:product s tail:( op:add_op s t1:product s )*
         {
           def value
             return t0.value if tail.empty?
             [ :"+",
               *([t0.value] +
                 tail.elements.map{|e|
-                    e.o.text_value == '-' ? [ :"-", e.t1.value ] : e.t1.value
+                    e.op.text_value == '-' ? [ :"-", e.t1.value ] : e.t1.value
                   }
               )
             ]
           end
         }
@@ -47,19 +47,19 @@
 
       rule add_op
         '+' / '-'
       end
 
-      rule term
-        f0:factor s tail:( o:mul_op s f1:factor s )*
+      rule product
+        f0:factor s tail:( op:mul_op s f1:factor s )*
         {
           def value
             return f0.value if tail.empty?
             [ :"*",
               *([f0.value] +
                 tail.elements.map{|e|
-                    e.o.text_value != '*' ? [ :"-", e.f1.value ] : e.f1.value
+                    e.op.text_value != '*' ? [ :"-", e.f1.value ] : e.f1.value
                   }
               )
             ]
           end
         }
@@ -70,11 +70,11 @@
             { def value
                 u.empty? ? literal.value : [ literal.value, u.text_value ]
               end
             }
         / derived_variable
-        / '(' s sum s ')' s                   { def value; sum.value; end }
+        / !context '(' s sum s ')' s                   { def value; sum.value; end }
       end
 
       rule derived_variable
         variable s p:function_call*
         {
@@ -90,21 +90,21 @@
       rule variable
         id0:id o0:( !written_as s id1:id )?
         {
           def value
             # Variable names may consist of one or two words (optional adjective and a noun):
-            r = [ :variable, id0.text_value ]
-            r += [ o0.id1.text_value ] unless o0.empty?
+            r = [ :variable, id0.value ]
+            r += [ o0.id1.value ] unless o0.empty?
             r
           end
         }
       end
 
       rule function_call
         '.' s func:id s param_list:( '(' s params:( p0:expression s tail:( ',' s p1:expression s )* )? ')' s )?
         {
           def value
-            r = [ :"(", func.text_value ]
+            r = [ :"(", func.value ]
             return r if param_list.empty? || param_list.params.empty?
             r += [ param_list.params.p0.value ]
             param_list.params.tail.elements.each{|e|
                 r += [ e.p1.value ]
               }