8132345 · jsaddle · git.iko.soy

git.iko.soy/jsaddle

Fix tests

commit8132345cd99058d333fb204d00cf760809a06e58 authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateThu 15 Dec 2016, 21:04 (10 years ago) parent5378295

13 files changed+38−28

compare with master

unifiedsplit

jsaddle-warp/jsaddle-warp.cabal+2−2 jsaddle-warp/tests/DocTest.hs+9−2 jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal+2−2 jsaddle-webkitgtk/jsaddle-webkitgtk.cabal+2−2 jsaddle-wkwebview/jsaddle-wkwebview.cabal+2−2 jsaddle/src-ghc/Data/JSString.hs+1 jsaddle/src-ghc/Data/JSString/Internal/Fusion.hs+5−5 jsaddle/src-ghc/Data/JSString/Internal/Fusion/Types.hs+1−1 jsaddle/src-ghc/Data/JSString/Internal/Type.hs+1−1 jsaddle/src-ghc/GHCJS/Prim.hs+7−8 jsaddle/src-ghc/GHCJS/Prim/Internal.hs+5 jsaddle/src/Language/Javascript/JSaddle/Object.hs+1 jsaddle/src/Language/Javascript/JSaddle/Types.hs−3

jsaddle-warp/jsaddle-warp.cabal+2−2

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

11name: jsaddle-warp

2−version: 0.7.1.0

2+version: 0.8.0.0

33cabal-version: >=1.10

44build-type: Simple

55license: MIT

@@ -27,7 +27,7 @@ library

2727 aeson >=0.8.0.2 && <1.1,

2828 containers >=0.5.6.2 && <0.6,

2929 http-types >=0.8.6 && <0.10,

30− jsaddle >=0.7.0.0 && <0.8,

30+ jsaddle >=0.8.0.0 && <0.9,

3131 stm >=2.4.4 && <2.5,

3232 text >=1.2.1.3 && <1.3,

3333 time >=1.5.0.1 && <1.7,

jsaddle-warp/tests/DocTest.hs+9−2

@@ -63,19 +63,26 @@ main = do

6363 "-i" <> jsaddlePath </> "jsaddle-warp/src-ghc",

6464 jsaddlePath </> "jsaddle-warp/src/Language/Javascript/JSaddle/Test.hs",

6565 "-i" <> jsaddlePath </> "jsaddle",

66+ jsaddlePath </> "jsaddle/src-ghc/Data/JSString/Text.hs",

67+ jsaddlePath </> "jsaddle/src-ghc/Data/JSString/Internal/Type.hs",

68+ jsaddlePath </> "jsaddle/src-ghc/GHCJS/Foreign.hs",

69+ jsaddlePath </> "jsaddle/src-ghc/GHCJS/Foreign/Internal.hs",

70+ jsaddlePath </> "jsaddle/src-ghc/GHCJS/Internal/Types.hs",

6671 jsaddlePath </> "jsaddle/src-ghc/GHCJS/Marshal.hs",

6772 jsaddlePath </> "jsaddle/src-ghc/GHCJS/Marshal/Pure.hs",

6873 jsaddlePath </> "jsaddle/src-ghc/GHCJS/Marshal/Internal.hs",

74+ jsaddlePath </> "jsaddle/src-ghc/GHCJS/Prim.hs",

75+ jsaddlePath </> "jsaddle/src-ghc/GHCJS/Prim/Internal.hs",

76+ jsaddlePath </> "jsaddle/src-ghc/GHCJS/Types.hs",

77+ jsaddlePath </> "jsaddle/src-ghc/JavaScript/Array.hs",

6978 jsaddlePath </> "jsaddle/src-ghc/JavaScript/Array/Internal.hs",

7079 jsaddlePath </> "jsaddle/src-ghc/JavaScript/Object/Internal.hs",

7180 jsaddlePath </> "jsaddle/src/Language/Javascript/JSaddle.hs",

72− jsaddlePath </> "jsaddle/src/Language/Javascript/JSaddle/Array.hs",

7381 jsaddlePath </> "jsaddle/src/Language/Javascript/JSaddle/Arguments.hs",

7482 jsaddlePath </> "jsaddle/src/Language/Javascript/JSaddle/Classes.hs",

7583 jsaddlePath </> "jsaddle/src/Language/Javascript/JSaddle/Classes/Internal.hs",

