Skip to content

Commit 90ceab0

Browse files
authored
Merge pull request #35 from Tsukuba-Programming-Lab/#34_ChangeCopager2
#34 Copager2 -> Ftpageh
2 parents 269ef1a + d1d5221 commit 90ceab0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+356
-356
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copager2(仮)
1+
# Ftpageh
22

33
## 記述例([app/src/Arithmetic.hs](./app/Arithmetic.hs)
44

app/errh/errh.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ executable errh-panicmode
1111
build-depends:
1212
base,
1313
mtl,
14-
copager2,
14+
ftpageh,
1515
language,
1616
err-handling,
1717

1818
executable errh-corchuelo
19-
main-is: corchuelo.hs
19+
main-is: Corchuelo.hs
2020
hs-source-dirs: src
2121
build-depends:
2222
base,
2323
mtl,
24-
copager2,
24+
ftpageh,
2525
language,
2626
err-handling,

app/errh/src/Corchuelo.hs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import Prelude hiding (lex)
22

33
import Control.Monad.State (lift)
44

5-
import Copager2.Prelude
6-
import Copager2.Core.Process (foldProcess)
7-
import Copager2.Core.Progress (Progress(..))
8-
import Copager2.Lex.RegexLex (lex)
9-
import Copager2.Parse (Event(..))
10-
import Copager2.Parse.LR.Common.Driver (parse)
11-
import Copager2.IR.Void (Void, build, feed)
5+
import Ftpageh.Prelude
6+
import Ftpageh.Core.Process (foldProcess)
7+
import Ftpageh.Core.Progress (Progress(..))
8+
import Ftpageh.Lex.RegexLex (lex)
9+
import Ftpageh.Parse (Event(..))
10+
import Ftpageh.Parse.LR.Common.Driver (parse)
11+
import Ftpageh.IR.Void (Void, build, feed)
1212

1313
import ErrHandling.Core (recover)
1414
import ErrHandling.Corchuelo (corchuelo)

app/errh/src/PanicMode.hs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import Prelude hiding (lex)
22

33
import Control.Monad.State (lift)
44

5-
import Copager2.Prelude
6-
import Copager2.Core.Process (foldProcess)
7-
import Copager2.Core.Progress (Progress(..))
8-
import Copager2.Lex.RegexLex (lex)
9-
import Copager2.Parse (Event(..))
10-
import Copager2.Parse.LR.Common.Driver (parse)
11-
import Copager2.IR.Void (Void, build, feed)
5+
import Ftpageh.Prelude
6+
import Ftpageh.Core.Process (foldProcess)
7+
import Ftpageh.Core.Progress (Progress(..))
8+
import Ftpageh.Lex.RegexLex (lex)
9+
import Ftpageh.Parse (Event(..))
10+
import Ftpageh.Parse.LR.Common.Driver (parse)
11+
import Ftpageh.IR.Void (Void, build, feed)
1212

1313
import ErrHandling.Core (recover)
1414
import ErrHandling.PanicMode (panicMode)

app/lang/lang.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ executable lang-arithmetic
1111
build-depends:
1212
base,
1313
mtl,
14-
copager2,
14+
ftpageh,
1515
language,
1616

1717
executable lang-json
@@ -20,7 +20,7 @@ executable lang-json
2020
build-depends:
2121
base,
2222
mtl,
23-
copager2,
23+
ftpageh,
2424
language,
2525

2626
executable lang-pl0
@@ -29,7 +29,7 @@ executable lang-pl0
2929
build-depends:
3030
base,
3131
mtl,
32-
copager2,
32+
ftpageh,
3333
language,
3434

3535
executable lang-xml
@@ -38,5 +38,5 @@ executable lang-xml
3838
build-depends:
3939
base,
4040
mtl,
41-
copager2,
41+
ftpageh,
4242
language,

app/lang/src/Arithmetic.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
import Prelude hiding (lex)
55

6-
import Copager2.Prelude
7-
import Copager2.Lex.RegexLex (lex)
8-
import Copager2.Parse.LR.Common.Driver (parse)
9-
import Copager2.IR.SExp (SExp, consume)
6+
import Ftpageh.Prelude
7+
import Ftpageh.Lex.RegexLex (lex)
8+
import Ftpageh.Parse.LR.Common.Driver (parse)
9+
import Ftpageh.IR.SExp (SExp, consume)
1010

1111
import Language.Arithmetic (ArithmeticToken, ArithmeticRule)
1212

app/lang/src/Json.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
import Prelude hiding (lex)
55

6-
import Copager2.Prelude
7-
import Copager2.Lex.RegexLex (lex)
8-
import Copager2.Parse.LR.Common.Driver (parse)
9-
import Copager2.IR.SExp (SExp, consume)
6+
import Ftpageh.Prelude
7+
import Ftpageh.Lex.RegexLex (lex)
8+
import Ftpageh.Parse.LR.Common.Driver (parse)
9+
import Ftpageh.IR.SExp (SExp, consume)
1010

1111
import Language.Json (JsonToken, JsonRule)
1212

app/lang/src/Pl0.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
import Prelude hiding (lex)
55

6-
import Copager2.Prelude
7-
import Copager2.Lex.RegexLex (lex)
8-
import Copager2.Parse.LR.Common.Driver (parse)
9-
import Copager2.IR.SExp (SExp, consume)
6+
import Ftpageh.Prelude
7+
import Ftpageh.Lex.RegexLex (lex)
8+
import Ftpageh.Parse.LR.Common.Driver (parse)
9+
import Ftpageh.IR.SExp (SExp, consume)
1010

1111
import Language.Pl0 (Pl0Token, Pl0Rule)
1212

app/lang/src/Xml.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33

44
import Prelude hiding (lex)
55

6-
import Copager2.Prelude
7-
import Copager2.Lex.RegexLex (lex)
8-
import Copager2.Parse.LR.Common.Driver (parse)
9-
import Copager2.IR.SExp (SExp, consume)
6+
import Ftpageh.Prelude
7+
import Ftpageh.Lex.RegexLex (lex)
8+
import Ftpageh.Parse.LR.Common.Driver (parse)
9+
import Ftpageh.IR.SExp (SExp, consume)
1010

1111
import Language.Xml (XmlToken, XmlRule)
1212

cabal.project

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ packages:
44
./app/errh
55

66
-- lib
7-
./lib/copager2
7+
./lib/ftpageh
88
./lib/language
99
./lib/err_handling
1010

0 commit comments

Comments
 (0)