Context.treetop in activefacts-0.8.18

- old
+ new

@@ -7,12 +7,12 @@
 module ActiveFacts
   module CQL
     grammar Context
       rule context_note
         '('
-        w:who_says? s context_type discussion agreed:(',' a:as_agreed_by)? s
-        ')'
+        s w:who_says? s context_type discussion agreed:(',' a:as_agreed_by)? s
+        ')' s
         {
 	  def value
 	    [ w.empty? ? nil : w.value, context_type.value, discussion.text_value, agreed.empty? ? [] : agreed.a.value]
 	  end
 	  def ast
@@ -31,14 +31,9 @@
       rule context_type
         because s       { def value; 'because'; end } /
         as_opposed_to   { def value; 'as_opposed_to'; end } /
         so_that         { def value; 'so_that'; end } /
         to_avoid        { def value; 'to_avoid'; end }
-      end
-
-      # An enforcement action, like SMS, email, log, alarm, etc.
-      rule action
-	id
       end
 
       rule discussion
         (
 	  '(' discussion ')' / (!( [()] / ',' as_agreed_by) .)*