7684 jsaddlePath </> "jsaddle/src/Language/Javascript/JSaddle/Evaluate.hs",

7785 jsaddlePath </> "jsaddle/src/Language/Javascript/JSaddle/Exception.hs",

78− jsaddlePath </> "jsaddle/src/Language/Javascript/JSaddle/Foreign.hs",

7986 jsaddlePath </> "jsaddle/src/Language/Javascript/JSaddle/Monad.hs",

8087 jsaddlePath </> "jsaddle/src/Language/Javascript/JSaddle/Marshal/String.hs",

8188 jsaddlePath </> "jsaddle/src/Language/Javascript/JSaddle/Native.hs",

jsaddle-webkit2gtk/jsaddle-webkit2gtk.cabal+2−2

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

11name: jsaddle-webkit2gtk

2−version: 0.7.1.0

2+version: 0.8.0.0

33cabal-version: >=1.10

44build-type: Simple

55license: MIT

@@ -32,7 +32,7 @@ library

3232 gi-webkit2 >=4.0.6 && <4.1,

3333 gi-javascriptcore >=4.0.6 && <4.1,

3434 haskell-gi-base >=0.20 && <0.21,

35− jsaddle >=0.7.0.0 && <0.8,

35+ jsaddle >=0.8.0.0 && <0.9,

3636 text >=1.2.1.3 && <1.3,

3737 unix >=2.3.1.0 && <2.8,

3838 webkit2gtk3-javascriptcore >=0.14.0.0 && <0.15

jsaddle-webkitgtk/jsaddle-webkitgtk.cabal+2−2

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

11name: jsaddle-webkitgtk

2−version: 0.7.1.0

2+version: 0.8.0.0

33cabal-version: >=1.10

44build-type: Simple

55license: MIT

@@ -31,7 +31,7 @@ library

3131 gi-webkit >=3.0.6 && <3.1,

3232 gi-javascriptcore >=3.0.6 && <3.1,

3333 haskell-gi-base >=0.20 && <0.21,

34− jsaddle >=0.7.0.0 && <0.8,

34+ jsaddle >=0.8.0.0 && <0.9,

3535 text >=1.2.1.3 && <1.3,

3636 unix >=2.3.1.0 && <2.8,

3737 webkitgtk3-javascriptcore >=0.14.0.0 && <0.15

jsaddle-wkwebview/jsaddle-wkwebview.cabal+2−2

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

11name: jsaddle-wkwebview

2−version: 0.7.0.0

2+version: 0.8.0.0

33cabal-version: >=1.10

44build-type: Simple

55license: MIT

@@ -25,7 +25,7 @@ library

2525 aeson >=0.8.0.2 && <1.1,

2626 base <5,

2727 bytestring >=0.10.6.0 && <0.11,

28− jsaddle >= 0.7.0.0 && <0.8

28+ jsaddle >= 0.8.0.0 && <0.9

2929 default-language: Haskell2010

3030 hs-source-dirs: src

3131 ghc-options: -ferror-spans -Wall

jsaddle/src-ghc/Data/JSString.hs+1

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

