f6726d9 · jsaddle · git.iko.soy

git.iko.soy/jsaddle

Update GHCJS preprocessor define used

See https://github.com/ghcjs/ghcjs/issues/132

commitf6726d9b1683a27d928feb711d15e2209191dec6 authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateMon 3 Mar 2014, 16:15 (13 years ago) parentbd560aa

8 files changed+46−46

compare with master

unifiedsplit

jsc.cabal+2−2 src/Language/Javascript/JSC/Evaluate.hs+4−4 src/Language/Javascript/JSC/Monad.hs+3−3 src/Language/Javascript/JSC/Object.hs+13−13 src/Language/Javascript/JSC/Properties.hs+6−6 src/Language/Javascript/JSC/String.hs+3−3 src/Language/Javascript/JSC/Types.hs+2−2 src/Language/Javascript/JSC/Value.hs+13−13

jsc.cabal+2−2

@@ -1,5 +1,5 @@

11name: jsc

2−version: 0.1.1.1

2+version: 0.1.1.2

33cabal-version: >=1.10

44license: MIT

55license-file: LICENSE

@@ -92,7 +92,7 @@ test-suite test-tool

9292

9393 build-depends: template-haskell -any, base <5, lens >=3.8.5 && <4.1,

9494 text >=0.11.2.3 && <1.2, transformers >=0.3.0.0 && <0.4,

95− hslogger -any, jsc ==0.1.1.1

95+ hslogger -any, jsc ==0.1.1.2

9696 type: exitcode-stdio-1.0

9797 main-is: TestJSC.hs

9898 default-language: Haskell2010

src/Language/Javascript/JSC/Evaluate.hs+4−4

@@ -1,5 +1,5 @@

