e7d5d60 · rowtype-yoga/purescript-native

git.iko.soy/rowtype-yoga/purescript-native

Unify LANGUAGE pragma layouts

commite7d5d605ebf2ca72585aaffeb3a73ac48373d624 authorTibor Erdesz <erdeszt@gmail.com> dateSun 23 Aug 2015, 16:29 (11 years ago) parent0b72e7a

13 files changed+48−19

compare with golang

unifiedsplit

psci/tests/Main.hs+2−1

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

1−{-# LANGUAGE RecordWildCards, TupleSections #-}

1+{-# LANGUAGE RecordWildCards #-}

2+{-# LANGUAGE TupleSections #-}

34module Main where

src/Language/PureScript/AST/Declarations.hs+3−1

@@ -12,7 +12,9 @@

1212--

1313-----------------------------------------------------------------------------

1414

15−{-# LANGUAGE DeriveDataTypeable, ScopedTypeVariables, CPP #-}

15+{-# LANGUAGE DeriveDataTypeable #-}

16+{-# LANGUAGE ScopedTypeVariables #-}

17+{-# LANGUAGE CPP #-}

1618

1719module Language.PureScript.AST.Declarations where

1820

src/Language/PureScript/AST/SourcePos.hs+4−1

@@ -12,7 +12,10 @@

1212--

1313-----------------------------------------------------------------------------

1414

15−{-# LANGUAGE DeriveDataTypeable, ScopedTypeVariables, RecordWildCards, OverloadedStrings #-}

15+{-# LANGUAGE DeriveDataTypeable #-}

16+{-# LANGUAGE ScopedTypeVariables #-}

17+{-# LANGUAGE RecordWildCards #-}

18+{-# LANGUAGE OverloadedStrings #-}

1619

1720module Language.PureScript.AST.SourcePos where

1821

src/Language/PureScript/CodeGen/JS/AST.hs+2−1

@@ -13,7 +13,8 @@

1313--

1414-----------------------------------------------------------------------------

1515

16−{-# LANGUAGE DeriveDataTypeable, CPP #-}

16+{-# LANGUAGE DeriveDataTypeable #-}

17+{-# LANGUAGE CPP #-}

1718

1819module Language.PureScript.CodeGen.JS.AST where

1920

src/Language/PureScript/CodeGen/JS/Optimizer.hs+2−1

@@ -31,7 +31,8 @@

3131--

3232-----------------------------------------------------------------------------

3333

34−{-# LANGUAGE FlexibleContexts, CPP #-}

34+{-# LANGUAGE FlexibleContexts #-}

35+{-# LANGUAGE CPP #-}

3536

3637module Language.PureScript.CodeGen.JS.Optimizer (

3738 optimize

src/Language/PureScript/Names.hs+3−1

@@ -13,7 +13,9 @@

1313--

1414-----------------------------------------------------------------------------

1515

16−{-# LANGUAGE DeriveDataTypeable, DeriveFunctor, GADTs #-}

16+{-# LANGUAGE DeriveDataTypeable #-}

17+{-# LANGUAGE DeriveFunctor #-}

18+{-# LANGUAGE GADTs #-}

1719

1820module Language.PureScript.Names where

1921

src/Language/PureScript/Renamer.hs+3−1

@@ -14,7 +14,9 @@

1414--

1515-----------------------------------------------------------------------------

1616

17−{-# LANGUAGE FlexibleContexts, ScopedTypeVariables, CPP #-}

17+{-# LANGUAGE FlexibleContexts #-}

18+{-# LANGUAGE ScopedTypeVariables #-}

19+{-# LANGUAGE CPP #-}

1820

1921module Language.PureScript.Renamer (renameInModules) where

2022

src/Language/PureScript/Sugar/CaseDeclarations.hs+3−1

@@ -14,7 +14,9 @@

1414--

1515-----------------------------------------------------------------------------

1616

17−{-# LANGUAGE FlexibleContexts, ScopedTypeVariables, CPP #-}

17+{-# LANGUAGE FlexibleContexts #-}

18+{-# LANGUAGE ScopedTypeVariables #-}

19+{-# LANGUAGE CPP #-}

1820

1921module Language.PureScript.Sugar.CaseDeclarations (

2022 desugarCases,

src/Language/PureScript/TypeChecker/Kinds.hs+6−4

@@ -14,7 +14,9 @@

1414-----------------------------------------------------------------------------

1515

1616{-# OPTIONS_GHC -fno-warn-orphans #-}

17−{-# LANGUAGE MultiParamTypeClasses, FlexibleInstances, TupleSections #-}

17+{-# LANGUAGE MultiParamTypeClasses #-}

18+{-# LANGUAGE FlexibleInstances #-}

19+{-# LANGUAGE TupleSections #-}

1820{-# LANGUAGE CPP #-}

1921

2022module Language.PureScript.TypeChecker.Kinds (

@@ -75,12 +77,12 @@ instance Unifiable Check Kind where

7577--

7678kindOf :: ModuleName -> Type -> Check Kind

7779kindOf _ ty = fst <$> kindOfWithScopedVars ty

78−

80+

7981-- |

8082-- Infer the kind of a single type, returning the kinds of any scoped type variables

8183--

82−kindOfWithScopedVars :: Type -> Check (Kind, [(String, Kind)])

83−kindOfWithScopedVars ty =

84+kindOfWithScopedVars :: Type -> Check (Kind, [(String, Kind)])

85+kindOfWithScopedVars ty =

8486 rethrow (onErrorMessages (ErrorCheckingKind ty)) $

8587 fmap tidyUp . liftUnify $ infer ty

8688 where

src/Language/PureScript/TypeChecker/Monad.hs+7−2

@@ -13,8 +13,13 @@

1313--

1414-----------------------------------------------------------------------------

1515

16−{-# LANGUAGE GeneralizedNewtypeDeriving, FlexibleInstances, RankNTypes,

17− MultiParamTypeClasses, FlexibleContexts, GADTs, CPP #-}

16+{-# LANGUAGE GeneralizedNewtypeDeriving #-}

17+{-# LANGUAGE FlexibleInstances #-}

18+{-# LANGUAGE RankNTypes #-}

19+{-# LANGUAGE MultiParamTypeClasses #-}

20+{-# LANGUAGE FlexibleContexts #-}

21+{-# LANGUAGE GADTs #-}

22+{-# LANGUAGE CPP #-}

1823

1924module Language.PureScript.TypeChecker.Monad where

2025

src/Language/PureScript/TypeChecker/Synonyms.hs+4−1

@@ -13,7 +13,10 @@

1313--

1414-----------------------------------------------------------------------------

1515

16−{-# LANGUAGE FlexibleContexts, MultiParamTypeClasses, GADTs, CPP #-}

16+{-# LANGUAGE FlexibleContexts #-}

17+{-# LANGUAGE MultiParamTypeClasses #-}

18+{-# LANGUAGE GADTs #-}

19+{-# LANGUAGE CPP #-}

1720

1821module Language.PureScript.TypeChecker.Synonyms (

1922 saturateAllTypeSynonyms,

src/Language/PureScript/TypeChecker/Types.hs+4−1

@@ -13,7 +13,10 @@

1313--

1414-----------------------------------------------------------------------------

1515

16−{-# LANGUAGE FlexibleContexts, MultiParamTypeClasses, OverloadedStrings, CPP #-}

16+{-# LANGUAGE FlexibleContexts #-}

17+{-# LANGUAGE MultiParamTypeClasses #-}

18+{-# LANGUAGE OverloadedStrings #-}

19+{-# LANGUAGE CPP #-}

1720

1821module Language.PureScript.TypeChecker.Types (

1922 typesOf

src/Language/PureScript/TypeChecker/Unify.hs+5−3

@@ -14,7 +14,9 @@

1414-----------------------------------------------------------------------------

1515

1616{-# OPTIONS_GHC -fno-warn-orphans #-}

17−{-# LANGUAGE FlexibleInstances, FlexibleContexts, MultiParamTypeClasses #-}

17+{-# LANGUAGE FlexibleInstances #-}

18+{-# LANGUAGE FlexibleContexts #-}

19+{-# LANGUAGE MultiParamTypeClasses #-}

1820

1921module Language.PureScript.TypeChecker.Unify (

2022 unifyTypes,

@@ -157,14 +159,14 @@ unifiesWith _ REmpty REmpty = True

157159unifiesWith e r1@(RCons _ _ _) r2@(RCons _ _ _) =

158160 let (s1, r1') = rowToList r1

159161 (s2, r2') = rowToList r2

160−

162+

161163 int = [ (t1, t2) | (name, t1) <- s1, (name', t2) <- s2, name == name' ]

162164 sd1 = [ (name, t1) | (name, t1) <- s1, name `notElem` map fst s2 ]

163165 sd2 = [ (name, t2) | (name, t2) <- s2, name `notElem` map fst s1 ]

164166 in all (\(t1, t2) -> unifiesWith e t1 t2) int && go sd1 r1' sd2 r2'

165167 where

166168 go :: [(String, Type)] -> Type -> [(String, Type)] -> Type -> Bool

167− go [] REmpty [] REmpty = True

169+ go [] REmpty [] REmpty = True

168170 go [] (TypeVar v1) [] (TypeVar v2) = v1 == v2

169171 go [] (Skolem _ s1 _) [] (Skolem _ s2 _) = s1 == s2

170172 go _ (TUnknown _) _ _ = True