c422a7b · elk · git.iko.soy

git.iko.soy/elk

Merge branch 'list'

commitc422a7b19a38e345aaaec35fd0d13d4458277e33 authorEvan Czaplicki <info@elm-lang.org> dateMon 17 Nov 2014, 13:34 (12 years ago) parent39f4127 ee72256

7 files changed+9−15

compare with master

unifiedsplit

src/AST/Type.hs+1−5 src/AST/Variable.hs+1−1 src/Parse/Type.hs+1−3 src/Transform/Canonicalize/Environment.hs+1−1 src/Type/Constrain/Expression.hs+1−1 src/Type/Environment.hs+2−2 src/Type/Type.hs+2−2

src/AST/Type.hs+1−5

@@ -29,7 +29,7 @@ recordOf :: [(String, Type var)] -> Type var

2929recordOf fields = Record fields Nothing

3030

3131listOf :: RawType -> RawType

32−listOf t = App (Type (Var.Raw "_List")) [t]

32+listOf t = App (Type (Var.Raw "List")) [t]

3333

3434tupleOf :: [RawType] -> RawType

3535tupleOf ts = App (Type t) ts

@@ -54,9 +54,6 @@ instance (Var.ToString var, Pretty var) => Pretty (Type var) where

5454

5555 App f args ->

5656 case (f,args) of

57− (Type name, [t])

58− | Var.toString name == "_List" -> P.brackets (pretty t)

59−

6057 (Type name, _)

6158 | Help.isTuple (Var.toString name) ->

6259 P.parens . P.sep . P.punctuate P.comma $ map pretty args

@@ -93,7 +90,6 @@ prettyParens tipe = parensIf (needed tipe) (pretty tipe)

9390

9491 Lambda _ _ -> True

9592

96− App (Type name) [_] | Var.toString name == "_List" -> False

9793 App (Type name) _ | Help.isTuple (Var.toString name) -> False

9894 App t' [] -> needed t'

9995 App _ _ -> True

src/AST/Variable.hs+1−1

@@ -64,7 +64,7 @@ isSignal =

6464

6565isList :: Canonical -> Bool

6666isList v =

67− v == Canonical BuiltIn "_List"

67+ v == Canonical BuiltIn "List"

6868

6969

7070isTuple :: Canonical -> Bool

src/Parse/Type.hs+1−3

@@ -12,8 +12,6 @@ import Parse.Helpers

1212tvar :: IParser T.RawType

1313tvar = T.Var <$> lowVar <?> "type variable"

1414

15−list :: IParser T.RawType

16−list = T.listOf <$> braces expr

1715

1816tuple :: IParser T.RawType

1917tuple = do ts <- parens (commaSep expr)

@@ -50,7 +48,7 @@ constructor0 =

5048 return (T.Type (Var.Raw name))

5149

5250term :: IParser T.RawType

53−term = list <|> tuple <|> record <|> tvar <|> constructor0

51+term = tuple <|> record <|> tvar <|> constructor0

5452

5553app :: IParser T.RawType

5654app =

src/Transform/Canonicalize/Environment.hs+1−1

@@ -65,7 +65,7 @@ builtIns :: Module.Name -> Environment

6565builtIns home =

6666 Env { _home = home

6767 , _values = builtIn (tuples ++ [saveEnvName])

68− , _adts = builtIn (tuples ++ ["_List","Int","Float","Char","Bool","String"])

68+ , _adts = builtIn (tuples ++ ["List","Int","Float","Char","Bool","String"])

6969 , _aliases = dict []

7070 , _patterns = builtIn (tuples ++ ["::","[]"])

7171 }

src/Type/Constrain/Expression.hs+1−1

@@ -23,7 +23,7 @@ import qualified Type.Constrain.Pattern as Pattern

2323constrain :: Env.Environment -> Canonical.Expr -> Type

2424 -> ErrorT [PP.Doc] IO TypeConstraint

2525constrain env (A region expr) tipe =

26− let list t = Env.get env Env.types "_List" <| t

26+ let list t = Env.get env Env.types "List" <| t

2727 and = A region . CAnd

2828 true = A region CTrue

2929 t1 === t2 = A region (CEqual t1 t2)

src/Type/Environment.hs+2−2

@@ -52,7 +52,7 @@ makeTypes datatypes =

5252

5353 builtins :: [(String, Int)]

5454 builtins = concat [ map tuple [0..9]

55− , kind 1 ["_List"]

55+ , kind 1 ["List"]

5656 , kind 0 ["Int","Float","Char","String","Bool"]

5757 ]

5858 where

@@ -66,7 +66,7 @@ makeConstructors :: Environment

6666 -> Map.Map String (IO (Int, [Variable], [Type], Type))

6767makeConstructors env datatypes = Map.fromList builtins

6868 where

69− list t = (types env Map.! "_List") <| t

69+ list t = (types env Map.! "List") <| t

7070

7171 inst :: Int -> ([Type] -> ([Type], Type)) -> IO (Int, [Variable], [Type], Type)

7272 inst numTVars tipe = do

src/Type/Type.hs+2−2

@@ -171,8 +171,8 @@ instance PrettyType a => PrettyType (Term1 a) where

171171 pretty when term =

172172 let prty = pretty Never in

173173 case term of

174− App1 f x | P.render px == "_List" -> P.brackets (pretty Never x)

175− | otherwise -> parensIf needed (px <+> pretty App x)

174+ App1 f x ->

175+ parensIf needed (px <+> pretty App x)

176176 where

177177 px = prty f

178178 needed = case when of