More transpiler functionality and fixes from Sprint 2 (started Aug 29)

.github/workflows/haskell.yml

@@ -36,6 +36,15 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
 
+      - name: Install Ubuntu Prerequisites (libpcre)
+        if: startsWith(matrix.os, 'ubuntu')
+        run: |
+          sudo apt-get install libpcre3-dev
+      - name: Install MacOS Prerequisites (libpcre)
+        if: startsWith(matrix.os, 'macOS')
+        run: |
+          brew install pcre
+
       - name: Build explainable
         run: stack build
         working-directory: lib/haskell/explainable

lib/haskell/natural4/package.yaml

@@ -71,6 +71,15 @@ dependencies:
   - string-interpolate
   - prettyprinter-interp
   - json
+  - optics
+  - generic-optics
+  - nonempty-containers
+  - lens-regex-pcre
+  - pcre-heavy
+  - string-conversions
+  - raw-strings-qq
+
+
 
 language: GHC2021
 

lib/haskell/natural4/src/LS/Rule.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE DeriveAnyClass #-}
+{-# LANGUAGE DeriveAnyClass, DeriveGeneric, FlexibleContexts, TypeFamilies, TypeApplications, DataKinds #-}
 {-# LANGUAGE DuplicateRecordFields #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
@@ -20,6 +20,7 @@ import Data.Text qualified as Text
 import Data.Void (Void)
 import Flow ((|>))
 import GHC.Generics (Generic)
+import Data.Generics.Sum.Constructors
 import LS.Types
   ( BoolStructP,
     BoolStructR,
@@ -71,9 +72,25 @@ import Text.Megaparsec
   )
 import Data.Graph.Inductive (Gr, empty)
 import LS.XPile.Logging (XPileLogW)
+import Optics hiding ((|>), has) -- the Rule record has a `has` field
+import Optics qualified as O
 
--- | [TODO] refactoring: these should be broken out into their own (new)types and have Rule include them all.
--- We should take advantage of NoFieldSelectors to reduce the hazards here
+{- | 
+[TODO] refactoring: these should be broken out into their own (new)types and have Rule include them all.
+We should take advantage of NoFieldSelectors to reduce the hazards here
+
+
+The deriving Generics stuff allows us to do things like
+>>> O.has (_Ctor @"Regulative") defaultHorn
+False
+>>> O.has (_Ctor @"Regulative") defaultReg
+True
+
+as well as extracting givens from a rule in an easy way (see the Logical English code).
+
+See https://hackage.haskell.org/package/generic-optics-2.2.1.0/docs/Data-Generics-Sum-Constructors.html 
+for an explanation of how the Generics and optics stuff works
+-}
 data Rule = Regulative
             { subj     :: BoolStructP               -- man AND woman AND child
             , rkeyword :: RegKeywords               -- Every | Party | TokAll
@@ -181,6 +198,7 @@ instance Hashable Rule
 
 type Parser = WriterT (DList Rule) PlainParser
 
+
 -- | the more responsible version of head . words . show
 ruleConstructor :: Rule -> String
 ruleConstructor Regulative{}   = "Regulative"

lib/haskell/natural4/src/LS/Utils.hs

@@ -8,10 +8,12 @@ module LS.Utils
     mapThenSwallowErrs,
     runMonoidValidate,
     swallowErrs,
-    MonoidValidate
+    MonoidValidate,
+    (<||>)
   )
 where
 
+import Control.Applicative (liftA2)
 import Control.Monad.Validate
   ( MonadValidate (refute),
     Validate,
@@ -72,4 +74,9 @@ swallowErrs :: [MonoidValidate e a] -> [a]
 swallowErrs = mapThenSwallowErrs id
 
 runMonoidValidate :: MonoidValidate e a -> Either e a
-runMonoidValidate x = x |> coerce |> runValidate 
+runMonoidValidate x = x |> coerce |> runValidate 
+
+-- | A simple lifted ('||'), copied from Control.Bool
+(<||>) :: Applicative f => f Bool -> f Bool -> f Bool
+(<||>) = liftA2 (||)
+{-# INLINE (<||>) #-}

lib/haskell/natural4/src/LS/XPile/LogicalEnglish/GenLEHCs.hs

@@ -10,15 +10,13 @@
 
 module LS.XPile.LogicalEnglish.GenLEHCs (leHCFromVarsHC) where
 
-
 import Data.Text qualified as T
 import Data.HashSet qualified as HS
-import Data.Foldable (toList)
+-- import Data.Foldable (toList)
 -- import Debug.Trace (trace)
 import Data.Coerce (coerce)
 -- import Data.String.Interpolate ( i )
 import Data.Traversable
-import Control.Monad.Identity (Identity)
 
 import LS.XPile.LogicalEnglish.Types
 
@@ -150,7 +148,7 @@ simplifyVAtomicP = fmap simplifyVCells
 
 simplifyVCells :: VCell -> LEhcCell
 simplifyVCells = \case
-  Pred txt    -> NotVar txt
+  Pred txt   -> NotVar txt
   TempVar tv -> tvar2lecell tv
 
 tvar2lecell :: TemplateVar -> LEhcCell