From a3443d05244423b7bd22fcf7953067bf8f1ed40b Mon Sep 17 00:00:00 2001 From: Lars Kuhtz Date: Mon, 14 Aug 2023 12:12:19 -0700 Subject: [PATCH] merge src-ghc into src --- pact.cabal | 4 +--- {src-ghc => src}/Pact/ApiReq.hs | 0 {src-ghc => src}/Pact/Bench.hs | 0 {src-ghc => src}/Pact/Coverage.hs | 0 {src-ghc => src}/Pact/Coverage/Report.hs | 0 {src-ghc => src}/Pact/GasModel/GasModel.hs | 0 {src-ghc => src}/Pact/GasModel/GasTests.hs | 0 {src-ghc => src}/Pact/GasModel/Types.hs | 0 {src-ghc => src}/Pact/GasModel/Utils.hs | 0 {src-ghc => src}/Pact/Interpreter.hs | 0 {src-ghc => src}/Pact/Main.hs | 0 {src-ghc => src}/Pact/MockDb.hs | 0 {src-ghc => src}/Pact/Persist/SQLite.hs | 0 {src-ghc => src}/Pact/PersistPactDb/Regression.hs | 0 {src-ghc => src}/Pact/ReplTools.hs | 0 {src-ghc => src}/Pact/Server/ApiServer.hs | 0 {src-ghc => src}/Pact/Server/History/Persistence.hs | 0 {src-ghc => src}/Pact/Server/History/Service.hs | 0 {src-ghc => src}/Pact/Server/History/Types.hs | 0 {src-ghc => src}/Pact/Server/PactService.hs | 0 {src-ghc => src}/Pact/Server/Server.hs | 0 {src-ghc => src}/Pact/Types/Crypto.hs | 0 {src-ghc => src}/Pact/Types/ECDSA.hs | 0 {src-ghc => src}/Pact/Types/SQLite.hs | 0 {src-ghc => src}/Pact/Types/Server.hs | 0 25 files changed, 1 insertion(+), 3 deletions(-) rename {src-ghc => src}/Pact/ApiReq.hs (100%) rename {src-ghc => src}/Pact/Bench.hs (100%) rename {src-ghc => src}/Pact/Coverage.hs (100%) rename {src-ghc => src}/Pact/Coverage/Report.hs (100%) rename {src-ghc => src}/Pact/GasModel/GasModel.hs (100%) rename {src-ghc => src}/Pact/GasModel/GasTests.hs (100%) rename {src-ghc => src}/Pact/GasModel/Types.hs (100%) rename {src-ghc => src}/Pact/GasModel/Utils.hs (100%) rename {src-ghc => src}/Pact/Interpreter.hs (100%) rename {src-ghc => src}/Pact/Main.hs (100%) rename {src-ghc => src}/Pact/MockDb.hs (100%) rename {src-ghc => src}/Pact/Persist/SQLite.hs (100%) rename {src-ghc => src}/Pact/PersistPactDb/Regression.hs (100%) rename {src-ghc => src}/Pact/ReplTools.hs (100%) rename {src-ghc => src}/Pact/Server/ApiServer.hs (100%) rename {src-ghc => src}/Pact/Server/History/Persistence.hs (100%) rename {src-ghc => src}/Pact/Server/History/Service.hs (100%) rename {src-ghc => src}/Pact/Server/History/Types.hs (100%) rename {src-ghc => src}/Pact/Server/PactService.hs (100%) rename {src-ghc => src}/Pact/Server/Server.hs (100%) rename {src-ghc => src}/Pact/Types/Crypto.hs (100%) rename {src-ghc => src}/Pact/Types/ECDSA.hs (100%) rename {src-ghc => src}/Pact/Types/SQLite.hs (100%) rename {src-ghc => src}/Pact/Types/Server.hs (100%) diff --git a/pact.cabal b/pact.cabal index 7d54796f2..dd544dc13 100644 --- a/pact.cabal +++ b/pact.cabal @@ -69,9 +69,7 @@ library pact-prettyprinter library cpp-options: -DLEGACY_PARSER - hs-source-dirs: - src - src-ghc + hs-source-dirs: src default-language: Haskell2010 ghc-prof-options: -fprof-auto diff --git a/src-ghc/Pact/ApiReq.hs b/src/Pact/ApiReq.hs similarity index 100% rename from src-ghc/Pact/ApiReq.hs rename to src/Pact/ApiReq.hs diff --git a/src-ghc/Pact/Bench.hs b/src/Pact/Bench.hs similarity index 100% rename from src-ghc/Pact/Bench.hs rename to src/Pact/Bench.hs diff --git a/src-ghc/Pact/Coverage.hs b/src/Pact/Coverage.hs similarity index 100% rename from src-ghc/Pact/Coverage.hs rename to src/Pact/Coverage.hs diff --git a/src-ghc/Pact/Coverage/Report.hs b/src/Pact/Coverage/Report.hs similarity index 100% rename from src-ghc/Pact/Coverage/Report.hs rename to src/Pact/Coverage/Report.hs diff --git a/src-ghc/Pact/GasModel/GasModel.hs b/src/Pact/GasModel/GasModel.hs similarity index 100% rename from src-ghc/Pact/GasModel/GasModel.hs rename to src/Pact/GasModel/GasModel.hs diff --git a/src-ghc/Pact/GasModel/GasTests.hs b/src/Pact/GasModel/GasTests.hs similarity index 100% rename from src-ghc/Pact/GasModel/GasTests.hs rename to src/Pact/GasModel/GasTests.hs diff --git a/src-ghc/Pact/GasModel/Types.hs b/src/Pact/GasModel/Types.hs similarity index 100% rename from src-ghc/Pact/GasModel/Types.hs rename to src/Pact/GasModel/Types.hs diff --git a/src-ghc/Pact/GasModel/Utils.hs b/src/Pact/GasModel/Utils.hs similarity index 100% rename from src-ghc/Pact/GasModel/Utils.hs rename to src/Pact/GasModel/Utils.hs diff --git a/src-ghc/Pact/Interpreter.hs b/src/Pact/Interpreter.hs similarity index 100% rename from src-ghc/Pact/Interpreter.hs rename to src/Pact/Interpreter.hs diff --git a/src-ghc/Pact/Main.hs b/src/Pact/Main.hs similarity index 100% rename from src-ghc/Pact/Main.hs rename to src/Pact/Main.hs diff --git a/src-ghc/Pact/MockDb.hs b/src/Pact/MockDb.hs similarity index 100% rename from src-ghc/Pact/MockDb.hs rename to src/Pact/MockDb.hs diff --git a/src-ghc/Pact/Persist/SQLite.hs b/src/Pact/Persist/SQLite.hs similarity index 100% rename from src-ghc/Pact/Persist/SQLite.hs rename to src/Pact/Persist/SQLite.hs diff --git a/src-ghc/Pact/PersistPactDb/Regression.hs b/src/Pact/PersistPactDb/Regression.hs similarity index 100% rename from src-ghc/Pact/PersistPactDb/Regression.hs rename to src/Pact/PersistPactDb/Regression.hs diff --git a/src-ghc/Pact/ReplTools.hs b/src/Pact/ReplTools.hs similarity index 100% rename from src-ghc/Pact/ReplTools.hs rename to src/Pact/ReplTools.hs diff --git a/src-ghc/Pact/Server/ApiServer.hs b/src/Pact/Server/ApiServer.hs similarity index 100% rename from src-ghc/Pact/Server/ApiServer.hs rename to src/Pact/Server/ApiServer.hs diff --git a/src-ghc/Pact/Server/History/Persistence.hs b/src/Pact/Server/History/Persistence.hs similarity index 100% rename from src-ghc/Pact/Server/History/Persistence.hs rename to src/Pact/Server/History/Persistence.hs diff --git a/src-ghc/Pact/Server/History/Service.hs b/src/Pact/Server/History/Service.hs similarity index 100% rename from src-ghc/Pact/Server/History/Service.hs rename to src/Pact/Server/History/Service.hs diff --git a/src-ghc/Pact/Server/History/Types.hs b/src/Pact/Server/History/Types.hs similarity index 100% rename from src-ghc/Pact/Server/History/Types.hs rename to src/Pact/Server/History/Types.hs diff --git a/src-ghc/Pact/Server/PactService.hs b/src/Pact/Server/PactService.hs similarity index 100% rename from src-ghc/Pact/Server/PactService.hs rename to src/Pact/Server/PactService.hs diff --git a/src-ghc/Pact/Server/Server.hs b/src/Pact/Server/Server.hs similarity index 100% rename from src-ghc/Pact/Server/Server.hs rename to src/Pact/Server/Server.hs diff --git a/src-ghc/Pact/Types/Crypto.hs b/src/Pact/Types/Crypto.hs similarity index 100% rename from src-ghc/Pact/Types/Crypto.hs rename to src/Pact/Types/Crypto.hs diff --git a/src-ghc/Pact/Types/ECDSA.hs b/src/Pact/Types/ECDSA.hs similarity index 100% rename from src-ghc/Pact/Types/ECDSA.hs rename to src/Pact/Types/ECDSA.hs diff --git a/src-ghc/Pact/Types/SQLite.hs b/src/Pact/Types/SQLite.hs similarity index 100% rename from src-ghc/Pact/Types/SQLite.hs rename to src/Pact/Types/SQLite.hs diff --git a/src-ghc/Pact/Types/Server.hs b/src/Pact/Types/Server.hs similarity index 100% rename from src-ghc/Pact/Types/Server.hs rename to src/Pact/Types/Server.hs