05a73cc · vty · git.iko.soy

git.iko.soy/vty

cleanup: Make ScopedTypeVariables explicit in files that use it.

commit05a73cc4b35ccc7d0948b60a64f6668d24eb4c16 authoriphydf <iphydf@users.noreply.github.com> dateWed 9 Mar 2022, 22:46 (5 years ago) parent1f49263

11 files changed+16−24

compare with master

unifiedsplit

src/Data/Terminfo/Parse.hs+2−1 src/Graphics/Vty.hs+1 src/Graphics/Vty/Input/Loop.hs+4−3 src/Graphics/Vty/Output/Interface.hs+1 test/VerifyEmptyImageProps.hs+1 test/VerifyEvalTerminfoCaps.hs+1 test/VerifyImageOps.hs+1 test/VerifyOutput.hs+1 test/VerifyParseTerminfoCaps.hs+1 test/VerifyUsingMockInput.hs+1 vty.cabal+2−20

src/Data/Terminfo/Parse.hs+2−1

@@ -1,8 +1,9 @@

11{-# LANGUAGE BangPatterns #-}

22{-# LANGUAGE CPP #-}

3−{-# OPTIONS_HADDOCK hide #-}

43{-# LANGUAGE NoMonomorphismRestriction #-}

4+{-# LANGUAGE ScopedTypeVariables #-}

55{-# OPTIONS_GHC -funbox-strict-fields -O #-}

6+{-# OPTIONS_HADDOCK hide #-}

78module Data.Terminfo.Parse

89 ( module Data.Terminfo.Parse

src/Graphics/Vty.hs+1

@@ -1,4 +1,5 @@

11{-# LANGUAGE CPP #-}

2+{-# LANGUAGE ScopedTypeVariables #-}

34-- | Vty provides interfaces for both terminal input and terminal

45-- output.

src/Graphics/Vty/Input/Loop.hs+4−3

@@ -1,8 +1,9 @@

1−{-# LANGUAGE RecordWildCards #-}

2−{-# OPTIONS_HADDOCK hide #-}

1+{-# LANGUAGE CPP #-}

32{-# LANGUAGE NoMonomorphismRestriction #-}

3+{-# LANGUAGE RecordWildCards #-}

4+{-# LANGUAGE ScopedTypeVariables #-}

45{-# LANGUAGE TemplateHaskell #-}

5−{-# LANGUAGE CPP #-}

6+{-# OPTIONS_HADDOCK hide #-}

67-- | The input layer used to be a single function that correctly

78-- accounted for the non-threaded runtime by emulating the terminal

89-- VMIN adn VTIME handling. This has been removed and replace with a

src/Graphics/Vty/Output/Interface.hs+1

@@ -3,6 +3,7 @@

33{-# LANGUAGE ExistentialQuantification #-}

44{-# LANGUAGE GADTs #-}

55{-# LANGUAGE FlexibleContexts #-}

6+{-# LANGUAGE ScopedTypeVariables #-}

67-- | This module provides an abstract interface for performing terminal

78-- output. The only user-facing part of this API is 'Output'.

89module Graphics.Vty.Output.Interface

test/VerifyEmptyImageProps.hs+1

@@ -1,3 +1,4 @@

1+{-# LANGUAGE ScopedTypeVariables #-}

12module VerifyEmptyImageProps where

34import Verify

test/VerifyEvalTerminfoCaps.hs+1

@@ -1,5 +1,6 @@

11{-# LANGUAGE BangPatterns #-}

22{-# LANGUAGE NamedFieldPuns #-}

3+{-# LANGUAGE ScopedTypeVariables #-}

34module VerifyEvalTerminfoCaps where

56import Blaze.ByteString.Builder.Internal.Write (runWrite, getBound)

test/VerifyImageOps.hs+1

@@ -1,3 +1,4 @@

1+{-# LANGUAGE ScopedTypeVariables #-}

12module VerifyImageOps where

34import Graphics.Vty.Attributes

test/VerifyOutput.hs+1

@@ -1,6 +1,7 @@

11-- We setup the environment to envoke certain terminals of interest.

22-- This assumes appropriate definitions exist in the current environment

33-- for the terminals of interest.

4+{-# LANGUAGE ScopedTypeVariables #-}

45module VerifyOutput where

67import Verify

test/VerifyParseTerminfoCaps.hs+1

@@ -1,4 +1,5 @@

11{-# LANGUAGE NamedFieldPuns #-}

2+{-# LANGUAGE ScopedTypeVariables #-}

23module VerifyParseTerminfoCaps where

45import Prelude hiding ( catch )

test/VerifyUsingMockInput.hs+1

@@ -1,5 +1,6 @@

11{-# LANGUAGE MultiParamTypeClasses #-}

22{-# LANGUAGE FlexibleInstances #-}

3+{-# LANGUAGE ScopedTypeVariables #-}

34-- Generate some input bytes and delays between blocks of input bytes.

45-- Verify the events produced are as expected.

56module Main where

vty.cabal+2−20

@@ -117,8 +117,6 @@ library

117117

118118 hs-source-dirs: src

119119

120− default-extensions: ScopedTypeVariables

121−

122120 ghc-options: -O2 -funbox-strict-fields -Wall -fspec-constr -fspec-constr-count=10

123121

124122 ghc-prof-options: -O2 -funbox-strict-fields -caf-all -Wall -fspec-constr -fspec-constr-count=10

@@ -143,7 +141,6 @@ executable vty-mode-demo

143141 hs-source-dirs: demos

144142

145143 default-language: Haskell2010

146− default-extensions: ScopedTypeVariables

147144 ghc-options: -threaded

148145

149146 build-depends: vty,

@@ -158,7 +155,6 @@ executable vty-demo

158155 hs-source-dirs: demos

159156

160157 default-language: Haskell2010

161− default-extensions: ScopedTypeVariables

162158 ghc-options: -threaded

163159

164160 build-depends: vty,

@@ -170,7 +166,6 @@ executable vty-demo

170166

171167test-suite verify-using-mock-terminal

172168 default-language: Haskell2010

173− default-extensions: ScopedTypeVariables

174169

175170 type: detailed-0.9

176171

@@ -203,7 +198,6 @@ test-suite verify-using-mock-terminal

203198

204199test-suite verify-terminal

205200 default-language: Haskell2010

206− default-extensions: ScopedTypeVariables

207201

208202 type: detailed-0.9

209203

@@ -236,7 +230,6 @@ test-suite verify-terminal

236230

237231test-suite verify-display-attributes

238232 default-language: Haskell2010

239− default-extensions: ScopedTypeVariables

240233

241234 type: detailed-0.9

242235

@@ -268,7 +261,6 @@ test-suite verify-display-attributes

268261

269262test-suite verify-empty-image-props

270263 default-language: Haskell2010

271− default-extensions: ScopedTypeVariables

272264

273265 type: detailed-0.9

274266

@@ -294,7 +286,6 @@ test-suite verify-empty-image-props

294286

295287test-suite verify-eval-terminfo-caps

296288 default-language: Haskell2010

297− default-extensions: ScopedTypeVariables

298289

299290 type: detailed-0.9

300291

@@ -323,7 +314,6 @@ test-suite verify-eval-terminfo-caps

323314

324315test-suite verify-image-ops

325316 default-language: Haskell2010

326− default-extensions: ScopedTypeVariables

327317

328318 type: detailed-0.9

329319

@@ -351,7 +341,6 @@ test-suite verify-image-ops

351341

352342test-suite verify-image-trans

353343 default-language: Haskell2010

354− default-extensions: ScopedTypeVariables

355344

356345 type: detailed-0.9

357346

@@ -379,7 +368,6 @@ test-suite verify-image-trans

379368

380369test-suite verify-inline

381370 default-language: Haskell2010

382− default-extensions: ScopedTypeVariables

383371

384372 type: detailed-0.9

385373

@@ -406,7 +394,6 @@ test-suite verify-inline

406394

407395test-suite verify-parse-terminfo-caps

408396 default-language: Haskell2010

409− default-extensions: ScopedTypeVariables

410397

411398 type: detailed-0.9

412399

@@ -435,7 +422,6 @@ test-suite verify-parse-terminfo-caps

435422

436423test-suite verify-simple-span-generation

437424 default-language: Haskell2010

438− default-extensions: ScopedTypeVariables

439425

440426 type: detailed-0.9

441427

@@ -467,7 +453,6 @@ test-suite verify-simple-span-generation

467453

468454test-suite verify-crop-span-generation

469455 default-language: Haskell2010

470− default-extensions: ScopedTypeVariables

471456

472457 type: detailed-0.9

473458

@@ -499,7 +484,6 @@ test-suite verify-crop-span-generation

499484

500485test-suite verify-layers-span-generation

501486 default-language: Haskell2010

502− default-extensions: ScopedTypeVariables

503487

504488 type: detailed-0.9

505489

@@ -530,7 +514,6 @@ test-suite verify-layers-span-generation

530514

531515test-suite verify-color-mapping

532516 default-language: Haskell2010

533− default-extensions: ScopedTypeVariables

534517

535518 type: detailed-0.9

536519

@@ -556,7 +539,6 @@ test-suite verify-color-mapping

556539

557540test-suite verify-utf8-width

558541 default-language: Haskell2010

559− default-extensions: ScopedTypeVariables

560542

561543 type: detailed-0.9

562544

@@ -582,7 +564,6 @@ test-suite verify-utf8-width

582564

583565test-suite verify-using-mock-input

584566 default-language: Haskell2010

585− default-extensions: ScopedTypeVariables

586567

587568 type: exitcode-stdio-1.0

588569

@@ -590,6 +571,8 @@ test-suite verify-using-mock-input

590571

591572 main-is: VerifyUsingMockInput.hs

592573

574+ other-modules: Verify.Graphics.Vty.Output

575+

593576 build-depends: vty,

594577 Cabal >= 1.20,

595578 QuickCheck >= 2.7,

@@ -616,7 +599,6 @@ test-suite verify-using-mock-input

616599

617600test-suite verify-config

618601 default-language: Haskell2010

619− default-extensions: ScopedTypeVariables

620602

621603 type: exitcode-stdio-1.0

622604