5d7388b · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

Move extensions into source files

Because hackage told me to when checking idris.cabal for release...

commit5d7388bb3c71fe56b7c09c0b31a94d44bf9f4f25 authorEdwin Brady <ecb10@st-andrews.ac.uk> dateTue 1 Aug 2017, 11:26 (9 years ago) parent7a54e9c

33 files changed+59−39

compare with master

unifiedsplit

idris.cabal+7−10 src/IRTS/CodegenC.hs+2 src/IRTS/Compiler.hs+1−1 src/IRTS/Defunctionalise.hs+1−1 src/IRTS/Lang.hs+2−1 src/IRTS/Portable.hs+1−1 src/IRTS/Simplified.hs+1 src/Idris/AbsSyntax.hs+1−1 src/Idris/AbsSyntaxTree.hs+3−1 src/Idris/Apropos.hs+1 src/Idris/CaseSplit.hs+1−1 src/Idris/Chaser.hs+2 src/Idris/Core/Binary.hs+2 src/Idris/Core/CaseTree.hs+2−2 src/Idris/Core/DeepSeq.hs+2−1 src/Idris/Core/ProofState.hs+2−1 src/Idris/Core/TT.hs+4−2 src/Idris/Core/Typecheck.hs+2−2 src/Idris/Core/Unify.hs+1−1 src/Idris/Core/WHNF.hs+1−1 src/Idris/Coverage.hs+1−1 src/Idris/DataOpts.hs+1−1 src/Idris/Docstrings.hs+2−1 src/Idris/Elab/Utils.hs+1−1 src/Idris/IBC.hs+1−1 src/Idris/Output.hs+1 src/Idris/Package/Parser.hs+1−1 src/Idris/Parser.hs+2−1 src/Idris/Parser/Helpers.hs+3−2 src/Idris/Parser/Ops.hs+2−1 src/Idris/PartialEval.hs+1−1 src/Idris/REPL.hs+1−1 src/Util/Pretty.hs+3

idris.cabal+7−10

@@ -40,7 +40,7 @@ Description: Idris is a general purpose language with full dependent types.

4040 .

4141 * Hugs style interactive environment

4242

43−Cabal-Version: >= 1.8.1

43+Cabal-Version: >= 1.18

4444

4545Build-type: Custom

4646

@@ -320,13 +320,7 @@ Library

320320 if impl(ghc < 7.8.4)

321321 build-depends: tagsoup < 0.14.1

322322

323− Extensions: MultiParamTypeClasses

324− , DeriveFoldable

325− , DeriveTraversable

326− , FunctionalDependencies

327− , FlexibleContexts

328− , FlexibleInstances

329− , TemplateHaskell

323+ Default-Language: Haskell2010

330324

331325 ghc-prof-options: -auto-all -caf-all

332326

@@ -365,6 +359,7 @@ Executable idris

365359 , haskeline >= 0.7

366360 , transformers

367361

362+ Default-Language: Haskell2010

368363 ghc-prof-options: -auto-all -caf-all

369364 ghc-options: -threaded -rtsopts -funbox-strict-fields -with-rtsopts=-I0

370365

@@ -389,10 +384,9 @@ Test-suite regression-and-feature-tests

389384 , tasty-rerun >= 1.0.0

390385 , bytestring

391386 , transformers

392− if impl(ghc < 7.10)

393− Extensions: DeriveDataTypeable

394387

395388

389+ Default-Language: Haskell2010

396390 ghc-prof-options: -auto-all -caf-all

397391 ghc-options: -threaded -rtsopts -with-rtsopts=-N -funbox-strict-fields

398392

@@ -406,6 +400,7 @@ Executable idris-codegen-c

406400 , haskeline >= 0.7

407401 , transformers

408402

403+ Default-Language: Haskell2010

409404 ghc-prof-options: -auto-all -caf-all

410405 ghc-options: -threaded -rtsopts -funbox-strict-fields

411406

@@ -419,6 +414,7 @@ Executable idris-codegen-javascript

