cb7d046 · elk · git.iko.soy

on master help sign in

Added version lower bounds to .cabal file. Added an import for compatibility to Binop.hs.

cb7d046evancz15 years ago

Elm.cabal+4−2

@@ -51,7 +51,8 @@ Executable elm

51 Hs-Source-Dirs: src, src/Parse, src/Types

53 -- Packages needed in order to build this package.

54− Build-depends: base, containers, transformers, mtl, parsec, blaze-html

54+ Build-depends: base >= 4.2.0.2, containers >= 0.3.0.0, transformers >= 0.2.2.0, mtl >= 1.1.0.2,

55+ parsec >= 3.1.1, blaze-html >= 0.4.1.6

56 -- Modules not exported by this package.

57 -- Modules not exported by this package.

57 -- Other-modules:

58 -- Other-modules:

@@ -62,4 +63,5 @@ Executable elm

62Executable elm-server

63Executable elm-server

63 Main-is: Server.hs

64 Main-is: Server.hs

64 Hs-Source-Dirs: src, src/Parse, src/Types

65 Hs-Source-Dirs: src, src/Parse, src/Types

65− Build-depends: base, containers, transformers, mtl, blaze-html, HTTP, happstack-server

66+ Build-depends: base >= 4.2.0.2, containers >= 0.3.0.0, transformers >= 0.2.2.0, mtl >= 1.1.0.2,

67+ blaze-html >= 0.4.1.6, HTTP >= 4000.0.9, happstack-server >= 6.2.4

src/Parse/Binop.hs+1

@@ -3,6 +3,7 @@ module Binop (binops) where

3import Ast

4import Combinators

5import Control.Monad (liftM,guard)

6+import Control.Monad.Error

6import Data.List (foldl',splitAt,elemIndices,group,groupBy,sortBy,find)

7import Data.List (foldl',splitAt,elemIndices,group,groupBy,sortBy,find)

7import Data.Map as Map

8import Data.Map as Map

8import Data.Maybe (mapMaybe)

9import Data.Maybe (mapMaybe)