on master help sign in
Fix .cabal file more. Remove dependence on Types.hs from Parse/ParsePatterns.hs.
4e1760fevancz
Elm.cabal+13−4
@@ -31,10 +31,14 @@ Executable elm
31 -- .hs or .lhs file containing the Main module.
31 -- .hs or .lhs file containing the Main module.
32 Main-is: Elm.hs
32 Main-is: Elm.hs
33 Hs-Source-Dirs: src, src/Parse, src/Types
33 Hs-Source-Dirs: src, src/Parse, src/Types
34+ other-modules: Ast, CompileToJS, FreeVar, GenerateHtml, Initialize,
35+ Rename, Replace, ToHtml, Binop, Combinators, Lexer,
36+ ParsePatterns, Parser, ParserLib, ParseTypes, Tokens,
37+ Types
34
38
35 -- Packages needed in order to build this package.
39 -- Packages needed in order to build this package.
36− Build-depends: base >= 4.2 && < 5, containers >= 0.3.0.0, transformers >= 0.2.2.0, mtl >= 1.1.0.2,
40+ Build-depends: base >=4.2 && <5, containers >= 0.3, transformers >= 0.2,
37− parsec >= 3.1.1, blaze-html >= 0.4.1.6
41+ mtl >= 2, parsec >= 3.1.1, blaze-html >=0.4 && <0.5
38
42
39 -- Modules not exported by this package.
43 -- Modules not exported by this package.
40 -- Other-modules:
44 -- Other-modules:
@@ -45,5 +49,10 @@ Executable elm
45Executable elm-server
49Executable elm-server
46 Main-is: Server.hs
50 Main-is: Server.hs
47 Hs-Source-Dirs: src, src/Parse, src/Types
51 Hs-Source-Dirs: src, src/Parse, src/Types
52+ other-modules: Ast, CompileToJS, FreeVar, GenerateHtml, Initialize,
53+ Rename, Replace, ToHtml, Binop, Combinators, Lexer,
54+ ParsePatterns, Parser, ParserLib, ParseTypes, Tokens,
55+ Types
48− Build-depends: base >= 4.2 && < 5, containers >= 0.3.0.0, transformers >= 0.2.2.0, mtl >= 1.1.0.2,
56+ Build-depends: base >=4.2 && <5, containers >= 0.3, transformers >= 0.2,
57+ mtl >= 2, parsec >= 3.1.1, blaze-html >=0.4 && <0.5,
49− blaze-html >= 0.4.1.6, HTTP >= 4000.0.9, happstack-server >= 6.2.4
58+ HTTP >= 4000, happstack-server >= 6.2.4
src/Parse/ParsePatterns.hs−1
@@ -5,7 +5,6 @@ import Combinators
5import Data.Char (isUpper)
5import Data.Char (isUpper)
6import ParserLib
6import ParserLib
7import Tokens
7import Tokens
8−import Types
9
8
10pattern_basic =
9pattern_basic =
11 (t UNDERSCORE >> return PAnything) +|+
10 (t UNDERSCORE >> return PAnything) +|+