19248bc · jsaddle · git.iko.soy

src/Language/Javascript/JSaddle.hs+10−20

compare with master

unifiedsplit

@@ -55,27 +55,17 @@ module Language.Javascript.JSaddle (

55 -- will be replaced with JavaScript function calls.

56

57 -- * Modules

58− module Language.Javascript.JSaddle.Monad

58+ module JSaddle

59− , module Language.Javascript.JSaddle.Exception

60− , module Language.Javascript.JSaddle.Value

61− , module Language.Javascript.JSaddle.Arguments

62− , module Language.Javascript.JSaddle.Properties

63− , module Language.Javascript.JSaddle.Object

64− , module Language.Javascript.JSaddle.Evaluate

65−#ifdef MIN_VERSION_jmacro

66− , module Language.Javascript.JSaddle.JMacro

67−#endif

68− , module Language.Javascript.JSaddle.String

69) where

59) where

70

60

71−import Language.Javascript.JSaddle.Monad

61+import Language.Javascript.JSaddle.Monad as JSaddle

72−import Language.Javascript.JSaddle.Exception

62+import Language.Javascript.JSaddle.Exception as JSaddle

73−import Language.Javascript.JSaddle.Value

63+import Language.Javascript.JSaddle.Value as JSaddle

74−import Language.Javascript.JSaddle.Arguments

64+import Language.Javascript.JSaddle.Arguments as JSaddle

75−import Language.Javascript.JSaddle.Properties

65+import Language.Javascript.JSaddle.Properties as JSaddle

76−import Language.Javascript.JSaddle.Object

66+import Language.Javascript.JSaddle.Object as JSaddle

77−import Language.Javascript.JSaddle.Evaluate

67+import Language.Javascript.JSaddle.Evaluate as JSaddle

78#ifdef MIN_VERSION_jmacro

68#ifdef MIN_VERSION_jmacro

79−import Language.Javascript.JSaddle.JMacro

69+import Language.Javascript.JSaddle.JMacro as JSaddle

80#endif

70#endif

81−import Language.Javascript.JSaddle.String

71+import Language.Javascript.JSaddle.String as JSaddle

src/Language/Javascript/JSaddle/Exception.hs+1−1

@@ -30,6 +30,6 @@ instance E.Exception JSException

30

31-- | Catch JavaScript exceptions and rethrow Haskell ones

32rethrow :: (JSValueRefRef -> JSM a) -> JSM a

33−rethrow f = f `catchval` \e -> do

33+rethrow f = f `catchval` \e ->

34 liftIO . E.throwIO $ JSException e

35

src/Language/Javascript/JSaddle/Monad.hs+1−1

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

70catchval :: (JSValueRefRef -> JSM a) -> (JSValueRef -> JSM a) -> JSM a

71catchval f catcher = do

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

73− pexc <- liftIO $ newArray

73+ pexc <- liftIO newArray

74 result <- f pexc

75 exc <- liftIO $ indexArray 0 pexc

76 if isUndefined exc || isNull exc

src/Language/Javascript/JSaddle/Object.hs+4−4

@@ -362,17 +362,17 @@ function = undefined

362-- a name.

363instance MakeValueRef JSCallAsFunction where

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

365− makeValueRef = function (nullRef::JSStringRef)

365+ makeValueRef = function (nullRef:: JSStringRef)

366#else

367− makeValueRef = function (nullPtr::JSStringRef)

367+ makeValueRef = function (nullPtr:: JSStringRef)

368#endif

369

370instance MakeArgRefs JSCallAsFunction where

371 makeArgRefs f = do

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

373− rarg <- function (nullRef::JSStringRef) f

373+ rarg <- function (nullRef:: JSStringRef) f

374#else

375− rarg <- function (nullPtr::JSStringRef) f

375+ rarg <- function (nullPtr:: JSStringRef) f

376#endif

377 return [rarg]

378