11{-# LANGUAGE CPP #-}

2−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

2+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

33{-# LANGUAGE ForeignFunctionInterface, JavaScriptFFI #-}

44#endif

55-----------------------------------------------------------------------------

@@ -25,7 +25,7 @@ import Control.Monad.IO.Class (MonadIO(..))

2525import Language.Javascript.JSC.Types

2626 (JSStringRef, JSValueRef, JSObjectRef,

2727 JSValueRefRef)

28−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

28+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

2929import GHCJS.Types (nullRef)

3030#else

3131import Graphics.UI.Gtk.WebKit.JavaScriptCore.JSBase

@@ -51,7 +51,7 @@ evaluateScript :: (MakeStringRef script, MakeObjectRef this, MakeStringRef url)

5151 -> url

5252 -> Int -- ^ The Line number of the first line of the script

5353 -> JSC JSValueRef

54−#if defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)

54+#if defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)

5555evaluateScript script this url line = liftIO $ js_eval (makeStringRef script)

5656foreign import javascript unsafe "$r = eval(s);"

5757 js_eval :: JSStringRef -> IO JSValueRef

@@ -71,7 +71,7 @@ evaluateScript = undefined

7171eval :: MakeStringRef script

7272 => script -- ^ JavaScript to evaluate

7373 -> JSC JSValueRef

74−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

74+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

7575eval script = evaluateScript script (nullRef::JSObjectRef) (nullRef::JSStringRef) 1

7676#else

7777eval script = evaluateScript script (nullPtr::JSObjectRef) (nullPtr::JSStringRef) 1

src/Language/Javascript/JSC/Monad.hs+3−3

@@ -30,7 +30,7 @@ import Control.Monad.Trans.Reader (runReaderT, ask, ReaderT(..))

3030import Language.Javascript.JSC.Types

3131 (JSValueRefRef, JSValueRef, JSContextRef)

3232import Control.Monad.IO.Class (MonadIO(..))

33−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

33+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

3434import GHCJS.Types (isUndefined, isNull)

3535import GHCJS.Foreign (newArray, indexArray)

3636#else

@@ -69,7 +69,7 @@ t `catch` c = do

6969-- to throw exceptions.

7070catchval :: (JSValueRefRef -> JSC a) -> (JSValueRef -> JSC a) -> JSC a

7171catchval f catcher = do

72−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

72+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

7373 pexc <- liftIO $ newArray

7474 result <- f pexc

7575 exc <- liftIO $ indexArray 0 pexc

@@ -87,7 +87,7 @@ catchval f catcher = do

8787 else catcher exc

8888#endif

8989

90−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

90+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

9191runJSC :: w -> JSC a -> IO a

9292runJSC _ f = runReaderT f ()

9393#else

src/Language/Javascript/JSC/Object.hs+13−13

@@ -4,7 +4,7 @@

44{-# LANGUAGE ScopedTypeVariables #-}

55{-# LANGUAGE Rank2Types #-}

66{-# LANGUAGE ForeignFunctionInterface #-}

7−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

7+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

88{-# LANGUAGE JavaScriptFFI #-}

99#endif

1010-----------------------------------------------------------------------------

@@ -79,7 +79,7 @@ import Language.Javascript.JSC.Types

7979 (JSPropertyNameArrayRef, JSStringRef, JSObjectRef, JSValueRefRef,

8080 JSValueRef, JSContextRef, Index)

8181import Foreign.C.Types (CSize(..), CULong(..), CUInt(..))

82−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

82+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

8383import GHCJS.Types (nullRef, castRef, JSArray, JSFun)

8484import GHCJS.Foreign (newObj, toArray, fromArray, syncCallback2)

8585import Control.Monad (liftM)

@@ -292,7 +292,7 @@ call function this args = do

292292-- >>> testJSC $ do { a <- obj; a ^. js "x" <# "Hello"; a ^. js "x" }

293293-- Hello

294294obj :: JSC JSObjectRef

295−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

295+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

296296obj = liftIO $ newObj

297297#else

298298obj = do

@@ -320,7 +320,7 @@ type JSCallAsFunction = JSValueRef -- ^ Function object

320320fun :: JSCallAsFunction -> JSCallAsFunction

321321fun = id

322322

323−#if (!defined(__GHCJS__) || !defined(USE_JAVASCRIPTFFI)) && defined(USE_WEBKIT)

323+#if (!defined(ghcjs_HOST_OS) || !defined(USE_JAVASCRIPTFFI)) && defined(USE_WEBKIT)

324324foreign import ccall "wrapper"

325325 mkJSObjectCallAsFunctionCallback :: JSObjectCallAsFunctionCallback' -> IO JSObjectCallAsFunctionCallback

326326#endif

@@ -331,7 +331,7 @@ function :: MakeStringRef name

331331 -> JSCallAsFunction -- ^ Haskell function to call

332332 -> JSC JSObjectRef -- ^ Returns a JavaScript function object that will

333333 -- call the Haskell one when it is called

334−#if defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)

334+#if defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)

335335function name f = liftIO $ do

336336 callback <- syncCallback2 False True $ \this args -> do

337337 rargs <- fromArray args

@@ -361,7 +361,7 @@ function = undefined

361361-- an anonymous JavaScript function object. Use 'function' to create one with

362362-- a name.

363363instance MakeValueRef JSCallAsFunction where

364−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

364+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

365365 makeValueRef = function (nullRef::JSStringRef)

366366#else

367367 makeValueRef = function (nullPtr::JSStringRef)

@@ -369,7 +369,7 @@ instance MakeValueRef JSCallAsFunction where

369369

370370instance MakeArgRefs JSCallAsFunction where

371371 makeArgRefs f = do

372−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

372+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

373373 rarg <- function (nullRef::JSStringRef) f

374374#else

375375 rarg <- function (nullPtr::JSStringRef) f

@@ -377,7 +377,7 @@ instance MakeArgRefs JSCallAsFunction where

377377 return [rarg]

378378

379379makeArray :: MakeArgRefs args => args -> JSValueRefRef -> JSC JSObjectRef

380−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

380+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

381381makeArray args exceptions = makeArgRefs args >>= liftM castRef . liftIO . toArray

382382#else

383383makeArray args exceptions = do

@@ -400,7 +400,7 @@ array = rethrow . makeArray

400400

401401-- | JavaScript's global object

402402global :: JSC JSObjectRef

403−#if defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)

403+#if defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)

404404global = liftIO js_window

405405foreign import javascript unsafe "$r = window"

406406 js_window :: IO JSObjectRef

@@ -411,7 +411,7 @@ global = undefined

411411#endif

412412

413413-- | Get an array containing the property names present on a given object

414−#if (!defined(__GHCJS__) || !defined(USE_JAVASCRIPTFFI)) && defined(USE_WEBKIT)

414+#if (!defined(ghcjs_HOST_OS) || !defined(USE_JAVASCRIPTFFI)) && defined(USE_WEBKIT)

415415copyPropertyNames :: MakeObjectRef this => this -> JSC JSPropertyNameArrayRef

416416copyPropertyNames this = do

417417 gctxt <- ask

@@ -435,7 +435,7 @@ propertyNamesList names = do

435435

436436-- | Get a list containing the property names present on a given object

437437propertyNames :: MakeObjectRef this => this -> JSC [JSStringRef]

438−#if defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)

438+#if defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)

439439propertyNames this = makeObjectRef this >>= liftIO . js_propertyNames >>= liftIO . fromArray

440440foreign import javascript unsafe "$r = []; h$forIn($1, function(n){$r.push(n);})"

441441 js_propertyNames :: JSObjectRef -> IO (JSArray a)

@@ -456,7 +456,7 @@ objCallAsFunction :: MakeArgRefs args

456456 -> args

457457 -> JSValueRefRef

458458 -> JSC JSValueRef

459−#if defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)

459+#if defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)

460460objCallAsFunction function this args exceptions = do

461461 rargs <- makeArgRefs args >>= liftIO . toArray

462462 liftIO $ js_apply function this rargs exceptions

@@ -478,7 +478,7 @@ objCallAsConstructor :: MakeArgRefs args

478478 -> args

479479 -> JSValueRefRef

480480 -> JSC JSValueRef

481−#if defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)

481+#if defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)

482482objCallAsConstructor function args exceptions = do

483483 rargs <- makeArgRefs args >>= liftIO . toArray

484484 liftIO $ js_new function rargs exceptions

src/Language/Javascript/JSC/Properties.hs+6−6

@@ -1,7 +1,7 @@

11{-# LANGUAGE CPP #-}

22{-# LANGUAGE FlexibleInstances #-}

33{-# LANGUAGE TypeSynonymInstances #-}

4−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

4+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

55{-# LANGUAGE ForeignFunctionInterface, JavaScriptFFI #-}

66#endif

77-----------------------------------------------------------------------------

@@ -45,7 +45,7 @@ import Language.Javascript.JSC.Monad (JSC)

4545import Language.Javascript.JSC.Types

4646 (JSValueRefRef, JSObjectRef, JSPropertyAttributes,

4747 Index(..), JSStringRef)

48−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

48+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

4949#else

5050import Graphics.UI.Gtk.WebKit.JavaScriptCore.JSObjectRef

5151 (jsobjectgetpropertyatindex, jsobjectgetproperty,

@@ -88,7 +88,7 @@ objGetPropertyByName :: MakeStringRef name

8888 -> name -- ^ name of the property.

8989 -> JSValueRefRef -- ^ exception if one is raised.

9090 -> JSC JSValueRef -- ^ returns the property value.

91−#if defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)

91+#if defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)

9292objGetPropertyByName this name = liftIO . js_tryGetProp (makeStringRef name) this

9393foreign import javascript unsafe "try { $r=$2[$1] } catch(e) { $3[0] = e }"

9494 js_tryGetProp :: JSStringRef -> JSObjectRef -> JSValueRefRef -> IO JSValueRef

@@ -105,7 +105,7 @@ objGetPropertyAtIndex :: JSObjectRef -- ^ object to find the property on.

105105 -> Index -- ^ index of the property.

106106 -> JSValueRefRef -- ^ exception if one is raised.

107107 -> JSC JSValueRef -- ^ returns the property value.

108−#if defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)

108+#if defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)

109109objGetPropertyAtIndex this index = liftIO . js_tryIndex index this

110110foreign import javascript unsafe "try { $r=$2[$1] } catch(e) { $3[0] = e }"

111111 js_tryIndex :: Index -> JSObjectRef -> JSValueRefRef -> IO JSValueRef

@@ -145,7 +145,7 @@ objSetPropertyByName :: (MakeStringRef name, MakeValueRef val)

145145 -> JSPropertyAttributes -- ^ property attributes to give the property.

146146 -> JSValueRefRef -- ^ exception if one is raised.

147147 -> JSC ()

148−#if defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)

148+#if defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)

149149objSetPropertyByName this name val attributes exceptions = do

150150 vref <- makeValueRef val

151151 liftIO $ js_trySetProp (makeStringRef name) this vref exceptions

@@ -167,7 +167,7 @@ objSetPropertyAtIndex :: (MakeValueRef val)

167167 -> val -- ^ new value to set the property to.

168168 -> JSValueRefRef -- ^ exception if one is raised.

169169 -> JSC ()

170−#if defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)

170+#if defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)

171171objSetPropertyAtIndex this index val exceptions = do

172172 vref <- makeValueRef val

173173 liftIO $ js_trySetAtIndex index this vref exceptions

src/Language/Javascript/JSC/String.hs+3−3

@@ -26,7 +26,7 @@ import Data.Text (Text)

2626import qualified Data.Text as T (pack)

2727import Control.Monad.IO.Class (MonadIO(..))

2828import Language.Javascript.JSC.Types (JSStringRef)

29−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

29+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

3030import GHCJS.Foreign (fromJSString, toJSString)

3131#else

3232import Graphics.UI.Gtk.WebKit.JavaScriptCore.JSStringRef

@@ -51,7 +51,7 @@ instance MakeStringRef String where

5151

5252-- | Convert a JavaScript string to a Haskell 'Text'

5353strToText :: MonadIO m => JSStringRef -> m Text

54−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

54+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

5555strToText = return . fromJSString

5656#else

5757strToText jsstring = liftIO $ do

@@ -62,7 +62,7 @@ strToText jsstring = liftIO $ do

6262

6363-- | Convert a Haskell 'Text' to a JavaScript string

6464textToStr :: Text -> JSStringRef

65−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

65+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

6666textToStr = toJSString

6767#else

6868textToStr text = unsafePerformIO $

src/Language/Javascript/JSC/Types.hs+2−2

@@ -22,7 +22,7 @@ module Language.Javascript.JSC.Types (

2222 , Index(..)

2323) where

2424

25−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

25+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

2626import GHCJS.Types

2727import Data.Word (Word(..))

2828#else

@@ -33,7 +33,7 @@ import Graphics.UI.Gtk.WebKit.JavaScriptCore.JSObjectRef (JSPropertyAttributes)

3333import Foreign.C (CUInt(..))

3434#endif

3535

36−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

36+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

3737data ValueOrObject

3838data Object

3939data PropertyNameArray

src/Language/Javascript/JSC/Value.hs+13−13

@@ -2,7 +2,7 @@

22{-# LANGUAGE ScopedTypeVariables #-}

33{-# LANGUAGE FlexibleInstances #-}

44{-# LANGUAGE TypeSynonymInstances #-}

5−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

5+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

66{-# LANGUAGE ForeignFunctionInterface, JavaScriptFFI #-}

77#endif

88-----------------------------------------------------------------------------

@@ -66,7 +66,7 @@ module Language.Javascript.JSC.Value (

6666import Prelude hiding (catch)

6767import Language.Javascript.JSC.Types

6868 (JSValueRefRef, JSObjectRef, JSStringRef, JSValueRef)

69−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

69+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

7070import GHCJS.Types (castRef, JSRef(..))

7171import GHCJS.Foreign (toJSBool, fromJSBool', jsNull, jsUndefined, toJSString)

7272import GHCJS.Marshal (toJSRef)

@@ -136,7 +136,7 @@ data JSValue = ValNull -- ^ null

136136-- >>> testJSC $ valToBool "1"

137137-- true

138138valToBool :: MakeValueRef val => val -> JSC JSBool

139−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

139+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

140140valToBool val = fromJSBool' <$> makeValueRef val

141141#else

142142valToBool val = do

@@ -165,7 +165,7 @@ valToBool val = do

165165-- >>> testJSC $ show <$> valToNumber "1"

166166-- 1.0

167167valToNumber :: MakeValueRef val => val -> JSC JSNumber

168−#if defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)

168+#if defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)

169169valToNumber val = jsrefToNumber <$> makeValueRef val

170170foreign import javascript unsafe "$r = Number($1);" jsrefToNumber :: JSRef a -> Double

171171#elif defined(USE_WEBKIT)

@@ -197,7 +197,7 @@ valToNumber = undefined

197197-- >>> testJSC $ valToStr "1" >>= strToText

198198-- 1

199199valToStr :: MakeValueRef val => val -> JSC JSStringRef

200−#if defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)

200+#if defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)

201201valToStr val = jsrefToString <$> makeValueRef val

202202foreign import javascript unsafe "$r = $1.toString();" jsrefToString :: JSRef a -> JSStringRef

203203#elif defined(USE_WEBKIT)

@@ -253,7 +253,7 @@ valToText jsvar = valToStr jsvar >>= strToText

253253-- >>> testJSC $ obj >>= valToJSON 0 >>= strToText

254254-- {}

255255valToJSON :: MakeValueRef val => Word -> val -> JSC JSStringRef

256−#if defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)

256+#if defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)

257257valToJSON indent val = jsrefToJSON <$> makeValueRef val

258258foreign import javascript unsafe "$r = JSON.stringify($1);" jsrefToJSON :: JSRef a -> JSStringRef

259259#elif defined(USE_WEBKIT)

@@ -285,7 +285,7 @@ valToJSON = undefined

285285-- >>> testJSC $ valToObject "1"

286286-- 1

287287valToObject :: MakeValueRef val => val -> JSC JSObjectRef

288−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

288+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

289289valToObject val = castRef <$> makeValueRef val

290290#else

291291valToObject val = do

@@ -316,7 +316,7 @@ instance MakeValueRef v => MakeValueRef (JSC v) where

316316----------- null ---------------

317317-- | Make a @null@ JavaScript value

318318valMakeNull :: JSC JSValueRef

319−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

319+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

320320valMakeNull = return jsNull

321321#else

322322valMakeNull = ask >>= (liftIO . jsvaluemakenull)

@@ -333,7 +333,7 @@ instance MakeArgRefs JSNull where

333333----------- undefined ---------------

334334-- | Make an @undefined@ JavaScript value

335335valMakeUndefined :: JSC JSValueRef

336−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

336+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

337337valMakeUndefined = return jsUndefined

338338#else

339339valMakeUndefined = ask >>= (liftIO . jsvaluemakeundefined)

@@ -355,7 +355,7 @@ instance MakeArgRefs () where

355355----------- booleans ---------------

356356-- | Make a JavaScript boolean value

357357valMakeBool :: JSBool -> JSC JSValueRef

358−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

358+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

359359valMakeBool b = return . castRef $ toJSBool b

360360#else

361361valMakeBool b = do

@@ -374,7 +374,7 @@ instance MakeArgRefs Bool where

374374----------- numbers ---------------

375375-- | Make a JavaScript number

376376valMakeNumber :: JSNumber -> JSC JSValueRef

377−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

377+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

378378valMakeNumber n = liftIO $ castRef <$> toJSRef n

379379#else

380380valMakeNumber n = do

@@ -393,7 +393,7 @@ instance MakeArgRefs Double where

393393----------- numbers ---------------

394394-- | Make a JavaScript string

395395valMakeString :: Text -> JSC JSValueRef

396−#if (defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

396+#if (defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)) || !defined(USE_WEBKIT)

397397valMakeString = return . castRef . toJSString

398398#else

399399valMakeString text = do

@@ -434,7 +434,7 @@ instance MakeValueRef String where

434434-- >>> testJSC $ show <$> valToObject True >>= deRefVal

435435-- ValObject 0x...

436436deRefVal :: MakeValueRef val => val -> JSC JSValue

437−#if defined(__GHCJS__) && defined(USE_JAVASCRIPTFFI)

437+#if defined(ghcjs_HOST_OS) && defined(USE_JAVASCRIPTFFI)

438438deRefVal val = do

439439 gctxt <- ask

440440 valref <- makeValueRef val