lib/gisele/language/syntax/grammar.citrus in gisele-0.1.0 vs lib/gisele/language/syntax/grammar.citrus in gisele-0.2.0

@@ -88,11 +88,12 @@
   end
 
   ### Boolean expressions
 
   rule bool_expr
-    bool_or
+    (spacing theexpr:bool_or)
+    <Gisele::Language::Syntax::BoolExpr>
   end
 
   rule bool_or
       (left:bool_and spaces 'or' spaces right:bool_or)
       <Gisele::Language::Syntax::BoolOr>
@@ -110,14 +111,14 @@
       <Gisele::Language::Syntax::BoolNot>
     | bool_term
   end
 
   rule bool_term
-    bool_paren | boolean_literal | bool_varref
+    bool_paren | bool_lit | bool_varref
   end
 
   rule bool_paren
-    ('(' spacing expr:bool_expr spacing ')')
+    ('(' spacing expr:bool_or spacing ')')
     <Gisele::Language::Syntax::BoolParen>
   end
 
   rule bool_lit
     (boolean_literal)
\ No newline at end of file