add support for running "l4 epilog" as well as "l4 asp"

smucclaw · Sep 19, 2022 · 1858b51 · 1858b51
1 parent 9a185c2
commit 1858b51
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/.ghci b/.ghci
@@ -0,0 +1,4 @@
+:set -isrc
+-- Don't spam a ton of warnings
+-- :set -Wno-incomplete-patterns -Wno-unused-imports -Wno-name-shadowing -Wno-unused-top-binds -Wno-missing-signatures
+:l tests/DisambiguateTest.hs tests/ExpSysTest.hs tests/Test.hs tests/ToGFTest.hs
diff --git a/.ghcid b/.ghcid
@@ -0,0 +1 @@
+--test=":main --rerun-all-on-success" --warn
diff --git a/baby-l4.cabal b/baby-l4.cabal
@@ -85,6 +85,7 @@ library
                   ToGF.FromSCasp.ToAnswer
                   ToGF.FromL4.ToQuestions
                   ToGF.FromL4.ToAnswers
+                  ToEpilog
                   ToASP
                   ToSCASP
                   ToDA2

diff --git a/exe/Main.hs b/exe/Main.hs
@@ -35,6 +35,7 @@ import ToDA2 (createDSyaml)
 import SimpleRules ( expSys )
 import ToRules.FromL4 (genREP)
 import ToASP (astToASP)
+import ToEpilog (astToEpilog)
 
 
 
@@ -53,6 +54,7 @@ process args input = do
           normalAst = normalizeProg tpAstNoSrc -- Creates predicates of class fields
 
       case format args of
+        Fepilog                  ->  astToEpilog tpAstNoSrc
         Fasp                     ->  astToASP tpAstNoSrc
         Fast                     ->  pPrint tpAst
         (Fgf GFOpts { gflang = gfl, showast = True } ) -> GF.nlgAST gfl fpath normalAst
@@ -70,7 +72,7 @@ process args input = do
         (Fexpsys Rules) -> genREP tpAstNoSrc
 
 
-data Format   = Fasp | Fast | Fgf GFOpts | Fscasp  | Fsmt | Fyaml | Fexpsys ESOpts
+data Format   = Fepilog | Fasp | Fast | Fgf GFOpts | Fscasp  | Fsmt | Fyaml | Fexpsys ESOpts
   deriving Show
 
 --  l4 gf en          output english only
@@ -97,6 +99,7 @@ optsParse :: Parser InputOpts
 optsParse = InputOpts <$>
               subparser
                 ( command "gf"   (info gfSubparser gfHelper)
+               <> command "epilog" (info (pure Fepilog) (progDesc "output to Epilog"))
                <> command "asp"  (info (pure Fasp) (progDesc "output to ASP / Clingo"))
                <> command "ast"  (info (pure Fast) (progDesc "Show the AST in Haskell"))
                <> command "scasp" (info (pure Fscasp) (progDesc "output to sCASP for DocAssemble purposes"))

diff --git a/src/ToEpilog.hs b/src/ToEpilog.hs
@@ -1,6 +1,6 @@
  {-# LANGUAGE OverloadedStrings #-}
 
-module ToASP where
+module ToEpilog where
 
 import Prettyprinter
 import Prettyprinter.Render.Text (putDoc)
@@ -386,8 +386,8 @@ genOppClause (posvar, negvar, n) =
     let args = zipWith (\ vn i -> LocalVar (QVarName IntegerT (vn ++ show i)) i) (replicate n "V") [0 .. n-1]
     in OpposesClause (applyVars posvar args) (applyVars negvar args)
 
-astToASP :: Program (Tp ()) -> IO ()
-astToASP prg = do
+astToEpilog :: Program (Tp ()) -> IO ()
+astToEpilog prg = do
     let rules = concatMap ruleDisjL (clarify (rulesOfProgram prg))
     -- putStrLn "Simplified L4 rules:"
     -- putDoc $ vsep (map (showL4 []) rules) <> line