Skip to content

Commit 4f4a011

Browse files
knothedint-index
authored andcommitted
Rename happy-backend to happy-backend-lalr
1 parent afa1dff commit 4f4a011

File tree

11 files changed

+40
-40
lines changed

11 files changed

+40
-40
lines changed

.github/workflows/haskell-ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ jobs:
172172
touch cabal.project
173173
echo "packages: $GITHUB_WORKSPACE/source/." >> cabal.project
174174
echo "packages: $GITHUB_WORKSPACE/source/packages/frontend" >> cabal.project
175-
echo "packages: $GITHUB_WORKSPACE/source/packages/backend" >> cabal.project
175+
echo "packages: $GITHUB_WORKSPACE/source/packages/backend-lalr" >> cabal.project
176176
echo "packages: $GITHUB_WORKSPACE/source/packages/backend-glr" >> cabal.project
177177
echo "packages: $GITHUB_WORKSPACE/source/packages/grammar" >> cabal.project
178178
echo "packages: $GITHUB_WORKSPACE/source/packages/tabular" >> cabal.project
@@ -193,8 +193,8 @@ jobs:
193193
echo "PKGDIR_happy_grammar=${PKGDIR_happy_grammar}" >> "$GITHUB_ENV"
194194
PKGDIR_happy_frontend="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/happy-frontend-[0-9.]*')"
195195
echo "PKGDIR_happy_frontend=${PKGDIR_happy_frontend}" >> "$GITHUB_ENV"
196-
PKGDIR_happy_backend="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/happy-backend-[0-9.]*')"
197-
echo "PKGDIR_happy_backend=${PKGDIR_happy_backend}" >> "$GITHUB_ENV"
196+
PKGDIR_happy_backend_lalr="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/happy-backend-lalr-[0-9.]*')"
197+
echo "PKGDIR_happy_backend_lalr=${PKGDIR_happy_backend_lalr}" >> "$GITHUB_ENV"
198198
PKGDIR_happy_backend_glr="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/happy-backend-glr-[0-9.]*')"
199199
echo "PKGDIR_happy_backend_glr=${PKGDIR_happy_backend_glr}" >> "$GITHUB_ENV"
200200
PKGDIR_happy="$(find "$GITHUB_WORKSPACE/unpacked" -maxdepth 1 -type d -regex '.*/happy-[0-9.]*')"
@@ -203,14 +203,14 @@ jobs:
203203
touch cabal.project
204204
touch cabal.project.local
205205
echo "packages: ${PKGDIR_happy_frontend}" >> cabal.project
206-
echo "packages: ${PKGDIR_happy_backend}" >> cabal.project
206+
echo "packages: ${PKGDIR_happy_backend_lalr}" >> cabal.project
207207
echo "packages: ${PKGDIR_happy_backend_glr}" >> cabal.project
208208
echo "packages: ${PKGDIR_happy_tabular}" >> cabal.project
209209
echo "packages: ${PKGDIR_happy_grammar}" >> cabal.project
210210
echo "packages: ${PKGDIR_happy}" >> cabal.project
211211
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package happy-frontend" >> cabal.project ; fi
212212
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
213-
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package happy-backend" >> cabal.project ; fi
213+
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package happy-backend-lalr" >> cabal.project ; fi
214214
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
215215
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package happy-backend-glr" >> cabal.project ; fi
216216
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
@@ -222,7 +222,7 @@ jobs:
222222
if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi
223223
cat >> cabal.project <<EOF
224224
EOF
225-
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(containers|happy|happy-tabular|happy-grammar|happy-frontend|happy-backend|happy-backend-glr|mtl|transformers)$/; }' >> cabal.project.local
225+
$HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(containers|happy|happy-tabular|happy-grammar|happy-frontend|happy-backend-lalr|happy-backend-glr|mtl|transformers)$/; }' >> cabal.project.local
226226
cat cabal.project
227227
cat cabal.project.local
228228
- name: dump install plan
@@ -259,7 +259,7 @@ jobs:
259259
${CABAL} -vnormal check
260260
cd ${PKGDIR_happy_frontend} || false
261261
${CABAL} -vnormal check
262-
cd ${PKGDIR_happy_backend} || false
262+
cd ${PKGDIR_happy_backend_lalr} || false
263263
${CABAL} -vnormal check
264264
cd ${PKGDIR_happy_backend_glr} || false
265265
${CABAL} -vnormal check

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
packages:
2-
packages/backend
2+
packages/backend-lalr
33
packages/backend-glr
44
packages/frontend
55
packages/grammar

happy.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ executable happy
150150
happy-grammar == 1.21.0,
151151
happy-tabular == 1.21.0,
152152
happy-frontend == 1.21.0,
153-
happy-backend == 1.21.0,
153+
happy-backend-lalr == 1.21.0,
154154
happy-backend-glr == 1.21.0
155155

