removed DerivingVia

Author: goodlyrottenapple

.github/workflows/cabal.yml

@@ -20,6 +20,8 @@ jobs:
     strategy:
       matrix:
         plan:
+          - { ghc: "8.2.2", cabal: "2.0.1" }
+          - { ghc: "8.4.4", cabal: "2.2.0.1" }
           - { ghc: "8.6.5", cabal: "2.4.0.1" }
           - { ghc: "8.8.3", cabal: "3.0.1" }
           - { ghc: "8.10.1", cabal: "3.2" }

quickjs-hs.cabal

@@ -1,6 +1,6 @@
 cabal-version:  1.12
 name:           quickjs-hs
-version:        0.1
+version:        0.1.2
 homepage:       https://github.com/goodlyrottenapple/quickjs-hs#readme
 bug-reports:    https://github.com/goodlyrottenapple/quickjs-hs/issues
 author:         Sam Balco
@@ -48,41 +48,48 @@ library
     , vector               >=0.12  && <0.13
   default-language: Haskell2010
   include-dirs: quickjs
-  -- Order matters for dynamic linking, see GHC#12152.
-  -- To make both `cabal repl` and `stack ghci` work, we have to
-  -- make "a.cpp" come alphabetically before "main.cpp".
   c-sources: 
       quickjs/cutils.c
     , quickjs/libbf.c
-    , quickjs/libregexp.c
     , quickjs/libunicode.c
+    , quickjs/libregexp.c
     , quickjs/quickjs.h
     , quickjs/quickjs.c
     , quickjs/quickjs-libc.h
     , quickjs/quickjs-libc.c
+  includes: 
+      quickjs/cutils.h
+    , quickjs/libbf.h
+    , quickjs/libunicode-table.h
+    , quickjs/libunicode.h
+    , quickjs/libregexp-opcode.h
+    , quickjs/libregexp.h
+    , quickjs/list.h
+    , quickjs/quickjs-atom.h
+    , quickjs/quickjs-opcode.h
   cc-options: 
     -static -D_GNU_SOURCE 
     -DCONFIG_VERSION="2020-07-05"
     -DCONFIG_BIGNUM
 
 test-suite quickjs-hs-test
-    type:             exitcode-stdio-1.0
-    main-is:          Spec.hs
-    hs-source-dirs:   test
-    other-modules:    Paths_quickjs_hs
-    default-language: Haskell2010
-    ghc-options:      -threaded -rtsopts -with-rtsopts=-N
-    build-depends:
-        base
-      , quickjs-hs           -any
-      , aeson
-      , exceptions
-      , HUnit                >=1.6.0.0  && <1.7
-      , QuickCheck           >=2.9  && <2.14
-      , tasty                >=1.0  && <1.3
-      , tasty-hunit          >=0.10 && <0.11
-      , tasty-quickcheck     >=0.9  && <0.11
-      , text
-      , unordered-containers
-      , vector
+  type:             exitcode-stdio-1.0
+  main-is:          Spec.hs
+  hs-source-dirs:   test
+  other-modules:    Paths_quickjs_hs
+  default-language: Haskell2010
+  ghc-options:      -threaded -rtsopts -with-rtsopts=-N
+  build-depends:
+      base
+    , quickjs-hs           -any
+    , aeson
+    , exceptions
+    , HUnit                >=1.6.0.0  && <1.7
+    , QuickCheck           >=2.9  && <2.14
+    , tasty                >=1.0  && <1.3
+    , tasty-hunit          >=0.10 && <0.11
+    , tasty-quickcheck     >=0.9  && <0.11
+    , text
+    , unordered-containers
+    , vector
 

src/Quickjs/Error.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE ExistentialQuantification, DuplicateRecordFields, GeneralizedNewtypeDeriving, DerivingStrategies, DeriveGeneric, DerivingVia, RecordWildCards #-}
+{-# LANGUAGE ExistentialQuantification, DuplicateRecordFields, GeneralizedNewtypeDeriving, DerivingStrategies, DeriveGeneric, RecordWildCards #-}
 
 module Quickjs.Error where
 import           Control.Exception   (Exception(..), SomeException)
@@ -32,40 +32,40 @@ jsRuntimeExceptionFromException x = do
     cast a
 
 
-newtype JSRuntimeException e = JSRuntimeException e 
-  deriving Generic
-  deriving newtype Show
-
-instance (Show e, Typeable e) => Exception (JSRuntimeException e)
-  where
-    toException = jsRuntimeExceptionToException
-    fromException = jsRuntimeExceptionFromException
-
-
 
 instance ToJSON CLong where
   toJSON cl = toJSON (fromIntegral cl :: Integer)
 
 data UnknownJSTag = UnknownJSTag {raw_tag :: !CLong} 
   deriving (Generic, Typeable)
-  deriving Exception via (JSRuntimeException UnknownJSTag)
+
+instance Exception UnknownJSTag where
+  toException   = jsRuntimeExceptionToException
+  fromException = jsRuntimeExceptionFromException
+
 
 instance Show UnknownJSTag where
   show UnknownJSTag{..} = "Uknown JS tag: " ++ show raw_tag
 
 
 data UnsupportedTypeTag = UnsupportedTypeTag {_tag :: JSTagEnum} 
   deriving (Generic, Typeable)
-  deriving Exception via (JSRuntimeException UnsupportedTypeTag)
 
+instance Exception UnsupportedTypeTag where
+  toException   = jsRuntimeExceptionToException
+  fromException = jsRuntimeExceptionFromException
 
 instance Show UnsupportedTypeTag where
   show UnsupportedTypeTag{..} = "Unsupported type tag: " ++ show _tag
 
 
 data JSException = JSException {location :: Text, message :: Text} 
   deriving (Generic, Typeable)
-  deriving Exception via (JSRuntimeException JSException)
+
+instance Exception JSException where
+  toException   = jsRuntimeExceptionToException
+  fromException = jsRuntimeExceptionFromException
+
 
 instance Show JSException where
     show JSException{..} = "JS runtime threw an exception in " ++ toS location ++ ":\n=================\n" ++ toS message ++ "\n=================\n"
@@ -74,7 +74,11 @@ instance Show JSException where
 
 data JSValueUndefined = JSValueUndefined {value :: Text} 
   deriving (Generic, Typeable)
-  deriving Exception via (JSRuntimeException JSValueUndefined)
+
+instance Exception JSValueUndefined where
+  toException   = jsRuntimeExceptionToException
+  fromException = jsRuntimeExceptionFromException
+
 
 instance Show JSValueUndefined where
   show JSValueUndefined{..} =  "The JS value '" ++ toS value ++ "' is undefined."
@@ -87,15 +91,22 @@ data JSValueIncorrectType =
   , found :: JSTypeEnum
   } 
   deriving (Generic, Typeable)
-  deriving Exception via (JSRuntimeException JSValueIncorrectType)
+
+instance Exception JSValueIncorrectType where
+  toException   = jsRuntimeExceptionToException
+  fromException = jsRuntimeExceptionFromException
+
 
 instance Show JSValueIncorrectType where
   show JSValueIncorrectType{..} = "Type mismatch of the JS value '" ++ toS name ++ "'. Expected: " ++ show expected ++ ", found: " ++ show found
 
 
 data InternalError = InternalError { message :: Text } 
   deriving (Generic, Typeable)
-  deriving Exception via (JSRuntimeException InternalError)
+
+instance Exception InternalError where
+  toException   = jsRuntimeExceptionToException
+  fromException = jsRuntimeExceptionFromException
 
 instance Show InternalError where
   show InternalError{..} = "Internal error occured:\n" ++ toS message