diff options
Diffstat (limited to 'src/Language/Fiddle/GenericTree.hs')
-rw-r--r-- | src/Language/Fiddle/GenericTree.hs | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/src/Language/Fiddle/GenericTree.hs b/src/Language/Fiddle/GenericTree.hs index 95a730a..f0ac96a 100644 --- a/src/Language/Fiddle/GenericTree.hs +++ b/src/Language/Fiddle/GenericTree.hs @@ -10,14 +10,9 @@ module Language.Fiddle.GenericTree where -import Control.Monad.Writer (execWriter, tell) -import Data.Aeson (Value (..), foldable, object, toEncoding, toJSON) import Data.Aeson.Encoding (text) import Data.Aeson.Types as Aeson import Data.Foldable (Foldable (toList)) -import qualified Data.Foldable -import Data.Functor.Classes (Show1, liftShowsPrec) -import Data.Kind (Type) import Data.Proxy import qualified Data.Text import Data.Typeable @@ -26,8 +21,6 @@ import GHC.Generics import GHC.TypeLits (KnownSymbol, symbolVal) import Language.Fiddle.Ast import Language.Fiddle.Types -import Text.Parsec.Pos -import Text.Printf (printf) type Context stage = ( Show (NumberType stage), @@ -61,11 +54,11 @@ alterGenericSyntaxTree fn genericTree | (Just newGenericTree) <- fn genericTree = newGenericTree | otherwise = case genericTree of - SyntaxTreeObject str members annot tree -> + SyntaxTreeObject str members a tree -> SyntaxTreeObject str (map (alterGenericSyntaxTree fn) members) - annot + a tree SyntaxTreeList members -> SyntaxTreeList $ map (alterGenericSyntaxTree fn) members @@ -81,18 +74,6 @@ instance (ToJSON a) => ToJSON (Commented a) where toJSON (Commented comment a) = object ["comment" .= comment, "annot" .= a] --- instance ToJSON SourceSpan where --- toJSON (SourceSpan start end) = --- object ["start" .= toJSON start, "end" .= toJSON end] --- --- instance ToJSON SourcePos where --- toJSON sourcePos = --- object --- [ "name" .= sourceName sourcePos, --- "row" .= sourceLine sourcePos, --- "col" .= sourceColumn sourcePos --- ] - instance (Foldable f) => ToJSON (GenericSyntaxTree f (Maybe Value)) where toJSON = \case (SyntaxTreeObject typ membs Nothing _) -> |