Recognize and in coloned list context (#16)

q-m · Jun 13, 2024 · ff21275 · ff21275
1 parent 86d0d60
commit ff21275
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/data/test-cases b/data/test-cases
@@ -86,6 +86,7 @@ tomaat⁽¹⁾
 tomaat^2
 tomaat *
 tomaat~
+saus: tomaat* en zout*
 # extra info at the end
 tomaat* * = Biologisch
 tomaat*  * = Biologisch

diff --git a/lib/food_ingredient_parser/strict/grammar/list_coloned.treetop b/lib/food_ingredient_parser/strict/grammar/list_coloned.treetop
@@ -17,9 +17,10 @@ module FoodIngredientParser::Strict::Grammar
     end
 
     rule list_coloned_inner_list
+      contains:( ingredient ( ws* ',' ws* ingredient )+ ( ws+ and ws+ ingredient )? )      <ListNode> /
       contains:( ingredient_simple_e_number ( ws* '/'  ws* ingredient_simple_e_number )+ ) <ListNode> /
       contains:( ingredient_simple_e_number ( ws* dash ws* ingredient_simple_e_number )+ ) <ListNode> /
-      contains:( ingredient ( ws* ',' ws* ingredient )* ) <ListNode>
+      contains:( ingredient ( ws+ and ws+ ingredient )? )                                  <ListNode>
     end
 
     rule list_coloned_ingredient