git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Fix issue with extern member declarations returning functions.
commit5248e0347b5d33bb3294b9bc7768bdee846b4a72 authorPhil Freeman <paf31@cantab.net> dateFri 10 Jan 2014, 11:58 (13 years ago) parent721b48c
3 files changed+24−4
compare with golang
unifiedsplit
examples/passing/ExternMember.purs+5 purescript.cabal+1−1 src/Language/PureScript/CodeGen/JS.hs+18−3
examples/passing/ExternMember.pursnew file+5
@@ -0,0 +1,5 @@
1+module ExternMember where
2+
3+foreign import member "length" length :: String -> Number
4+
5+foreign import member "concat" concat :: forall a. [a] -> [a] -> [a]
purescript.cabal+1−1
@@ -1,5 +1,5 @@
11name: purescript
2−version: 0.2.9.1
2+version: 0.2.9.2
33cabal-version: >=1.8
44build-type: Simple
55license: MIT
src/Language/PureScript/CodeGen/JS.hs+18−3
@@ -53,9 +53,24 @@ declToJs opts mp (BindingGroupDeclaration vals) e =
5353 [ JSVariableIntroduction ident (Just (valueToJs opts mp e val)),
5454 setProperty (identToJs ident) (JSVar ident) mp ]
5555 ) vals
56−declToJs _ mp (ExternMemberDeclaration member ident _) _ =
57− Just [ JSFunction (Just ident) [Ident "value"] (JSBlock [JSReturn (JSAccessor member (JSVar (Ident "value")))]),
58− setProperty (show ident) (JSVar ident) mp ]
56+declToJs _ mp (ExternMemberDeclaration member ident ty) _
57+ | returnsFunction ty =
58+ Just [ JSFunction (Just ident) [Ident "value"] (JSBlock
59+ [ JSReturn $ JSApp (JSAccessor "bind" (JSAccessor member (JSVar (Ident "value")))) [JSVar (Ident "value")]
60+ ]),
61+ setProperty (show ident) (JSVar ident) mp ]
62+ | otherwise =
63+ Just [ JSFunction (Just ident) [Ident "value"] (JSBlock
64+ [ JSReturn $ JSAccessor member (JSVar (Ident "value"))
65+ ]),
66+ setProperty (show ident) (JSVar ident) mp ]
67+ where
68+ returnsFunction (Function _ ret) = isFunction ret
69+ returnsFunction (ForAll _ ty') = returnsFunction ty'
70+ returnsFunction _ = error "Expected function type in declToJs"
71+ isFunction (Function _ _) = True
72+ isFunction (ForAll _ ty') = isFunction ty'
73+ isFunction _ = False
5974declToJs _ mp (DataDeclaration _ _ ctors) _ =
6075 Just $ flip concatMap ctors $ \(pn@(ProperName ctor), maybeTy) ->
6176 let