Merge happy-* library packages into a single happy library compon…

…ent (#292) See #292. Fixes #292.
haskell · Sep 13, 2024 · 795a377 · 795a377
1 parent 48d3480
commit 795a377
Show file tree

Hide file tree

Showing 46 changed files with 60 additions and 324 deletions.
diff --git a/src/Main.lhs → app/Main.lhs b/src/Main.lhs → app/Main.lhs
diff --git a/...es/frontend/boot-src/AttrGrammarParser.ly → boot-src/AttrGrammarParser.ly b/...es/frontend/boot-src/AttrGrammarParser.ly → boot-src/AttrGrammarParser.ly
diff --git a/packages/frontend/boot-src/Parser.ly → boot-src/Parser.ly b/packages/frontend/boot-src/Parser.ly → boot-src/Parser.ly
diff --git a/packages/frontend/bootstrap.sh → bootstrap.sh b/packages/frontend/bootstrap.sh → bootstrap.sh
diff --git a/packages/backend-glr/data/GLR_Base.hs → data/GLR_Base.hs b/packages/backend-glr/data/GLR_Base.hs → data/GLR_Base.hs
diff --git a/packages/backend-glr/data/GLR_Lib.hs → data/GLR_Lib.hs b/packages/backend-glr/data/GLR_Lib.hs → data/GLR_Lib.hs
diff --git a/packages/backend-lalr/data/HappyTemplate.hs → data/HappyTemplate.hs b/packages/backend-lalr/data/HappyTemplate.hs → data/HappyTemplate.hs
diff --git a/happy.cabal b/happy.cabal
@@ -132,27 +132,71 @@ extra-source-files:
         tests/rank2.y
         tests/shift01.y
 
+data-dir: data
+
+data-files:
+        GLR_Base.hs
+        GLR_Lib.hs
+        HappyTemplate.hs
+
 source-repository head
   type:     git
   location: https://github.com/haskell/happy.git
 
-executable happy
+library
   hs-source-dirs: src
+
+  exposed-modules:
+        Happy.Grammar
+        Happy.Frontend,
+        Happy.Frontend.AbsSyn,
+        Happy.Frontend.Mangler,
+        Happy.Frontend.PrettyGrammar
+        Happy.Tabular,
+        Happy.Tabular.First,
+        Happy.Tabular.Info,
+        Happy.Tabular.LALR,
+        Happy.Tabular.NameSet
+        Happy.Backend.LALR,
+        Happy.Backend.LALR.ProduceCode
+        Happy.Backend.GLR,
+        Happy.Backend.GLR.ProduceCode
+  build-depends:
+        base >= 4.9 && < 5,
+        array,
+        containers >= 0.4.2,
+        transformers >= 0.5.6.2,
+        mtl >= 2.2.2
+
+  default-language:    Haskell98
+  default-extensions:  CPP, MagicHash, FlexibleContexts, NamedFieldPuns
+  ghc-options: -Wall -Wno-incomplete-uni-patterns
+  other-modules:
+        Happy.Frontend.ParseMonad
+        Happy.Frontend.ParseMonad.Class
+        Happy.Frontend.Mangler.Monad
+        Happy.Frontend.Parser
+        Happy.Frontend.Lexer
+        Happy.Frontend.ParamRules
+        Happy.Frontend.AttrGrammar
+        Happy.Frontend.AttrGrammar.Parser
+        Happy.Frontend.AttrGrammar.Mangler
+        Paths_happy
+
+executable happy
+  hs-source-dirs: app
   main-is: Main.lhs
 
-  build-depends: base >= 4.9 && < 5,
-                 array,
-                 containers >= 0.4.2,
-                 mtl >= 2.2.1,
-                 happy-grammar == 2.0,
-                 happy-tabular == 2.0,
-                 happy-frontend == 2.0,
-                 happy-backend-lalr == 2.0,
-                 happy-backend-glr == 2.0
+  build-depends:
+        base >= 4.9 && < 5,
+        array,
+        containers >= 0.4.2,
+        mtl >= 2.2.1,
+        happy
 
   default-language: Haskell98
   default-extensions: CPP, MagicHash, FlexibleContexts, NamedFieldPuns
-  ghc-options: -Wall -Wno-incomplete-uni-patterns
+  ghc-options: -Wall
   other-modules:
         Paths_happy
 

diff --git a/packages/backend-glr/LICENSE b/packages/backend-glr/LICENSE
diff --git a/packages/backend-glr/Setup.hs b/packages/backend-glr/Setup.hs
diff --git a/packages/backend-glr/happy-backend-glr.cabal b/packages/backend-glr/happy-backend-glr.cabal
diff --git a/packages/backend-lalr/LICENSE b/packages/backend-lalr/LICENSE
diff --git a/packages/backend-lalr/Setup.hs b/packages/backend-lalr/Setup.hs
diff --git a/packages/backend-lalr/happy-backend-lalr.cabal b/packages/backend-lalr/happy-backend-lalr.cabal
diff --git a/packages/frontend/LICENSE b/packages/frontend/LICENSE
diff --git a/packages/frontend/Setup.hs b/packages/frontend/Setup.hs
diff --git a/packages/frontend/happy-frontend.cabal b/packages/frontend/happy-frontend.cabal
diff --git a/packages/grammar/LICENSE b/packages/grammar/LICENSE
diff --git a/packages/grammar/Setup.hs b/packages/grammar/Setup.hs
diff --git a/packages/grammar/happy-grammar.cabal b/packages/grammar/happy-grammar.cabal
diff --git a/packages/tabular/LICENSE b/packages/tabular/LICENSE
diff --git a/packages/tabular/Setup.hs b/packages/tabular/Setup.hs