diff --git a/jsaddle/src-ghc/GHCJS/Marshal/Internal.hs b/jsaddle/src-ghc/GHCJS/Marshal/Internal.hs index 9ed2e310..63265c9a 100644 --- a/jsaddle/src-ghc/GHCJS/Marshal/Internal.hs +++ b/jsaddle/src-ghc/GHCJS/Marshal/Internal.hs @@ -34,7 +34,7 @@ import qualified Data.JSString.Internal.Type as JSS import qualified JavaScript.Object.Internal as OI (Object(..), create, setProp, getProp) import qualified JavaScript.Array.Internal as AI (SomeJSArray(..), create, push, read, fromListIO, toListIO) -import Language.Javascript.JSaddle.Types (JSM, MutableJSArray, GHCJSPure(..), ghcjsPure, ghcjsPureMap, JSadddleHasCallStack) +import Language.Javascript.JSaddle.Types (JSM, MutableJSArray, GHCJSPure(..), ghcjsPure, ghcjsPureMap, JSaddleHasCallStack) import Language.Javascript.JSaddle.String (textToStr) data Purity = PureShared -- ^ conversion is pure even if the original value is shared @@ -61,7 +61,7 @@ class ToJSVal a where default toJSVal :: (Generic a, GToJSVal (Rep a ())) => a -> JSM JSVal toJSVal = toJSVal_generic id -fromJustWithStack :: JSadddleHasCallStack => Maybe a -> a +fromJustWithStack :: JSaddleHasCallStack => Maybe a -> a fromJustWithStack Nothing = error "fromJSValUnchecked: fromJSVal result was Nothing" fromJustWithStack (Just x) = x @@ -69,7 +69,7 @@ class FromJSVal a where fromJSVal :: JSVal -> JSM (Maybe a) #if MIN_VERSION_base(4,9,0) && defined(JSADDLE_HAS_CALL_STACK) - fromJSValUnchecked :: JSadddleHasCallStack => JSVal -> JSM a + fromJSValUnchecked :: JSaddleHasCallStack => JSVal -> JSM a #ifdef CHECK_UNCHECKED fromJSValUnchecked v = fromJSVal v >>= \case Nothing -> error "fromJSValUnchecked: fromJSVal result was Nothing" @@ -87,7 +87,7 @@ class FromJSVal a where fromJSValListOf = fmap sequence . (mapM fromJSVal <=< AI.toListIO . coerce) -- fixme should check that it's an array #if MIN_VERSION_base(4,9,0) && defined(JSADDLE_HAS_CALL_STACK) - fromJSValUncheckedListOf :: JSadddleHasCallStack => JSVal -> JSM [a] + fromJSValUncheckedListOf :: JSaddleHasCallStack => JSVal -> JSM [a] #else fromJSValUncheckedListOf :: JSVal -> JSM [a] #endif diff --git a/jsaddle/src/Language/Javascript/JSaddle/Types.hs b/jsaddle/src/Language/Javascript/JSaddle/Types.hs index 9d30881e..a03ad6bc 100644 --- a/jsaddle/src/Language/Javascript/JSaddle/Types.hs +++ b/jsaddle/src/Language/Javascript/JSaddle/Types.hs @@ -57,7 +57,7 @@ module Language.Javascript.JSaddle.Types ( , JSCallAsFunction -- * Debugging - , JSadddleHasCallStack + , JSaddleHasCallStack -- * Sync JSM , syncPoint @@ -517,9 +517,9 @@ instance FromJSON Results -- | Like HasCallStack, but only when jsaddle cabal flag check-unchecked is set #if MIN_VERSION_base(4,9,0) && defined(CHECK_UNCHECKED) -type JSadddleHasCallStack = HasCallStack +type JSaddleHasCallStack = HasCallStack #else -type JSadddleHasCallStack = (() :: Constraint) +type JSaddleHasCallStack = (() :: Constraint) #endif