From ef9b24a59b7812f4bf69ef7c2581b97286b18420 Mon Sep 17 00:00:00 2001 From: John Ky Date: Sun, 10 Nov 2024 04:15:58 +1100 Subject: [PATCH] Re-organise directories --- {app => apps/succinct-json}/App/Commands.hs | 0 .../succinct-json}/App/Commands/Count.hs | 0 .../succinct-json}/App/Commands/CountAeson.hs | 0 .../App/Commands/CreateIndex.hs | 0 .../succinct-json}/App/Commands/Demo.hs | 0 .../succinct-json}/App/Commands/Types.hs | 0 {app => apps/succinct-json}/Main.hs | 0 {bench => benchmarks/json}/Main.hs | 0 cabal.project | 2 +- corpus/{ => json}/5000B.json | 0 corpus/{ => json}/5000B.json.bp.idx | 0 corpus/{ => json}/5000B.json.ib.idx | 0 corpus/{ => json}/issue-0001.json | 0 corpus/{ => json}/issue-0001.json.bp.idx | 0 corpus/{ => json}/issue-0001.json.ib.idx | 0 corpus/{ => json}/issue-0001.md | 0 demo/.vscode/tasks.json | 143 ------------------ {demo => demos}/.stylish-haskell.yaml | 0 {demo => demos}/LICENSE | 0 {demo => demos}/README.md | 0 {demo => demos}/cabal.project | 0 {demo => demos}/project.sh | 0 {demo => demos}/succinct-demo.cabal | 0 doctest/DoctestDriver.hs | 2 +- examples/{ => json}/Example1.hs | 0 examples/{ => json}/Example2.hs | 0 examples/{ => json}/Example3.hs | 0 examples/{ => json}/Example4.hs | 0 .../HaskellWorks/Data/Json/DecodeError.hs | 0 .../json}/HaskellWorks/Data/Json/FromValue.hs | 0 .../Data/Json/Internal/CharLike.hs | 0 .../HaskellWorks/Data/Json/Internal/Doc.hs | 0 .../HaskellWorks/Data/Json/Internal/Index.hs | 0 .../Data/Json/Internal/PartialIndex.hs | 0 .../HaskellWorks/Data/Json/Internal/Slurp.hs | 0 .../Json/Internal/Standard/Cursor/Token.hs | 0 .../Json/Internal/Standard/Token/Tokenize.hs | 0 .../HaskellWorks/Data/Json/Internal/Token.hs | 0 .../Data/Json/Internal/Token/Types.hs | 0 .../HaskellWorks/Data/Json/Internal/Value.hs | 0 .../HaskellWorks/Data/Json/Internal/Word64.hs | 0 .../json}/HaskellWorks/Data/Json/LightJson.hs | 0 .../HaskellWorks/Data/Json/PartialValue.hs | 0 .../json}/HaskellWorks/Data/Json/Query.hs | 0 .../HaskellWorks/Data/Json/Simple/Value.hs | 0 .../Data/Json/Standard/Load/Partial.hs | 0 .../json}/HaskellWorks/Data/Json/Value.hs | 0 succinct.cabal | 40 ++--- .../json/Data/Succinct}/Json/LightJsonSpec.hs | 2 +- .../Data/Succinct}/Json/Simple/CursorSpec.hs | 2 +- .../Succinct}/Json/Standard/CursorSpec.hs | 4 +- .../Succinct}/Json/Standard/GenCursorTest.hs | 2 +- .../Data/Succinct}/Json/Token/TokenizeSpec.hs | 2 +- .../json/Data/Succinct}/Json/TypeSpec.hs | 2 +- .../json/Data/Succinct}/Json/ValueSpec.hs | 2 +- {test => tests/json}/Spec.hs | 0 56 files changed, 30 insertions(+), 173 deletions(-) rename {app => apps/succinct-json}/App/Commands.hs (100%) rename {app => apps/succinct-json}/App/Commands/Count.hs (100%) rename {app => apps/succinct-json}/App/Commands/CountAeson.hs (100%) rename {app => apps/succinct-json}/App/Commands/CreateIndex.hs (100%) rename {app => apps/succinct-json}/App/Commands/Demo.hs (100%) rename {app => apps/succinct-json}/App/Commands/Types.hs (100%) rename {app => apps/succinct-json}/Main.hs (100%) rename {bench => benchmarks/json}/Main.hs (100%) rename corpus/{ => json}/5000B.json (100%) rename corpus/{ => json}/5000B.json.bp.idx (100%) rename corpus/{ => json}/5000B.json.ib.idx (100%) rename corpus/{ => json}/issue-0001.json (100%) rename corpus/{ => json}/issue-0001.json.bp.idx (100%) rename corpus/{ => json}/issue-0001.json.ib.idx (100%) rename corpus/{ => json}/issue-0001.md (100%) delete mode 100644 demo/.vscode/tasks.json rename {demo => demos}/.stylish-haskell.yaml (100%) rename {demo => demos}/LICENSE (100%) rename {demo => demos}/README.md (100%) rename {demo => demos}/cabal.project (100%) rename {demo => demos}/project.sh (100%) rename {demo => demos}/succinct-demo.cabal (100%) rename examples/{ => json}/Example1.hs (100%) rename examples/{ => json}/Example2.hs (100%) rename examples/{ => json}/Example3.hs (100%) rename examples/{ => json}/Example4.hs (100%) rename {src => libs/json}/HaskellWorks/Data/Json/DecodeError.hs (100%) rename {src => libs/json}/HaskellWorks/Data/Json/FromValue.hs (100%) rename {src => libs/json}/HaskellWorks/Data/Json/Internal/CharLike.hs (100%) rename {src => libs/json}/HaskellWorks/Data/Json/Internal/Doc.hs (100%) rename {src => libs/json}/HaskellWorks/Data/Json/Internal/Index.hs (100%) rename {src => libs/json}/HaskellWorks/Data/Json/Internal/PartialIndex.hs (100%) rename {src => libs/json}/HaskellWorks/Data/Json/Internal/Slurp.hs (100%) rename {src => libs/json}/HaskellWorks/Data/Json/Internal/Standard/Cursor/Token.hs (100%) rename {src => libs/json}/HaskellWorks/Data/Json/Internal/Standard/Token/Tokenize.hs (100%) rename {src => libs/json}/HaskellWorks/Data/Json/Internal/Token.hs (100%) rename {src => libs/json}/HaskellWorks/Data/Json/Internal/Token/Types.hs (100%) rename {src => libs/json}/HaskellWorks/Data/Json/Internal/Value.hs (100%) rename {src => libs/json}/HaskellWorks/Data/Json/Internal/Word64.hs (100%) rename {src => libs/json}/HaskellWorks/Data/Json/LightJson.hs (100%) rename {src => libs/json}/HaskellWorks/Data/Json/PartialValue.hs (100%) rename {src => libs/json}/HaskellWorks/Data/Json/Query.hs (100%) rename {src => libs/json}/HaskellWorks/Data/Json/Simple/Value.hs (100%) rename {src => libs/json}/HaskellWorks/Data/Json/Standard/Load/Partial.hs (100%) rename {src => libs/json}/HaskellWorks/Data/Json/Value.hs (100%) rename {test/HaskellWorks/Data => tests/json/Data/Succinct}/Json/LightJsonSpec.hs (99%) rename {test/HaskellWorks/Data => tests/json/Data/Succinct}/Json/Simple/CursorSpec.hs (98%) rename {test/HaskellWorks/Data => tests/json/Data/Succinct}/Json/Standard/CursorSpec.hs (86%) rename {test/HaskellWorks/Data => tests/json/Data/Succinct}/Json/Standard/GenCursorTest.hs (98%) rename {test/HaskellWorks/Data => tests/json/Data/Succinct}/Json/Token/TokenizeSpec.hs (97%) rename {test/HaskellWorks/Data => tests/json/Data/Succinct}/Json/TypeSpec.hs (99%) rename {test/HaskellWorks/Data => tests/json/Data/Succinct}/Json/ValueSpec.hs (99%) rename {test => tests/json}/Spec.hs (100%) diff --git a/app/App/Commands.hs b/apps/succinct-json/App/Commands.hs similarity index 100% rename from app/App/Commands.hs rename to apps/succinct-json/App/Commands.hs diff --git a/app/App/Commands/Count.hs b/apps/succinct-json/App/Commands/Count.hs similarity index 100% rename from app/App/Commands/Count.hs rename to apps/succinct-json/App/Commands/Count.hs diff --git a/app/App/Commands/CountAeson.hs b/apps/succinct-json/App/Commands/CountAeson.hs similarity index 100% rename from app/App/Commands/CountAeson.hs rename to apps/succinct-json/App/Commands/CountAeson.hs diff --git a/app/App/Commands/CreateIndex.hs b/apps/succinct-json/App/Commands/CreateIndex.hs similarity index 100% rename from app/App/Commands/CreateIndex.hs rename to apps/succinct-json/App/Commands/CreateIndex.hs diff --git a/app/App/Commands/Demo.hs b/apps/succinct-json/App/Commands/Demo.hs similarity index 100% rename from app/App/Commands/Demo.hs rename to apps/succinct-json/App/Commands/Demo.hs diff --git a/app/App/Commands/Types.hs b/apps/succinct-json/App/Commands/Types.hs similarity index 100% rename from app/App/Commands/Types.hs rename to apps/succinct-json/App/Commands/Types.hs diff --git a/app/Main.hs b/apps/succinct-json/Main.hs similarity index 100% rename from app/Main.hs rename to apps/succinct-json/Main.hs diff --git a/bench/Main.hs b/benchmarks/json/Main.hs similarity index 100% rename from bench/Main.hs rename to benchmarks/json/Main.hs diff --git a/cabal.project b/cabal.project index 514edea..3483735 100644 --- a/cabal.project +++ b/cabal.project @@ -1,4 +1,4 @@ -packages: . demo +packages: . demos optimization: 2 diff --git a/corpus/5000B.json b/corpus/json/5000B.json similarity index 100% rename from corpus/5000B.json rename to corpus/json/5000B.json diff --git a/corpus/5000B.json.bp.idx b/corpus/json/5000B.json.bp.idx similarity index 100% rename from corpus/5000B.json.bp.idx rename to corpus/json/5000B.json.bp.idx diff --git a/corpus/5000B.json.ib.idx b/corpus/json/5000B.json.ib.idx similarity index 100% rename from corpus/5000B.json.ib.idx rename to corpus/json/5000B.json.ib.idx diff --git a/corpus/issue-0001.json b/corpus/json/issue-0001.json similarity index 100% rename from corpus/issue-0001.json rename to corpus/json/issue-0001.json diff --git a/corpus/issue-0001.json.bp.idx b/corpus/json/issue-0001.json.bp.idx similarity index 100% rename from corpus/issue-0001.json.bp.idx rename to corpus/json/issue-0001.json.bp.idx diff --git a/corpus/issue-0001.json.ib.idx b/corpus/json/issue-0001.json.ib.idx similarity index 100% rename from corpus/issue-0001.json.ib.idx rename to corpus/json/issue-0001.json.ib.idx diff --git a/corpus/issue-0001.md b/corpus/json/issue-0001.md similarity index 100% rename from corpus/issue-0001.md rename to corpus/json/issue-0001.md diff --git a/demo/.vscode/tasks.json b/demo/.vscode/tasks.json deleted file mode 100644 index 84cb457..0000000 --- a/demo/.vscode/tasks.json +++ /dev/null @@ -1,143 +0,0 @@ -{ - "version": "2.0.0", - "type": "shell", - "presentation": { - "reveal": "always", - "panel": "new" - }, - "windows": { - "command": "cmd", "args": ["/c"] - }, - "linux": { - "command": "sh", "args": ["-c"] - }, - "osx": { - "command": "sh", "args": ["-c"] - }, - "tasks": [ - { - "label": "stack build", - "group": "build", - "command": "/bin/bash", - "args": [ - "-c", - "echo START_BUILD && cd ${workspaceRoot} && ./project.sh build && echo END_BUILD " - ], - "problemMatcher": { - "owner": "haskell", - "fileLocation": "absolute", - "pattern": [ - { - "regexp": "^(.+?):(\\d+):(\\d+):\\s+(error|warning|info):.*$", - "file": 1, "line": 2, "column": 3, "severity": 4 - }, - { - "regexp": "\\s*(.*)$", - "message": 1 - } - ] - } - }, - { - "label": "stack clean & build", - "command": "/bin/bash", - "args": [ - "-c", - "echo START_CLEAN_AND_BUILD && cd ${workspaceRoot} && ./project.sh clean && ./project.sh build && echo END_CLEAN_AND_BUILD " - ], - "problemMatcher": { - "owner": "haskell", - "fileLocation": "absolute", - "pattern": [ - { - "regexp": "^(.+?):(\\d+):(\\d+):\\s+(error|warning|info):.*$", - "file": 1, "line": 2, "column": 3, "severity": 4 - }, - { - "regexp": "\\s*(.*)$", - "message": 1 - } - ] - } - }, - { - "group": "test", - "label": "stack test", - "command": "/bin/bash", - "args": [ - "-c", - "echo START_TEST && cd ${workspaceRoot} && ./project.sh test && echo END_TEST " - ], - "problemMatcher": { - "owner": "haskell", - "fileLocation": [ "relative", "${workspaceRoot}" ], - "pattern": [ - { - "regexp": "^\\s+(.+):(\\d+):.*$", - "file": 1, "line": 2 - }, - { - "regexp": "^.*\\.(.+)\\s*$", - "message": 1 - } - ] - } - }, - { - "isBackground": true, - "label": "stack watch", - "command": "/bin/bash", - "args": [ - "-c", - "echo START_WATCH && cd ${workspaceRoot} && ./project.sh build --test --no-run-tests --file-watch && echo END_WATCH " - ], - "problemMatcher": { - "owner": "haskell", - "fileLocation": "absolute", - "pattern": [ - { - "regexp": "^(.+?):(\\d+):(\\d+):\\s+(error|warning|info):.*$", - "file": 1, "line": 2, "column": 3, "severity": 4 - }, - { - "regexp": "\\s*(.*)$", - "message": 1 - } - ], - "background": { - "activeOnStart": true, - "beginsPattern": "^.*\\(local file changes:\\s", - "endsPattern": "(ExitFailure|ExitSuccess)" - } - } - }, - { - "isBackground": true, - "label": "stack watch & test", - "command": "/bin/bash", - "args": [ - "-c", - "echo START_WATCH && cd ${workspaceRoot} && ./project.sh build --test --file-watch && echo END_WATCH " - ], - "problemMatcher": { - "owner": "haskell", - "fileLocation": [ "relative", "${workspaceRoot}" ], - "pattern": [ - { - "regexp": "^\\s+(.+):(\\d+):.*$", - "file": 1, "line": 2 - }, - { - "regexp": "^.*\\.(.+)\\s*$", - "message": 1 - } - ], - "background": { - "activeOnStart": true, - "beginsPattern": "^.*\\(local file changes:.*$", - "endsPattern": "(ExitFailure|ExitSuccess)" - } - } - } - ] -} diff --git a/demo/.stylish-haskell.yaml b/demos/.stylish-haskell.yaml similarity index 100% rename from demo/.stylish-haskell.yaml rename to demos/.stylish-haskell.yaml diff --git a/demo/LICENSE b/demos/LICENSE similarity index 100% rename from demo/LICENSE rename to demos/LICENSE diff --git a/demo/README.md b/demos/README.md similarity index 100% rename from demo/README.md rename to demos/README.md diff --git a/demo/cabal.project b/demos/cabal.project similarity index 100% rename from demo/cabal.project rename to demos/cabal.project diff --git a/demo/project.sh b/demos/project.sh similarity index 100% rename from demo/project.sh rename to demos/project.sh diff --git a/demo/succinct-demo.cabal b/demos/succinct-demo.cabal similarity index 100% rename from demo/succinct-demo.cabal rename to demos/succinct-demo.cabal diff --git a/doctest/DoctestDriver.hs b/doctest/DoctestDriver.hs index a1f4f4b..00cb057 100644 --- a/doctest/DoctestDriver.hs +++ b/doctest/DoctestDriver.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} #if MIN_VERSION_GLASGOW_HASKELL(8,4,4,0) -{-# OPTIONS_GHC -F -pgmF doctest-discover #-} +{-# OPTIONS_GHC -F -pgmF doctest-discover -optF config.json #-} #else module Main where diff --git a/examples/Example1.hs b/examples/json/Example1.hs similarity index 100% rename from examples/Example1.hs rename to examples/json/Example1.hs diff --git a/examples/Example2.hs b/examples/json/Example2.hs similarity index 100% rename from examples/Example2.hs rename to examples/json/Example2.hs diff --git a/examples/Example3.hs b/examples/json/Example3.hs similarity index 100% rename from examples/Example3.hs rename to examples/json/Example3.hs diff --git a/examples/Example4.hs b/examples/json/Example4.hs similarity index 100% rename from examples/Example4.hs rename to examples/json/Example4.hs diff --git a/src/HaskellWorks/Data/Json/DecodeError.hs b/libs/json/HaskellWorks/Data/Json/DecodeError.hs similarity index 100% rename from src/HaskellWorks/Data/Json/DecodeError.hs rename to libs/json/HaskellWorks/Data/Json/DecodeError.hs diff --git a/src/HaskellWorks/Data/Json/FromValue.hs b/libs/json/HaskellWorks/Data/Json/FromValue.hs similarity index 100% rename from src/HaskellWorks/Data/Json/FromValue.hs rename to libs/json/HaskellWorks/Data/Json/FromValue.hs diff --git a/src/HaskellWorks/Data/Json/Internal/CharLike.hs b/libs/json/HaskellWorks/Data/Json/Internal/CharLike.hs similarity index 100% rename from src/HaskellWorks/Data/Json/Internal/CharLike.hs rename to libs/json/HaskellWorks/Data/Json/Internal/CharLike.hs diff --git a/src/HaskellWorks/Data/Json/Internal/Doc.hs b/libs/json/HaskellWorks/Data/Json/Internal/Doc.hs similarity index 100% rename from src/HaskellWorks/Data/Json/Internal/Doc.hs rename to libs/json/HaskellWorks/Data/Json/Internal/Doc.hs diff --git a/src/HaskellWorks/Data/Json/Internal/Index.hs b/libs/json/HaskellWorks/Data/Json/Internal/Index.hs similarity index 100% rename from src/HaskellWorks/Data/Json/Internal/Index.hs rename to libs/json/HaskellWorks/Data/Json/Internal/Index.hs diff --git a/src/HaskellWorks/Data/Json/Internal/PartialIndex.hs b/libs/json/HaskellWorks/Data/Json/Internal/PartialIndex.hs similarity index 100% rename from src/HaskellWorks/Data/Json/Internal/PartialIndex.hs rename to libs/json/HaskellWorks/Data/Json/Internal/PartialIndex.hs diff --git a/src/HaskellWorks/Data/Json/Internal/Slurp.hs b/libs/json/HaskellWorks/Data/Json/Internal/Slurp.hs similarity index 100% rename from src/HaskellWorks/Data/Json/Internal/Slurp.hs rename to libs/json/HaskellWorks/Data/Json/Internal/Slurp.hs diff --git a/src/HaskellWorks/Data/Json/Internal/Standard/Cursor/Token.hs b/libs/json/HaskellWorks/Data/Json/Internal/Standard/Cursor/Token.hs similarity index 100% rename from src/HaskellWorks/Data/Json/Internal/Standard/Cursor/Token.hs rename to libs/json/HaskellWorks/Data/Json/Internal/Standard/Cursor/Token.hs diff --git a/src/HaskellWorks/Data/Json/Internal/Standard/Token/Tokenize.hs b/libs/json/HaskellWorks/Data/Json/Internal/Standard/Token/Tokenize.hs similarity index 100% rename from src/HaskellWorks/Data/Json/Internal/Standard/Token/Tokenize.hs rename to libs/json/HaskellWorks/Data/Json/Internal/Standard/Token/Tokenize.hs diff --git a/src/HaskellWorks/Data/Json/Internal/Token.hs b/libs/json/HaskellWorks/Data/Json/Internal/Token.hs similarity index 100% rename from src/HaskellWorks/Data/Json/Internal/Token.hs rename to libs/json/HaskellWorks/Data/Json/Internal/Token.hs diff --git a/src/HaskellWorks/Data/Json/Internal/Token/Types.hs b/libs/json/HaskellWorks/Data/Json/Internal/Token/Types.hs similarity index 100% rename from src/HaskellWorks/Data/Json/Internal/Token/Types.hs rename to libs/json/HaskellWorks/Data/Json/Internal/Token/Types.hs diff --git a/src/HaskellWorks/Data/Json/Internal/Value.hs b/libs/json/HaskellWorks/Data/Json/Internal/Value.hs similarity index 100% rename from src/HaskellWorks/Data/Json/Internal/Value.hs rename to libs/json/HaskellWorks/Data/Json/Internal/Value.hs diff --git a/src/HaskellWorks/Data/Json/Internal/Word64.hs b/libs/json/HaskellWorks/Data/Json/Internal/Word64.hs similarity index 100% rename from src/HaskellWorks/Data/Json/Internal/Word64.hs rename to libs/json/HaskellWorks/Data/Json/Internal/Word64.hs diff --git a/src/HaskellWorks/Data/Json/LightJson.hs b/libs/json/HaskellWorks/Data/Json/LightJson.hs similarity index 100% rename from src/HaskellWorks/Data/Json/LightJson.hs rename to libs/json/HaskellWorks/Data/Json/LightJson.hs diff --git a/src/HaskellWorks/Data/Json/PartialValue.hs b/libs/json/HaskellWorks/Data/Json/PartialValue.hs similarity index 100% rename from src/HaskellWorks/Data/Json/PartialValue.hs rename to libs/json/HaskellWorks/Data/Json/PartialValue.hs diff --git a/src/HaskellWorks/Data/Json/Query.hs b/libs/json/HaskellWorks/Data/Json/Query.hs similarity index 100% rename from src/HaskellWorks/Data/Json/Query.hs rename to libs/json/HaskellWorks/Data/Json/Query.hs diff --git a/src/HaskellWorks/Data/Json/Simple/Value.hs b/libs/json/HaskellWorks/Data/Json/Simple/Value.hs similarity index 100% rename from src/HaskellWorks/Data/Json/Simple/Value.hs rename to libs/json/HaskellWorks/Data/Json/Simple/Value.hs diff --git a/src/HaskellWorks/Data/Json/Standard/Load/Partial.hs b/libs/json/HaskellWorks/Data/Json/Standard/Load/Partial.hs similarity index 100% rename from src/HaskellWorks/Data/Json/Standard/Load/Partial.hs rename to libs/json/HaskellWorks/Data/Json/Standard/Load/Partial.hs diff --git a/src/HaskellWorks/Data/Json/Value.hs b/libs/json/HaskellWorks/Data/Json/Value.hs similarity index 100% rename from src/HaskellWorks/Data/Json/Value.hs rename to libs/json/HaskellWorks/Data/Json/Value.hs diff --git a/succinct.cabal b/succinct.cabal index 275d244..e82501d 100644 --- a/succinct.cabal +++ b/succinct.cabal @@ -15,13 +15,13 @@ license-file: LICENSE tested-with: GHC == 9.8.2, GHC == 9.6.6 build-type: Simple extra-source-files: README.md - corpus/5000B.json - corpus/5000B.json.bp.idx - corpus/5000B.json.ib.idx - corpus/issue-0001.json - corpus/issue-0001.json.bp.idx - corpus/issue-0001.json.ib.idx - corpus/issue-0001.md + corpus/json/5000B.json + corpus/json/5000B.json.bp.idx + corpus/json/5000B.json.ib.idx + corpus/json/issue-0001.json + corpus/json/issue-0001.json.bp.idx + corpus/json/issue-0001.json.ib.idx + corpus/json/issue-0001.md source-repository head type: git @@ -118,7 +118,7 @@ library json , vector , word8 visibility: public - hs-source-dirs: src + hs-source-dirs: libs/json other-modules: Paths_succinct autogen-modules: Paths_succinct exposed-modules: HaskellWorks.Data.Json.DecodeError @@ -163,7 +163,7 @@ executable succinct-json , unordered-containers , vector main-is: Main.hs - hs-source-dirs: app + hs-source-dirs: apps/succinct-json ghc-options: -threaded -rtsopts -with-rtsopts=-N other-modules: App.Commands App.Commands.CreateIndex @@ -197,16 +197,16 @@ test-suite succinct-json-test , vector type: exitcode-stdio-1.0 main-is: Spec.hs - hs-source-dirs: test + hs-source-dirs: tests/json ghc-options: -threaded -rtsopts -with-rtsopts=-N build-tool-depends: hspec-discover:hspec-discover - other-modules: HaskellWorks.Data.Json.LightJsonSpec - HaskellWorks.Data.Json.Simple.CursorSpec - HaskellWorks.Data.Json.Standard.CursorSpec - HaskellWorks.Data.Json.Standard.GenCursorTest - HaskellWorks.Data.Json.Token.TokenizeSpec - HaskellWorks.Data.Json.TypeSpec - HaskellWorks.Data.Json.ValueSpec + other-modules: Data.Succinct.Json.LightJsonSpec + Data.Succinct.Json.Simple.CursorSpec + Data.Succinct.Json.Standard.CursorSpec + Data.Succinct.Json.Standard.GenCursorTest + Data.Succinct.Json.Token.TokenizeSpec + Data.Succinct.Json.TypeSpec + Data.Succinct.Json.ValueSpec library json-examples import: base, config @@ -217,13 +217,13 @@ library json-examples , hw-mquery , hw-prim , succinct-json - hs-source-dirs: examples + hs-source-dirs: examples/json other-modules: Example1 Example2 Example3 Example4 -benchmark bench +benchmark json-bench import: base, config , bytestring , criterion @@ -233,7 +233,7 @@ benchmark bench , succinct-json type: exitcode-stdio-1.0 main-is: Main.hs - hs-source-dirs: bench + hs-source-dirs: benchmarks/json test-suite doctest import: base, config diff --git a/test/HaskellWorks/Data/Json/LightJsonSpec.hs b/tests/json/Data/Succinct/Json/LightJsonSpec.hs similarity index 99% rename from test/HaskellWorks/Data/Json/LightJsonSpec.hs rename to tests/json/Data/Succinct/Json/LightJsonSpec.hs index 7f4bbfd..aff5255 100644 --- a/test/HaskellWorks/Data/Json/LightJsonSpec.hs +++ b/tests/json/Data/Succinct/Json/LightJsonSpec.hs @@ -8,7 +8,7 @@ {-# OPTIONS_GHC -fno-warn-missing-signatures #-} -module HaskellWorks.Data.Json.LightJsonSpec (spec) where +module Data.Succinct.Json.LightJsonSpec (spec) where import Control.Monad import Data.Text diff --git a/test/HaskellWorks/Data/Json/Simple/CursorSpec.hs b/tests/json/Data/Succinct/Json/Simple/CursorSpec.hs similarity index 98% rename from test/HaskellWorks/Data/Json/Simple/CursorSpec.hs rename to tests/json/Data/Succinct/Json/Simple/CursorSpec.hs index 39e5cfe..421e7d4 100644 --- a/test/HaskellWorks/Data/Json/Simple/CursorSpec.hs +++ b/tests/json/Data/Succinct/Json/Simple/CursorSpec.hs @@ -7,7 +7,7 @@ {-# OPTIONS_GHC -fno-warn-missing-signatures #-} -module HaskellWorks.Data.Json.Simple.CursorSpec +module Data.Succinct.Json.Simple.CursorSpec ( spec ) where diff --git a/test/HaskellWorks/Data/Json/Standard/CursorSpec.hs b/tests/json/Data/Succinct/Json/Standard/CursorSpec.hs similarity index 86% rename from test/HaskellWorks/Data/Json/Standard/CursorSpec.hs rename to tests/json/Data/Succinct/Json/Standard/CursorSpec.hs index e1f02d3..cbb36c7 100644 --- a/test/HaskellWorks/Data/Json/Standard/CursorSpec.hs +++ b/tests/json/Data/Succinct/Json/Standard/CursorSpec.hs @@ -7,9 +7,9 @@ {-# OPTIONS_GHC -fno-warn-missing-signatures #-} -module HaskellWorks.Data.Json.Standard.CursorSpec(spec) where +module Data.Succinct.Json.Standard.CursorSpec(spec) where -import HaskellWorks.Data.Json.Standard.GenCursorTest +import Data.Succinct.Json.Standard.GenCursorTest import Test.Hspec import qualified HaskellWorks.Data.Json.Standard.Cursor.Fast as FAST diff --git a/test/HaskellWorks/Data/Json/Standard/GenCursorTest.hs b/tests/json/Data/Succinct/Json/Standard/GenCursorTest.hs similarity index 98% rename from test/HaskellWorks/Data/Json/Standard/GenCursorTest.hs rename to tests/json/Data/Succinct/Json/Standard/GenCursorTest.hs index fef2c8d..3bef7e4 100644 --- a/test/HaskellWorks/Data/Json/Standard/GenCursorTest.hs +++ b/tests/json/Data/Succinct/Json/Standard/GenCursorTest.hs @@ -7,7 +7,7 @@ {-# OPTIONS_GHC -fno-warn-missing-signatures #-} -module HaskellWorks.Data.Json.Standard.GenCursorTest(genTest) where +module Data.Succinct.Json.Standard.GenCursorTest(genTest) where import Control.Monad import HaskellWorks.Data.BalancedParens.BalancedParens diff --git a/test/HaskellWorks/Data/Json/Token/TokenizeSpec.hs b/tests/json/Data/Succinct/Json/Token/TokenizeSpec.hs similarity index 97% rename from test/HaskellWorks/Data/Json/Token/TokenizeSpec.hs rename to tests/json/Data/Succinct/Json/Token/TokenizeSpec.hs index 9d453e6..22cdf58 100644 --- a/test/HaskellWorks/Data/Json/Token/TokenizeSpec.hs +++ b/tests/json/Data/Succinct/Json/Token/TokenizeSpec.hs @@ -1,6 +1,6 @@ {-# LANGUAGE OverloadedStrings #-} -module HaskellWorks.Data.Json.Token.TokenizeSpec (spec) where +module Data.Succinct.Json.Token.TokenizeSpec (spec) where import Data.ByteString (ByteString) import HaskellWorks.Data.Json.Internal.Standard.Token.Tokenize diff --git a/test/HaskellWorks/Data/Json/TypeSpec.hs b/tests/json/Data/Succinct/Json/TypeSpec.hs similarity index 99% rename from test/HaskellWorks/Data/Json/TypeSpec.hs rename to tests/json/Data/Succinct/Json/TypeSpec.hs index 091a2ea..2f87e82 100644 --- a/test/HaskellWorks/Data/Json/TypeSpec.hs +++ b/tests/json/Data/Succinct/Json/TypeSpec.hs @@ -7,7 +7,7 @@ {-# OPTIONS_GHC -fno-warn-missing-signatures #-} -module HaskellWorks.Data.Json.TypeSpec (spec) where +module Data.Succinct.Json.TypeSpec (spec) where import Control.Monad import HaskellWorks.Data.BalancedParens.BalancedParens diff --git a/test/HaskellWorks/Data/Json/ValueSpec.hs b/tests/json/Data/Succinct/Json/ValueSpec.hs similarity index 99% rename from test/HaskellWorks/Data/Json/ValueSpec.hs rename to tests/json/Data/Succinct/Json/ValueSpec.hs index 7de57f3..8a173c3 100644 --- a/test/HaskellWorks/Data/Json/ValueSpec.hs +++ b/tests/json/Data/Succinct/Json/ValueSpec.hs @@ -7,7 +7,7 @@ {-# OPTIONS_GHC -fno-warn-missing-signatures #-} -module HaskellWorks.Data.Json.ValueSpec (spec) where +module Data.Succinct.Json.ValueSpec (spec) where import Control.Monad import HaskellWorks.Data.BalancedParens.BalancedParens diff --git a/test/Spec.hs b/tests/json/Spec.hs similarity index 100% rename from test/Spec.hs rename to tests/json/Spec.hs