419414 , haskeline >= 0.7

420415 , transformers

421416

417+ Default-Language: Haskell2010

422418 ghc-prof-options: -auto-all -caf-all

423419 ghc-options: -threaded -rtsopts -funbox-strict-fields

424420

@@ -432,5 +428,6 @@ Executable idris-codegen-node

432428 , haskeline >= 0.7

433429 , transformers

434430

431+ Default-Language: Haskell2010

435432 ghc-prof-options: -auto-all -caf-all

436433 ghc-options: -threaded -rtsopts -funbox-strict-fields

src/IRTS/CodegenC.hs+2

@@ -5,6 +5,8 @@ Copyright :

55License : BSD3

66Maintainer : The Idris Community.

77-}

8+{-# LANGUAGE FlexibleContexts #-}

810module IRTS.CodegenC (codegenC) where

911

1012import Idris.AbsSyntax hiding (getBC)

src/IRTS/Compiler.hs+1−1

@@ -5,7 +5,7 @@ Copyright :

55License : BSD3

66Maintainer : The Idris Community.

77-}

8−{-# LANGUAGE CPP, PatternGuards, TypeSynonymInstances #-}

8+{-# LANGUAGE CPP, FlexibleContexts, PatternGuards, TypeSynonymInstances #-}

1010module IRTS.Compiler(compile, generate) where

1111

src/IRTS/Defunctionalise.hs+1−1

@@ -19,7 +19,7 @@ To defunctionalise:

19198. Add explicit EVAL to case, primitives, and foreign calls

2020

2121-}

22−{-# LANGUAGE PatternGuards #-}

22+{-# LANGUAGE FlexibleContexts, PatternGuards #-}

2323module IRTS.Defunctionalise(module IRTS.Defunctionalise

2424 , module IRTS.Lang

2525 ) where

src/IRTS/Lang.hs+2−1

@@ -5,7 +5,8 @@ Copyright :

55License : BSD3

66Maintainer : The Idris Community.

77-}

8−{-# LANGUAGE DeriveDataTypeable, DeriveFunctor, DeriveGeneric, PatternGuards #-}

8+{-# LANGUAGE DeriveDataTypeable, DeriveFunctor, DeriveGeneric, FlexibleContexts,

9+ PatternGuards #-}

910

1011module IRTS.Lang where

1112

src/IRTS/Portable.hs+1−1

@@ -5,7 +5,7 @@ Copyright :

55License : BSD3

66Maintainer : The Idris Community.

77-}

8−{-# LANGUAGE OverloadedStrings #-}

8+{-# LANGUAGE FlexibleInstances, OverloadedStrings, TypeSynonymInstances #-}

99module IRTS.Portable (writePortable) where

1010

1111import Idris.Core.CaseTree

src/IRTS/Simplified.hs+1

@@ -5,6 +5,7 @@ Copyright :

55License : BSD3

66Maintainer : The Idris Community.

77-}

8+{-# LANGUAGE FlexibleContexts #-}

89module IRTS.Simplified(simplifyDefs, SDecl(..), SExp(..), SAlt(..)) where

910

1011import Idris.Core.CaseTree

src/Idris/AbsSyntax.hs+1−1

@@ -6,7 +6,7 @@ License : BSD3

66Maintainer : The Idris Community.

77-}

9−{-# LANGUAGE DeriveFunctor, PatternGuards #-}

9+{-# LANGUAGE DeriveFunctor, FlexibleContexts, PatternGuards #-}

1010

1111module Idris.AbsSyntax(

1212 module Idris.AbsSyntax

src/Idris/AbsSyntaxTree.hs+3−1

@@ -6,7 +6,9 @@ License : BSD3

66Maintainer : The Idris Community.

77-}

9−{-# LANGUAGE DeriveDataTypeable, DeriveFunctor, DeriveGeneric, PatternGuards #-}

9+{-# LANGUAGE DeriveDataTypeable, DeriveFoldable, DeriveFunctor, DeriveGeneric,

10+ DeriveTraversable, FlexibleContexts, FlexibleInstances,

11+ MultiParamTypeClasses, PatternGuards, TypeSynonymInstances #-}

1012

1113module Idris.AbsSyntaxTree where

1214

src/Idris/Apropos.hs+1

@@ -5,6 +5,7 @@ Copyright :

55License : BSD3

66Maintainer : The Idris Community.

77-}

8+{-# LANGUAGE FlexibleInstances #-}

89module Idris.Apropos (apropos, aproposModules) where

910

1011import Idris.AbsSyntax

src/Idris/CaseSplit.hs+1−1

@@ -17,7 +17,7 @@ Always take the "more specific" argument when there is a discrepancy, i.e.

1717names over '_', patterns over names, etc.

1818-}

1919

20−{-# LANGUAGE PatternGuards #-}

20+{-# LANGUAGE FlexibleContexts, PatternGuards #-}

2121

2222module Idris.CaseSplit(

2323 splitOnLine, replaceSplits

src/Idris/Chaser.hs+2

@@ -5,6 +5,8 @@ Copyright :

55License : BSD3

66Maintainer : The Idris Community.

77-}

8+{-# LANGUAGE FlexibleContexts #-}

810module Idris.Chaser(

911 buildTree, getImports

1012 , getModuleFiles

src/Idris/Core/Binary.hs+2

@@ -5,6 +5,8 @@ Copyright :

55License : BSD3

66Maintainer : The Idris Community.

77-}

8+{-# LANGUAGE FlexibleInstances #-}

810{-# OPTIONS_GHC -fwarn-incomplete-patterns #-}

911module Idris.Core.Binary where

1012

src/Idris/Core/CaseTree.hs+2−2

@@ -18,8 +18,8 @@ allows casing on arbitrary terms, here we choose to maintain the distinction

1818in order to allow for better optimisation opportunities.

1919

2020-}

21−{-# LANGUAGE DeriveFunctor, DeriveGeneric, PatternGuards, TypeSynonymInstances

22− #-}

21+{-# LANGUAGE DeriveFunctor, DeriveGeneric, FlexibleContexts, FlexibleInstances,

22+ PatternGuards, TypeSynonymInstances #-}

2323

2424module Idris.Core.CaseTree (

2525 CaseDef(..), SC, SC'(..), CaseAlt, CaseAlt'(..), ErasureInfo

src/Idris/Core/DeepSeq.hs+2−1

@@ -5,7 +5,8 @@ Copyright :

55License : BSD3

66Maintainer : The Idris Community.

77-}

8−{-# LANGUAGE BangPatterns, CPP, ViewPatterns #-}

8+{-# LANGUAGE BangPatterns, CPP, FlexibleInstances, TypeSynonymInstances,

9+ ViewPatterns #-}

910{-# OPTIONS_GHC -fwarn-incomplete-patterns #-}

1011

1112module Idris.Core.DeepSeq where

src/Idris/Core/ProofState.hs+2−1

@@ -10,7 +10,8 @@ proofs, and some high level commands for introducing new theorems,

1010evaluation/checking inside the proof system, etc.

1111-}

1212

13−{-# LANGUAGE FlexibleInstances, MultiParamTypeClasses, PatternGuards #-}

13+{-# LANGUAGE FlexibleContexts, FlexibleInstances, MultiParamTypeClasses,

14+ PatternGuards #-}

1415module Idris.Core.ProofState(

1516 ProofState(..), newProof, envAtFocus, goalAtFocus

1617 , Tactic(..), Goal(..), processTactic, nowElaboratingPS

src/Idris/Core/TT.hs+4−2

@@ -22,8 +22,10 @@ TT is the core language of Idris. The language has:

2222 * We have a simple collection of tactics which we use to elaborate source

2323 programs with implicit syntax into fully explicit terms.

2424-}

25−{-# LANGUAGE DeriveDataTypeable, DeriveFunctor, DeriveGeneric, FlexibleContexts,

26− FunctionalDependencies, MultiParamTypeClasses, PatternGuards #-}

25+{-# LANGUAGE DeriveDataTypeable, DeriveFoldable, DeriveFunctor, DeriveGeneric,

26+ DeriveTraversable, FlexibleContexts, FlexibleInstances,

27+ FunctionalDependencies, MultiParamTypeClasses, PatternGuards,

28+ TypeSynonymInstances #-}

2729{-# OPTIONS_GHC -fwarn-incomplete-patterns #-}

2830module Idris.Core.TT(

2931 AppStatus(..), ArithTy(..), Binder(..), Const(..), Ctxt(..)

src/Idris/Core/Typecheck.hs+2−2

@@ -6,8 +6,8 @@ License : BSD3

66Maintainer : The Idris Community.

77-}

9−{-# LANGUAGE DeriveFunctor, FlexibleInstances, MultiParamTypeClasses,

10− PatternGuards #-}

9+{-# LANGUAGE DeriveFunctor, FlexibleContexts, FlexibleInstances,

10+ MultiParamTypeClasses, PatternGuards #-}

1111

1212module Idris.Core.Typecheck where

1313

src/Idris/Core/Unify.hs+1−1

@@ -11,7 +11,7 @@ Returns a list of hole names paired with the term which solves them, and

1111a list of things which need to be injective.

1212

1313-}

14−{-# LANGUAGE PatternGuards #-}

14+{-# LANGUAGE FlexibleContexts, PatternGuards #-}

1515

1616module Idris.Core.Unify(

1717 match_unify, unify

src/Idris/Core/WHNF.hs+1−1

@@ -6,7 +6,7 @@ License : BSD3

66Maintainer : The Idris Community.

77-}

9−{-# LANGUAGE PatternGuards #-}

9+{-# LANGUAGE FlexibleContexts, PatternGuards #-}

1010{-# OPTIONS_GHC -fwarn-incomplete-patterns #-}

1111module Idris.Core.WHNF(whnf, whnfArgs, WEnv) where

1212

src/Idris/Coverage.hs+1−1

@@ -5,7 +5,7 @@ Copyright :

55License : BSD3

66Maintainer : The Idris Community.

77-}

8−{-# LANGUAGE PatternGuards #-}

8+{-# LANGUAGE FlexibleContexts, PatternGuards #-}

99module Idris.Coverage(genClauses, validCoverageCase, recoverableCoverage,

1010 mkPatTm) where

1111

src/Idris/DataOpts.hs+1−1

@@ -5,7 +5,7 @@ Copyright :

55License : BSD3

66Maintainer : The Idris Community.

77-}

8−{-# LANGUAGE PatternGuards #-}

8+{-# LANGUAGE FlexibleInstances, PatternGuards #-}

1010module Idris.DataOpts(applyOpts) where

1111

src/Idris/Docstrings.hs+2−1

@@ -6,7 +6,8 @@ License : BSD3

66Maintainer : The Idris Community.

77-}

9−{-# LANGUAGE DeriveFunctor, DeriveGeneric, ScopedTypeVariables #-}

9+{-# LANGUAGE DeriveFoldable, DeriveFunctor, DeriveGeneric, DeriveTraversable,

10+ ScopedTypeVariables #-}

1011{-# OPTIONS_GHC -fwarn-incomplete-patterns #-}

1112module Idris.Docstrings (

1213 Docstring(..), Block(..), Inline(..), parseDocstring, renderDocstring

src/Idris/Elab/Utils.hs+1−1

@@ -5,7 +5,7 @@ Copyright :

55License : BSD3

66Maintainer : The Idris Community.

77-}

8−{-# LANGUAGE PatternGuards #-}

8+{-# LANGUAGE FlexibleContexts, PatternGuards #-}

99module Idris.Elab.Utils where

1010

1111import Idris.AbsSyntax

src/Idris/IBC.hs+1−1

@@ -5,7 +5,7 @@ Copyright :

55License : BSD3

66Maintainer : The Idris Community.

77-}

8−{-# LANGUAGE TypeSynonymInstances #-}

8+{-# LANGUAGE FlexibleInstances, TypeSynonymInstances #-}

99{-# OPTIONS_GHC -fwarn-incomplete-patterns #-}

1010

1111module Idris.IBC (loadIBC, loadPkgIndex,

src/Idris/Output.hs+1

@@ -6,6 +6,7 @@ License : BSD3

66Maintainer : The Idris Community.

77-}

9+{-# LANGUAGE FlexibleInstances #-}

910{-# OPTIONS_GHC -fwarn-incomplete-patterns #-}

1011

1112module Idris.Output where

src/Idris/Package/Parser.hs+1−1

@@ -5,7 +5,7 @@ Copyright :

55License : BSD3

66Maintainer : The Idris Community.

77-}

8−{-# LANGUAGE CPP, ConstraintKinds #-}

8+{-# LANGUAGE CPP, ConstraintKinds, FlexibleInstances, TypeSynonymInstances #-}

99module Idris.Package.Parser where

1010

1111import Idris.AbsSyntaxTree

src/Idris/Parser.hs+2−1

@@ -5,7 +5,8 @@ Copyright :

55License : BSD3

66Maintainer : The Idris Community.

77-}

8−{-# LANGUAGE ConstraintKinds, GeneralizedNewtypeDeriving, PatternGuards #-}

8+{-# LANGUAGE ConstraintKinds, FlexibleContexts, GeneralizedNewtypeDeriving,

9+ PatternGuards #-}

910{-# OPTIONS_GHC -O0 #-}

1011module Idris.Parser(module Idris.Parser,

1112 module Idris.Parser.Expr,

src/Idris/Parser/Helpers.hs+3−2

@@ -5,8 +5,9 @@ Copyright :

55License : BSD3

66Maintainer : The Idris Community.

77-}

8−{-# LANGUAGE CPP, ConstraintKinds, GeneralizedNewtypeDeriving, PatternGuards,

9− StandaloneDeriving #-}

8+{-# LANGUAGE CPP, ConstraintKinds, FlexibleInstances,

9+ GeneralizedNewtypeDeriving, PatternGuards, StandaloneDeriving,

10+ TypeSynonymInstances #-}

1011module Idris.Parser.Helpers where

1112

1213import Idris.AbsSyntax

src/Idris/Parser/Ops.hs+2−1

@@ -5,7 +5,8 @@ Copyright :

55License : BSD3

66Maintainer : The Idris Community.

77-}

8−{-# LANGUAGE ConstraintKinds, GeneralizedNewtypeDeriving, PatternGuards #-}

8+{-# LANGUAGE ConstraintKinds, FlexibleContexts, GeneralizedNewtypeDeriving,

9+ PatternGuards #-}

910module Idris.Parser.Ops where

1011

1112import Idris.AbsSyntax

src/Idris/PartialEval.hs+1−1

@@ -5,7 +5,7 @@ Copyright :

55License : BSD3

66Maintainer : The Idris Community.

77-}

8−{-# LANGUAGE PatternGuards #-}

8+{-# LANGUAGE FlexibleContexts, PatternGuards #-}

1010module Idris.PartialEval(

1111 partial_eval, getSpecApps, specType

src/Idris/REPL.hs+1−1

@@ -5,7 +5,7 @@ License : BSD3

55Maintainer : The Idris Community.

66-}

8−{-# LANGUAGE PatternGuards #-}

8+{-# LANGUAGE FlexibleContexts, PatternGuards #-}

1010module Idris.REPL

1111 ( idemodeStart

src/Util/Pretty.hs+3

@@ -5,6 +5,9 @@ Copyright :

55License : BSD3

66Maintainer : The Idris Community.

77-}

9+{-# LANGUAGE MultiParamTypeClasses #-}

10+

811module Util.Pretty (

912 module Text.PrettyPrint.Annotated.Leijen

1013 , Sized(..)