f99ac97 · elk · git.iko.soy

compiler/Generate/JavaScript.hs+1

compare with master

unifiedsplit

@@ -38,6 +38,7 @@ internalImports name =

38 [ varDecl "_N" (obj "Elm.Native")

39 , include "_U" "_N.Utils"

40 , include "_L" "_N.List"

41+ , include "_A" "_N.Array"

41 , include "_E" "_N.Error"

42 , include "_E" "_N.Error"

42 , varDecl "$moduleName" (string name)

43 , varDecl "$moduleName" (string name)

43 ]

44 ]

compiler/Generate/JavaScript/Ports.hs+9−2

@@ -55,8 +55,12 @@ inc tipe x =

55

56 | ctor == "_List" ->

57 check x JSArray (obj "_L.fromArray" <| array)

58+

59+ | ctor == "Array.Array" ->

60+ check x JSArray (obj "_A.fromJSArray" <| array)

61+

58− where

62+ where

59− array = DotRef () x (var "map") <| incoming t

63+ array = DotRef () x (var "map") <| incoming t

60

64

61 Data ctor ts

65 Data ctor ts

62 | Help.isTuple ctor -> check x JSArray tuple

66 | Help.isTuple ctor -> check x JSArray tuple

@@ -117,6 +121,9 @@ out tipe x =

117 | ctor == "_List" ->

121 | ctor == "_List" ->

118 DotRef () (obj "_L.toArray" <| x) (var "map") <| outgoing t

122 DotRef () (obj "_L.toArray" <| x) (var "map") <| outgoing t

119

123

124+ | ctor == "Array.Array" ->

125+ DotRef () (obj "_A.toJSArray" <| x) (var "map") <| outgoing t

126+

120 Data ctor ts

127 Data ctor ts

121 | Help.isTuple ctor ->

128 | Help.isTuple ctor ->

122 let convert n t = out t $ DotRef () x $ var ('_':show n)

129 let convert n t = out t $ DotRef () x $ var ('_':show n)

compiler/Type/ExtraChecks.hs+2−3

@@ -60,8 +60,7 @@ portTypes rules expr =

60 | otherwise -> err' True "an unsupported type"

61 where

62 primitives =

63− ["Int","Float","String","Bool","Maybe.Maybe","_List","Json.Value"]

63+ ["Int","Float","String","Bool","Maybe.Maybe","_List","Array.Array","Json.Value"]

64−

65 validConstructor =

64 validConstructor =

66 ctor `elem` primitives || Help.isTuple ctor

65 ctor `elem` primitives || Help.isTuple ctor

67

66

@@ -102,7 +101,7 @@ portTypes rules expr =

102 , txt [ "It contains ", kind, ":\n" ]

101 , txt [ "It contains ", kind, ":\n" ]

103 , (P.nest 4 . SPP.pretty $ Alias.realias rules tipe) <> P.text "\n"

102 , (P.nest 4 . SPP.pretty $ Alias.realias rules tipe) <> P.text "\n"

104 , txt [ "Acceptable values for ", dir "incoming" "outgoing", " ports include:" ]

103 , txt [ "Acceptable values for ", dir "incoming" "outgoing", " ports include:" ]

105− , txt [ " Ints, Floats, Bools, Strings, Maybes, Lists, Tuples," ]

104+ , txt [ " Ints, Floats, Bools, Strings, Maybes, Lists, Arrays, Tuples," ]

106 , txt [ " Json.Values, ", dir "" "first-order functions, ", "and concrete records." ]

105 , txt [ " Json.Values, ", dir "" "first-order functions, ", "and concrete records." ]

107 ] ++ if couldBeAlias then aliasWarning else []

106 ] ++ if couldBeAlias then aliasWarning else []

108

107