git.iko.soy/elk
on master help sign in
Correct Port canonicalization
c4b4026Evan Czaplicki
src/Transform/Canonicalize/Port.hs+5−5
compare with master
unifiedsplit
@@ -32,7 +32,7 @@ checkHelp
32 -> Env.Canonicalizer [P.Doc] (T.PortType Var.Canonical)
32 -> Env.Canonicalizer [P.Doc] (T.PortType Var.Canonical)
33checkHelp name rootType tipe =
33checkHelp name rootType tipe =
34 case tipe of
34 case tipe of
35− T.Aliased alias _ arg
35+ T.Aliased alias [(_,arg)] _
36 | Var.is ["Port"] "Port" alias ->
36 | Var.is ["Port"] "Port" alias ->
37 return (T.Internal arg)
37 return (T.Internal arg)
38
38
@@ -44,8 +44,8 @@ checkHelp name rootType tipe =
44 do validForeignType name Out arg arg
44 do validForeignType name Out arg arg
45 return (T.Outbound arg)
45 return (T.Outbound arg)
46
46
47− | otherwise ->
47+ T.Aliased _ args t ->
48− checkHelp name rootType arg
48+ checkHelp name rootType (T.dealias args t)
49
49
50 _ ->
50 _ ->
51 throw $
51 throw $
@@ -53,8 +53,8 @@ checkHelp name rootType tipe =
53 , P.nest 4 $
53 , P.nest 4 $
54 P.vcat $
54 P.vcat $
55 [ P.text ("The port named '" ++ name ++ "' has an invalid type.\n")
55 [ P.text ("The port named '" ++ name ++ "' has an invalid type.\n")
56− , P.nest 4 (PP.pretty tipe) <> P.text "\n"
56+ , P.nest 4 (PP.pretty rootType) <> P.text "\n"
57− , P.text "It must be a Port, InboundPort, or OutboundPort."
57+ , P.text "It must be a Port.Port, Port.InboundPort, or Port.OutboundPort."
58 , P.text "See the Port module for more details:"
58 , P.text "See the Port module for more details:"
59 , P.text "<http://package.elm-lang.org/packages/elm-lang/core/latest/Port>"
59 , P.text "<http://package.elm-lang.org/packages/elm-lang/core/latest/Port>"
60 ]
60 ]