Accepts multiple GIVETH variables

lib/haskell/natural4/src/TextuaL4.cf

@@ -42,7 +42,7 @@ HornlikeMeans. Rule3 ::= Text "MEANS" BoolStruct ;
 -- because there is no MEANS that breaks the RelationalPredicate
 HornlikeDecide. Rule3 ::= "DECIDE" [HornClause] ;
 -- Only Hornlikes have GIVETH
-HlikeGiveth. Rule3 ::= "GIVETH" IsA "DECIDE" [HornClause] ;
+HlikeGiveth. Rule3 ::= "GIVETH" [IsA] "DECIDE" [HornClause] ;
 
 HeadBody. HornClause ::= RelationalPredicate "IF" BoolStruct ;
 HeadOtherwise. HornClause ::= RelationalPredicate "OTHERWISE" ;

lib/haskell/natural4/src/TextuaL4/AbsTextuaL.hs

@@ -33,7 +33,7 @@ data Rule
     | RegWhoInline BoolStruct Who InlineHornlike Deontic BoolStruct
     | HornlikeMeans Text BoolStruct
     | HornlikeDecide [HornClause]
-    | HlikeGiveth IsA [HornClause]
+    | HlikeGiveth [IsA] [HornClause]
   deriving (C.Eq, C.Ord, C.Show, C.Read)
 
 data HornClause

lib/haskell/natural4/src/TextuaL4/ParTextuaL.y

@@ -152,7 +152,7 @@ Rule3
   | 'EVERY' BoolStruct Who InlineHornlike Deontic BoolStruct { TextuaL4.AbsTextuaL.RegWhoInline $2 $3 $4 $5 $6 }
   | Text 'MEANS' BoolStruct { TextuaL4.AbsTextuaL.HornlikeMeans $1 $3 }
   | 'DECIDE' ListHornClause { TextuaL4.AbsTextuaL.HornlikeDecide $2 }
-  | 'GIVETH' IsA 'DECIDE' ListHornClause { TextuaL4.AbsTextuaL.HlikeGiveth $2 $4 }
+  | 'GIVETH' ListIsA 'DECIDE' ListHornClause { TextuaL4.AbsTextuaL.HlikeGiveth $2 $4 }
 
 HornClause :: { TextuaL4.AbsTextuaL.HornClause }
 HornClause

lib/haskell/natural4/src/TextuaL4/Transform.hs

@@ -54,13 +54,15 @@ transRule x = case x of
 
   -- Only Hornlikes have GIVETH
   -- GIVETH foo (IS A bar) DECIDE relpred
-  TL4.HlikeGiveth giveth hhead ->
+  TL4.HlikeGiveth (giv:givs) hhead ->
     let simple = transRule $ TL4.HornlikeDecide hhead
     in simple {
-        giveth = Just $ isa2pt giveth
+        giveth = Just $ fmap isa2tm (giv :| givs)
       }
 
--- TypeDecl
+  TL4.HlikeGiveth _ hhead -> transRule $ TL4.HornlikeDecide hhead
+
+  -- TypeDecl
   -- DECLARE Foo (IS A Bar) (HAS …)?
   TL4.TypeDecl isa fields ->
     let isaRule = transIsA isa

lib/haskell/natural4/test/LS/TextuaL4Spec.hs

@@ -36,6 +36,7 @@ goldenGeneric name output_ = Golden
 spec :: Spec
 spec = do
   describe "TextuaL4 output" do
+    test "GIVETH x ; y DECIDE x IS 5; y IS 4" "hornlike-2-giveths"
     test "GIVEN foo GIVETH bar DECIDE bar IS 1 > 2" "hornlike-given-giveth-1"
     test "GIVEN foo IS A Number GIVETH bar IS A Boolean DECIDE bar IS foo > 2" "hornlike-given-giveth-2"
     test "EVERY tame ANY (Person, Animal) WHO Qualifies MEANS ALL(walks, ANY(eats, drinks), climbs) MUST ANY (sing, dance)" "regulative-any-tame-person-animal"

lib/haskell/natural4/test/testdata/golden/hornlike-2-giveths.expected

@@ -0,0 +1,47 @@
+Hornlike
+    { name =
+        [ MTT "x" ]
+    , super = Nothing
+    , keyword = Decide
+    , given = Nothing
+    , giveth = Just
+        (
+            ( MTT "x" :| []
+            , Nothing
+            ) :|
+            [
+                ( MTT "y" :| []
+                , Nothing
+                )
+            ]
+        )
+    , upon = Nothing
+    , clauses =
+        [ HC
+            { hHead = RPConstraint
+                [ MTT "x" ] RPis
+                [ MTI 5 ]
+            , hBody = Nothing
+            }
+        , HC
+            { hHead = RPConstraint
+                [ MTT "y" ] RPis
+                [ MTI 4 ]
+            , hBody = Nothing
+            }
+        ]
+    , rlabel = Nothing
+    , lsource = Nothing
+    , wwhere = []
+    , srcref = Just
+        ( SrcRef
+            { url = "test/Spec"
+            , short = "test/Spec"
+            , srcrow = 1
+            , srccol = 1
+            , version = Nothing
+            }
+        )
+    , defaults = []
+    , symtab = []
+    }