156156
default-language: Haskell98
File renamed without changes.
File renamed without changes.

packages/backend/happy-backend.cabal renamed to packages/backend-lalr/happy-backend-lalr.cabal

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: happy-backend
1+
name: happy-backend-lalr
22
version: 1.21.0
33
license: BSD2
44
license-file: LICENSE
@@ -15,8 +15,8 @@ synopsis: A table-based backend for happy
1515

1616
Description:
1717
Happy is a parser generator for Haskell.
18-
Happy-Backend is responsible for code-generation:
19-
It converts action and goto tables into Haskell code.
18+
Happy-Backend-LALR is responsible for code-generation:
19+
It converts action and goto tables into LALR Haskell code.
2020

2121

2222
tested-with:
@@ -41,9 +41,9 @@ data-files:
4141
library
4242
hs-source-dirs: src
4343

44-
exposed-modules: Happy.Backend,
45-
Happy.Backend.Target,
46-
Happy.Backend.ProduceCode
44+
exposed-modules: Happy.Backend.LALR,
45+
Happy.Backend.LALR.Target,
46+
Happy.Backend.LALR.ProduceCode
4747
build-depends: base < 5,
4848
array,
4949
happy-grammar == 1.21.0,
@@ -52,4 +52,4 @@ library
5252
default-language: Haskell98
5353
default-extensions: CPP, MagicHash, FlexibleContexts
5454
ghc-options: -Wall
55-
other-modules: Paths_happy_backend
55+
other-modules: Paths_happy_backend_lalr

packages/backend/src/Happy/Backend.hs renamed to packages/backend-lalr/src/Happy/Backend/LALR.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
module Happy.Backend where
1+
module Happy.Backend.LALR where
22

3-
import Paths_happy_backend
3+
import Paths_happy_backend_lalr
44
import Data.Char
55

6-
backendDataDir :: IO String
7-
backendDataDir = getDataDir
6+
lalrBackendDataDir :: IO String
7+
lalrBackendDataDir = getDataDir
88

99
magicFilter :: Maybe String -> String -> String
1010
magicFilter magicName = case magicName of

packages/backend/src/Happy/Backend/ProduceCode.lhs renamed to packages/backend-lalr/src/Happy/Backend/LALR/ProduceCode.lhs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,25 @@ The code generator.
44
(c) 1993-2001 Andy Gill, Simon Marlow
55
-----------------------------------------------------------------------------
66

7-
> module Happy.Backend.ProduceCode (produceParser) where
7+
> module Happy.Backend.LALR.ProduceCode (produceParser) where
88

9-
> import Paths_happy_backend ( version )
10-
> import Data.Version ( showVersion )
9+
> import Paths_happy_backend_lalr ( version )
10+
> import Data.Version ( showVersion )
1111
> import Happy.Grammar
12-
> import Happy.Backend.Target ( Target(..) )
12+
> import Happy.Backend.LALR.Target ( Target(..) )
1313
> import Happy.Tabular.LALR
1414

15-
> import Data.Maybe ( isJust, isNothing, fromMaybe )
16-
> import Data.Char ( ord, chr )
17-
> import Data.List ( sortBy )
18-
19-
> import Control.Monad ( forM_ )
20-
> import Control.Monad.ST ( ST, runST )
21-
> import Data.Bits ( setBit )
22-
> import Data.Array.ST ( STUArray )
23-
> import Data.Array.Unboxed ( UArray )
24-
> import Data.Array.MArray ( MArray(..), freeze, readArray, writeArray )
25-
> import Data.Array.IArray ( Array, IArray(..), (!), array, assocs, elems )
15+
> import Data.Maybe ( isJust, isNothing, fromMaybe )
16+
> import Data.Char ( ord, chr )
17+
> import Data.List ( sortBy )
18+
19+
> import Control.Monad ( forM_ )
20+
> import Control.Monad.ST ( ST, runST )
21+
> import Data.Bits ( setBit )
22+
> import Data.Array.ST ( STUArray )
23+
> import Data.Array.Unboxed ( UArray )
24+
> import Data.Array.MArray ( MArray(..), freeze, readArray, writeArray )
25+
> import Data.Array.IArray ( Array, IArray(..), (!), array, assocs, elems )
2626

2727
%-----------------------------------------------------------------------------
2828
Produce the complete output file.

packages/backend/src/Happy/Backend/Target.lhs renamed to packages/backend-lalr/src/Happy/Backend/LALR/Target.lhs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The target data type.
44
(c) 1993-2001 Andy Gill, Simon Marlow
55
-----------------------------------------------------------------------------
66

7-
> module Happy.Backend.Target (Target(..)) where
7+
> module Happy.Backend.LALR.Target (Target(..)) where
88

99
> data Target
1010
> = TargetHaskell -- functions and things

0 commit comments

Comments
 (0)