Skip to content

Commit 359e753

Browse files
committed
Minor tweaks
* Remove compiler warnings * Update .gitignore * Use ghc-8.8.3 in travis * Remove cruft
1 parent 647e079 commit 359e753

File tree

8 files changed

+22
-144
lines changed

8 files changed

+22
-144
lines changed

.gitignore

+7-17
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,12 @@
22
*.hi
33
*.o
44
*~
5-
/dist/*
6-
/parse.txt
7-
/src/Language/JavaScript/Parser/Grammar5.hs
8-
/src/Language/JavaScript/Parser/Lexer.info
9-
/unicode/uc-ll.htm
10-
/unicode/uc-lm.htm
11-
/unicode/uc-lo.htm
12-
/unicode/uc-lt.htm
13-
/unicode/uc-lu.htm
14-
/unicode/uc-mc.htm
15-
/unicode/uc-mn.htm
16-
/unicode/uc-nd.htm
17-
/unicode/uc-nl.htm
18-
/unicode/uc-nl.htm
19-
/unicode/uc-pc.htm
20-
cabal.sandbox.config
5+
dist/
6+
dist-newstyle/
7+
parse.txt
8+
src/Language/JavaScript/Parser/Grammar5.hs
9+
src/Language/JavaScript/Parser/Lexer.info
10+
unicode/*.htm
2111

2212
# stack
23-
/.stack-work/
13+
.stack-work/

.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ env:
1010
- GHCVER=8.2.2
1111
- GHCVER=8.4.4
1212
- GHCVER=8.6.5
13-
- GHCVER=8.8.1
13+
- GHCVER=8.8.3
1414

1515
before_install:
1616
- sudo add-apt-repository -y ppa:hvr/ghc

buildall.sh

-8
This file was deleted.

cabal.project

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
packages:
2+
./
3+
4+
test-show-details: direct
5+
6+
tests: True

quickcheck.hs

-116
This file was deleted.

src/Language/JavaScript/Pretty/Printer.hs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
{-# LANGUAGE FlexibleInstances, NoOverloadedStrings, TypeSynonymInstances #-}
2+
{-# LANGUAGE CPP, FlexibleInstances, NoOverloadedStrings, TypeSynonymInstances #-}
33

44
module Language.JavaScript.Pretty.Printer
55
( -- * Printing
@@ -10,8 +10,10 @@ module Language.JavaScript.Pretty.Printer
1010

1111
import Blaze.ByteString.Builder (Builder, toLazyByteString)
1212
import Data.List
13+
#if ! MIN_VERSION_base(4,13,0)
1314
import Data.Monoid (mempty)
1415
import Data.Semigroup ((<>))
16+
#endif
1517
import Data.Text.Lazy (Text)
1618
import Language.JavaScript.Parser.AST
1719
import Language.JavaScript.Parser.SrcLocation

src/Language/JavaScript/Process/Minify.hs

+2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@ module Language.JavaScript.Process.Minify
55
minifyJS
66
) where
77

8+
#if ! MIN_VERSION_base(4,13,0)
89
import Control.Applicative ((<$>))
10+
#endif
911

1012
import Language.JavaScript.Parser.AST
1113
import Language.JavaScript.Parser.SrcLocation

test/Test/Language/Javascript/ProgramParser.hs

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1+
{-# LANGUAGE CPP #-}
12
module Test.Language.Javascript.ProgramParser
23
( testProgramParser
34
) where
45

5-
6+
#if ! MIN_VERSION_base(4,13,0)
67
import Control.Applicative ((<$>))
8+
#endif
79
import Test.Hspec
810

911
import Language.JavaScript.Parser

0 commit comments

Comments
 (0)