feat: PrettySerialize instances

This commit is contained in:
vegowotenks 2025-08-21 20:08:51 +02:00
parent cabfbf46ac
commit 55805ef15a
7 changed files with 21 additions and 3 deletions

3
.gitmodules vendored Normal file
View file

@ -0,0 +1,3 @@
[submodule "3rdparty/pretty-parse"]
path = 3rdparty/pretty-parse
url = https://git.jossco.de/vegowotenks/pretty-parse

1
3rdparty/pretty-parse vendored Submodule

@ -0,0 +1 @@
Subproject commit 5e91f4b67e2588b6f0b9a94c7d03608aad0eb41a

View file

@ -31,6 +31,7 @@ library
array
, base >=4.7 && <5
, containers
, pretty-parse
, text
default-language: Haskell2010
@ -46,6 +47,7 @@ executable hon-exe
, base >=4.7 && <5
, containers
, hon
, pretty-parse
, text
default-language: Haskell2010
@ -62,5 +64,6 @@ test-suite hon-test
, base >=4.7 && <5
, containers
, hon
, pretty-parse
, text
default-language: Haskell2010

View file

@ -23,6 +23,7 @@ dependencies:
- base >= 4.7 && < 5
- containers
- text
- pretty-parse
ghc-options:
- -Wall

View file

@ -1,6 +1,8 @@
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE TypeApplications #-}
{-# LANGUAGE DerivingVia #-}
{-# LANGUAGE DeriveGeneric #-}
module Language.Json (Value(..), null, true, false, boolean, buildInteger, number, document) where
import Data.Text (Text)
import Data.Array.IArray (Array)
@ -21,6 +23,8 @@ import qualified Data.Text.Internal.Read as Text
import qualified Debug.Trace as Debug
import qualified Data.Array.IArray as Array
import qualified Data.Map.Strict as Map
import GHC.Generics ( Generic, Generically(..) )
import Pretty.Serialize (PrettySerialize)
data Value
@ -30,7 +34,8 @@ data Value
| Number Rational
| Array (Array Natural Value)
| Object (Map Text Value)
deriving Show
deriving (Show, Generic)
deriving PrettySerialize via Generically Value
null :: Parser Value
null = do

View file

@ -1,6 +1,7 @@
{-# LANGUAGE DerivingStrategies #-}
{-# LANGUAGE InstanceSigs #-}
{-# LANGUAGE LambdaCase #-}
{-# LANGUAGE DerivingVia #-}
{-# LANGUAGE DeriveGeneric #-}
module Language.Json.Type (infer) where
import Data.Map.Strict (Map)
import Data.Text (Text)
@ -10,6 +11,8 @@ import qualified Data.Map.Merge.Strict as Map
import qualified Language.Json as Json
import qualified Language.Json as Value
import qualified Data.Foldable as Foldable
import GHC.Generics (Generic, Generically(..))
import Pretty.Serialize (PrettySerialize)
data Type
= Null
@ -20,7 +23,8 @@ data Type
| Array Type
| Union (Set Type) -- multiple types are allowed here
| Object (Map Text Type)
deriving stock (Show, Ord, Eq)
deriving stock (Show, Ord, Eq, Generic)
deriving PrettySerialize via Generically Type
instance Semigroup Type where
(<>) :: Type -> Type -> Type

View file

@ -32,6 +32,7 @@ compiler: ghc-9.12.1
# - wai
packages:
- .
- 3rdparty/pretty-parse
# Dependency packages to be pulled from upstream that are not in the snapshot.
# These entries can reference officially published versions as well as
# forks / in-progress versions pinned to a git hash. For example: