git.iko.soy/elk
on master help sign in
Rename Varying to Signal
c37dfacEvan Czaplicki
src/Transform/AddDefaultImports.hs+1−1
compare with master
unifiedsplit
@@ -16,8 +16,8 @@ defaultImports =
16 , ["List"] ==> exposing [Var.Value "::"]
16 , ["List"] ==> exposing [Var.Value "::"]
17 , ["Maybe"] ==> exposing [Var.Union "Maybe" Var.openListing]
17 , ["Maybe"] ==> exposing [Var.Union "Maybe" Var.openListing]
18 , ["Result"] ==> exposing [Var.Union "Result" Var.openListing]
18 , ["Result"] ==> exposing [Var.Union "Result" Var.openListing]
19+ , ["Signal"] ==> exposing [Var.Alias "Signal"]
19 , ["Stream"] ==> exposing [Var.Alias "Stream"]
20 , ["Stream"] ==> exposing [Var.Alias "Stream"]
20− , ["Varying"] ==> exposing [Var.Alias "Varying"]
21 ]
21 ]
22
22
23
23
src/Type/ExtraChecks.hs+5−5
@@ -57,8 +57,8 @@ validMainTypes :: [ST.CanonicalType]
57validMainTypes =
57validMainTypes =
58 [ element
58 [ element
59 , html
59 , html
60− , varying element
60+ , signal element
61− , varying html
61+ , signal html
62 ]
62 ]
63 where
63 where
64 fromModule :: [String] -> String -> ST.CanonicalType
64 fromModule :: [String] -> String -> ST.CanonicalType
@@ -68,8 +68,8 @@ validMainTypes =
68 html =
68 html =
69 fromModule ["VirtualDom"] "Node"
69 fromModule ["VirtualDom"] "Node"
70
70
71− varying tipe =
71+ signal tipe =
72− ST.App (fromModule ["Signal"] "Varying") [ tipe ]
72+ ST.App (fromModule ["SignalTypes"] "Signal") [ tipe ]
73
73
74 element =
74 element =
75 let builtin name =
75 let builtin name =
@@ -103,7 +103,7 @@ badMainMessage typeOfMain =
103 P.vcat
103 P.vcat
104 [ P.text "Type Error: 'main' must have one of the following types:"
104 [ P.text "Type Error: 'main' must have one of the following types:"
105 , P.text " "
105 , P.text " "
106− , P.text " Element, Html, Varying Element, Varying Html"
106+ , P.text " Element, Html, Signal Element, Signal Html"
107 , P.text " "
107 , P.text " "
108 , P.text "Instead 'main' has type:\n"
108 , P.text "Instead 'main' has type:\n"
109 , P.nest 4 (PP.pretty typeOfMain)
109 , P.nest 4 (PP.pretty typeOfMain)