PLT-7142: Script to generate language specification, moved Marlowe LBNF

input-output-hk · Aug 21, 2023 · 248f76e · 248f76e
1 parent 3931770
commit 248f76e
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 675 deletions.
diff --git a/flake.nix b/flake.nix
@@ -46,7 +46,7 @@
           };
 
           latex = (pkgs.texlive.combine {
-            inherit (pkgs.texlive) scheme-basic ulem collection-fontsrecommended mathpartir stmaryrd polytable lazylist;
+            inherit (pkgs.texlive) scheme-basic ulem collection-fontsrecommended mathpartir stmaryrd polytable lazylist ucs;
           });
 
           project = pkgs.haskell-nix.cabalProject' {
@@ -67,11 +67,13 @@
                 build-marlowe-proofs
                 edit-marlowe-proofs
                 build-marlowe-docs
+                generate-marlowe-language-specification
               ]
               ) ++
               (with pkgs; [
                 nil
                 haskellPackages.lhs2tex
+                haskellPackages.BNFC
               ]) ++
               [ latex formatting.fix-nix-fmt ];
           };

diff --git a/haskell/marlowe-reference.cabal b/haskell/marlowe-reference.cabal
@@ -9,10 +9,7 @@ cabal-version:          >= 1.10
 
 executable marlowe
     default-language:   Haskell2010
-    build-tools:        alex,
-                        happy
-    build-depends:      array,
-                        base >= 4.9 && < 5,
+    build-depends:      base >= 4.9 && < 5,
                         base16-bytestring >= 1 && < 2,
                         bytestring >= 0.10.12 && < 0.12,
                         containers >= 0.6.5 && < 0.7,
@@ -36,10 +33,6 @@ executable marlowe
                         Language.Marlowe.Semantics.Types
                         Language.Marlowe.Semantics.Deserialisation
                         Language.Marlowe.Semantics.Serialisation
-                        Language.Marlowe.Syntax.AbsMarlowe
-                        Language.Marlowe.Syntax.LexMarlowe
-                        Language.Marlowe.Syntax.ParMarlowe
-                        Language.Marlowe.Syntax.Translate
                         Language.Marlowe.ExtendedBuilder
                         Language.Marlowe.Serialisation
                         Language.Marlowe.Deserialisation

diff --git a/haskell/src/Language/Marlowe/Syntax/AbsMarlowe.hs b/haskell/src/Language/Marlowe/Syntax/AbsMarlowe.hs
diff --git a/haskell/src/Language/Marlowe/Syntax/LexMarlowe.x b/haskell/src/Language/Marlowe/Syntax/LexMarlowe.x