From 19de8310c77d80ab8d5f9d1264e9611aced929de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurrie=CC=88n=20Stutterheim?= Date: Sat, 31 Dec 2011 13:39:11 +0100 Subject: [PATCH 1/3] Cleanup --- uhc-jscript/src/Language/UHC/JScript/ECMA/String.hs | 9 --------- 1 file changed, 9 deletions(-) diff --git a/uhc-jscript/src/Language/UHC/JScript/ECMA/String.hs b/uhc-jscript/src/Language/UHC/JScript/ECMA/String.hs index 5413681..f6f5c42 100644 --- a/uhc-jscript/src/Language/UHC/JScript/ECMA/String.hs +++ b/uhc-jscript/src/Language/UHC/JScript/ECMA/String.hs @@ -20,15 +20,6 @@ instance FromJS JSString String where jsStringToString :: JSString -> String jsStringToString = packedStringToString -foreign import jscript "primPackedStringNull" - primPackedStringNull :: JSString -> Bool - -foreign import jscript "primPackedStringHead" - primPackedStringHead :: JSString -> Char - -foreign import jscript "primPackedStringTail" - primPackedStringTail :: JSString -> JSString - foreign import jscript "String.fromCharCode(%*)" fromCharCode :: Int -> JSString From bdd30b8a40f154aca773e166ec2bfa4d7fbbe6bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurrie=CC=88n=20Stutterheim?= Date: Sat, 7 Jan 2012 14:33:25 +0100 Subject: [PATCH 2/3] getAttr in IO, also add getAttr_ --- uhc-jscript/src/Language/UHC/JScript/Primitives.hs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/uhc-jscript/src/Language/UHC/JScript/Primitives.hs b/uhc-jscript/src/Language/UHC/JScript/Primitives.hs index 7556c28..ed8c1dd 100644 --- a/uhc-jscript/src/Language/UHC/JScript/Primitives.hs +++ b/uhc-jscript/src/Language/UHC/JScript/Primitives.hs @@ -41,15 +41,18 @@ setCtor s1 fp = _setCtor (toJS s1) fp foreign import prim "primSetCtor" _setCtor :: JSString -> JSFunPtr a -> IO () -getAttr :: String -> JSPtr p -> a +getAttr :: String -> JSPtr p -> IO a getAttr s p = _getAttr (toJS s) p foreign import prim "primGetAttr" - _getAttr :: JSString -> JSPtr p -> a + _getAttr :: JSString -> JSPtr p -> IO a setAttr :: String -> a -> JSPtr p -> IO (JSPtr p) setAttr s a p = _setAttr (toJS s) a p +setAttr_ :: String -> a -> JSPtr p -> IO () +setAttr_ s a p = setAttr s a p >> return () + foreign import prim "primSetAttr" _setAttr :: JSString -> a -> JSPtr p -> IO (JSPtr p) From a8e2a52e1a9bf3f4d2b7a5d8eeed46e2b75e49f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jurrie=CC=88n=20Stutterheim?= Date: Sat, 7 Jan 2012 14:37:01 +0100 Subject: [PATCH 3/3] Also add modAttr_ --- uhc-jscript/src/Language/UHC/JScript/Primitives.hs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/uhc-jscript/src/Language/UHC/JScript/Primitives.hs b/uhc-jscript/src/Language/UHC/JScript/Primitives.hs index ed8c1dd..611b971 100644 --- a/uhc-jscript/src/Language/UHC/JScript/Primitives.hs +++ b/uhc-jscript/src/Language/UHC/JScript/Primitives.hs @@ -65,6 +65,9 @@ foreign import prim "primPureSetAttr" modAttr :: String -> (a -> b) -> JSPtr p -> IO (JSPtr p) modAttr s f p = _modAttr (toJS s) f p +modAttr_ :: String -> (a -> b) -> JSPtr p -> IO () +modAttr_ s f p = modAttr s f p >> return () + foreign import prim "primModAttr" _modAttr :: JSString -> (a -> b) -> JSPtr p -> IO (JSPtr p)