11{-# LANGUAGE MagicHash, BangPatterns, UnboxedTuples, TypeFamilies

22 #-}

3+{-# OPTIONS_GHC -Wno-orphans #-}

34{-| Manipulation of JavaScript strings, API and fusion implementation

45 based on Data.Text by Tom Harper, Duncan Coutts, Bryan O'Sullivan e.a.

56 -}

jsaddle/src-ghc/Data/JSString/Internal/Fusion.hs+5−5

@@ -30,21 +30,21 @@ module Data.JSString.Internal.Fusion ( -- * Types

3030 , countChar

3131 ) where

3232

33−import GHC.Exts (Char(..), Int(..), chr#, Int#, isTrue#, (-#), (+#), (>=#))

33+--import GHC.Exts (Char(..), Int(..), chr#, Int#, isTrue#, (-#), (+#), (>=#))

3434

3535import Prelude hiding (length, reverse)

3636import qualified Data.Text.Internal.Fusion as T

37−import Data.Char

37+--import Data.Char

3838import Data.Coerce (coerce)

3939

4040import Data.JSString.Internal.Type (JSString(..))

41−import qualified Data.JSString.Internal.Type as I

41+--import qualified Data.JSString.Internal.Type as I

4242import Data.JSString.Internal.Fusion.Types

4343import qualified Data.JSString.Internal.Fusion.Common as S

4444

45−import System.IO.Unsafe

45+--import System.IO.Unsafe

4646

47−import GHCJS.Prim

47+--import GHCJS.Prim

4848

4949default (Int)

5050

jsaddle/src-ghc/Data/JSString/Internal/Fusion/Types.hs+1−1

@@ -32,7 +32,7 @@ module Data.JSString.Internal.Fusion.Types

3232

3333import Data.Text.Internal.Fusion.Types

3434-- import Data.Text.Internal.Fusion.Size

35−import Data.Word (Word8)

35+-- import Data.Word (Word8)

3636

3737---- | Specialised tuple for case conversion.

3838--data CC s = CC !s {-# UNPACK #-} !Char {-# UNPACK #-} !Char

jsaddle/src-ghc/Data/JSString/Internal/Type.hs+1−1

@@ -43,7 +43,7 @@ import GHC.Exts (Char(..), ord#, andI#, (/=#), isTrue#)

4343-- | A wrapper around a JavaScript string

4444newtype JSString = JSString Text deriving(Show, Read, IsString, Monoid, Ord, Eq, Data, ToJSON, FromJSON, Typeable)

4545

46−instance NFData JSString where rnf !x = ()

46+instance NFData JSString where rnf !_ = ()

4747

4848-- | /O(1)/ The empty 'JSString'.

4949empty :: JSString

jsaddle/src-ghc/GHCJS/Prim.hs+7−8

@@ -7,21 +7,20 @@ module GHCJS.Prim ( module GHCJS.Prim.Internal

77 , toJSString

88 , isNull

99 , isUndefined

10− , jsNull

1110 ) where

1211

1312import GHCJS.Prim.Internal

14−import Data.Int (Int64)

15−import Data.Typeable (Typeable)

16−import Unsafe.Coerce (unsafeCoerce)

13+--import Data.Int (Int64)

14+--import Data.Typeable (Typeable)

15+--import Unsafe.Coerce (unsafeCoerce)

1716

18−import Data.Aeson (ToJSON(..), FromJSON(..))

17+--import Data.Aeson (ToJSON(..), FromJSON(..))

1918import qualified Data.Text as T (unpack, pack)

2019import Data.JSString.Text (textFromJSVal)

2120

22−import GHC.Prim

23−import qualified GHC.Exception as Ex

24−import qualified GHC.Exts as Exts

21+--import GHC.Prim

22+--import qualified GHC.Exception as Ex

23+--import qualified GHC.Exts as Exts

2524

2625import Language.Javascript.JSaddle.Types (JSVal(..), JSString(..), GHCJSPure(..), ghcjsPureMap)

2726import qualified Language.Javascript.JSaddle.Native.Internal as N

jsaddle/src-ghc/GHCJS/Prim/Internal.hs+5

@@ -9,6 +9,7 @@ module GHCJS.Prim.Internal ( JSVal(..)

99 , jsNull

1010 ) where

1111

12+import Control.DeepSeq (NFData(..))

1213import Data.Int (Int64)

1314import Data.Typeable (Typeable)

1415import Unsafe.Coerce (unsafeCoerce)

@@ -26,6 +27,10 @@ type JSValueRef = Int64

2627-}

2728newtype JSVal = JSVal JSValueRef deriving(Show, ToJSON, FromJSON)

2829

30+instance NFData JSVal where

31+ rnf x = x `seq` ()

32+

33+

2934{-

3035 When a JavaScript exception is raised inside

3136 a safe or interruptible foreign call, it is converted

jsaddle/src/Language/Javascript/JSaddle/Object.hs+1

@@ -277,6 +277,7 @@ jsgf name = global # name

277277-- > jsg0 name = jsgf name ()

278278--

279279-- >>> testJSaddle $ jsg0 "globalFunc" >>= valToText

280+-- A JavaScript exception was thrown! (may not reach Haskell code)

280281-- TypeError:...undefine...

281282jsg0 :: (ToJSString name) => name -> JSM JSVal

282283jsg0 name = jsgf name ()

jsaddle/src/Language/Javascript/JSaddle/Types.hs−3

@@ -230,9 +230,6 @@ type JSCallAsFunction = JSVal -- ^ Function object

230230

231231#ifndef ghcjs_HOST_OS

232232

233−instance NFData JSVal where

234− rnf x = x `seq` ()

235−

236233class IsJSVal a where

237234 jsval_ :: a -> GHCJSPure JSVal

238235