Move modules to Language.CQL. #148

statebox · Aug 11, 2019 · 0e87dc5 · 0e87dc5
1 parent ed19924
commit 0e87dc5
Show file tree

Hide file tree

Showing 28 changed files with 169 additions and 180 deletions.
diff --git a/cli/Main.hs b/cli/Main.hs
@@ -23,6 +23,8 @@ module Main where
 import Language.CQL
 import System.Environment
 
+import Language.CQL.Program
+
 main :: IO ()
 main = do
  args <- getArgs

diff --git a/src/Language/CQL.hs b/src/Language/CQL.hs
@@ -42,23 +42,23 @@ module Language.CQL where
 import Control.Concurrent
 import Control.DeepSeq
 import Control.Exception
-import Data.List (nub)
-import qualified Data.Map.Strict as Map
+import Data.List  (nub)
+import qualified Data.Map.Strict  as Map
 import Data.Maybe
 import Data.Typeable
-import Language.Common as C
-import Language.Graph
-import Language.Instance as I
-import Language.Mapping as M
-import Language.Options
-import Language.Parser (parseCqlProgram)
-import Language.Program as P
-import Language.Query as Q
-import Language.Schema as S
-import Language.Term as Term
-import Language.Transform as Tr
-import Language.Typeside as T
-import Prelude hiding (EQ, exp)
+import Language.CQL.Common as C
+import Language.CQL.Graph
+import Language.CQL.Instance as I
+import Language.CQL.Mapping as M
+import Language.CQL.Options
+import Language.CQL.Parser (parseCqlProgram)
+import Language.CQL.Program as P
+import Language.CQL.Query as Q
+import Language.CQL.Schema as S
+import Language.CQL.Term as Term
+import Language.CQL.Transform as Tr
+import Language.CQL.Typeside as T
+import Prelude  hiding (EQ, exp)
 import System.IO.Unsafe
 
 -- | Times out a computation after @i@ microseconds.

diff --git a/src/Language/Common.hs → src/Language/CQL/Common.hs b/src/Language/Common.hs → src/Language/CQL/Common.hs
@@ -38,7 +38,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {-# LANGUAGE TypeSynonymInstances #-}
 {-# LANGUAGE UndecidableInstances #-}
 
-module Language.Common where
+module Language.CQL.Common where
 
 import Control.Arrow (left)
 import Data.Char

diff --git a/src/Language/Congruence.hs → src/Language/CQL/Congruence.hs b/src/Language/Congruence.hs → src/Language/CQL/Congruence.hs
@@ -19,7 +19,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
 -}
 {-# LANGUAGE FlexibleContexts, OverloadedLists, OverloadedStrings, TupleSections #-}
-module Language.Congruence (decide, Term(Function)) where
+module Language.CQL.Congruence (decide, Term(Function)) where
 
 import Prelude hiding (any)
 
@@ -35,7 +35,7 @@ import Data.Foldable (traverse_)
 import Data.Graph.Inductive (LNode)
 import Data.Functor.Identity
 
-import Language.Internal
+import Language.CQL.Internal
 
 
 decide :: Ord t => [(Term t, Term t)] -> Term t -> Term t -> Bool

diff --git a/src/Language/Graph.hs → src/Language/CQL/Graph.hs b/src/Language/Graph.hs → src/Language/CQL/Graph.hs
@@ -19,7 +19,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
 -}
 
-module Language.Graph where
+module Language.CQL.Graph where
 
 import Prelude
 

diff --git a/src/Language/Instance.hs → src/Language/CQL/Instance.hs b/src/Language/Instance.hs → src/Language/CQL/Instance.hs
@@ -36,7 +36,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {-# LANGUAGE TypeSynonymInstances #-}
 {-# LANGUAGE UndecidableInstances #-}
 
-module Language.Instance where
+module Language.CQL.Instance where
 
 import Control.DeepSeq
 import Control.Monad
@@ -49,14 +49,14 @@ import Data.Set (Set)
 import qualified Data.Set as Set
 import Data.Typeable hiding (typeOf)
 import Data.Void
-import Language.Common  (elem', intercalate, fromListAccum, mapl, section, sepTup, toMapSafely, Deps(..), Err, Kind(INSTANCE), MultiTyMap, TyMap, type (+))
-import Language.Mapping  as Mapping
-import Language.Options
-import Language.Prover
-import Language.Query
-import Language.Schema  as Schema
-import Language.Term  as Term
-import Language.Typeside  as Typeside
+import Language.CQL.Common (elem', intercalate, fromListAccum, mapl, section, sepTup, toMapSafely, Deps(..), Err, Kind(INSTANCE), MultiTyMap, TyMap, type (+))
+import Language.CQL.Mapping as Mapping
+import Language.CQL.Options
+import Language.CQL.Prover
+import Language.CQL.Query
+import Language.CQL.Schema as Schema
+import Language.CQL.Term as Term
+import Language.CQL.Typeside as Typeside
 import Prelude hiding (EQ)
 import qualified Text.Tabular as T
 import qualified Text.Tabular.AsciiArt as Ascii

diff --git a/src/Language/Internal.hs → src/Language/CQL/Internal.hs b/src/Language/Internal.hs → src/Language/CQL/Internal.hs
@@ -26,7 +26,7 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
  , MultiParamTypeClasses
  , FunctionalDependencies
 #-}
-module Language.Internal where
+module Language.CQL.Internal where
 
 import Prelude hiding (abs, any)
 

diff --git a/src/Language/Mapping.hs → src/Language/CQL/Mapping.hs b/src/Language/Mapping.hs → src/Language/CQL/Mapping.hs
@@ -37,18 +37,18 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 {-# LANGUAGE TypeSynonymInstances #-}
 {-# LANGUAGE UndecidableInstances #-}
 
-module Language.Mapping where
+module Language.CQL.Mapping where
 import Control.DeepSeq
-import Data.Map.Strict (Map)
-import Data.Map.Strict as Map
+import Data.Map.Strict  (Map)
+import Data.Map.Strict  as Map
 import Data.Maybe
-import qualified Data.Set as Set
+import qualified Data.Set  as Set
 import Data.Typeable
 import Data.Void
-import Language.Common
-import Language.Schema as Schema
-import Language.Term
-import Prelude hiding (EQ)
+import Language.CQL.Common
+import Language.CQL.Schema as Schema
+import Language.CQL.Term
+import Prelude  hiding (EQ)
 
 -- | Morphism of schemas.
 data Mapping var ty sym en fk att en' fk' att'

diff --git a/src/Language/Options.hs → src/Language/CQL/Options.hs b/src/Language/Options.hs → src/Language/CQL/Options.hs
@@ -20,10 +20,10 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 -}
 {-# LANGUAGE EmptyDataDeriving #-}
 
-module Language.Options where
+module Language.CQL.Options where
 
 import Data.Void
-import Language.Common (Err, intercalate, lower)
+import Language.CQL.Common (Err, intercalate, lower)
 import Text.Read
 
 data Options = Options {

diff --git a/src/Language/Parser.hs → src/Language/CQL/Parser.hs b/src/Language/Parser.hs → src/Language/CQL/Parser.hs
@@ -18,20 +18,20 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
 -}
-module Language.Parser where
+module Language.CQL.Parser where
 
 import Data.List
-import Data.Map as Map hiding ((\\))
+import Data.Map  as Map hiding ((\\))
 import Data.Maybe
-import Language.Common as C
-import Language.Parser.Instance as I
-import Language.Parser.LexerRules
-import Language.Parser.Mapping as M
-import Language.Parser.Parser
-import Language.Parser.Schema as S'
-import Language.Parser.Transform as TT
-import Language.Parser.Typeside as T'
-import Language.Program as P
+import Language.CQL.Common as C
+import Language.CQL.Parser.Instance as I
+import Language.CQL.Parser.LexerRules
+import Language.CQL.Parser.Mapping as M
+import Language.CQL.Parser.Parser
+import Language.CQL.Parser.Schema as S'
+import Language.CQL.Parser.Transform as TT
+import Language.CQL.Parser.Typeside as T'
+import Language.CQL.Program as P
 import Text.Megaparsec
 
 parseCqlProgram' :: Parser (String, Exp)

diff --git a/src/Language/Parser/Generator/Generator.hs → ...anguage/CQL/Parser/Generator/Generator.hs b/src/Language/Parser/Generator/Generator.hs → ...anguage/CQL/Parser/Generator/Generator.hs
@@ -18,14 +18,11 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
 -}
-module Language.Parser.Generator.Generator where
+module Language.CQL.Parser.Generator.Generator where
 
-import Language.Parser.ReservedWords
-
--- QuickCheck
+import Language.CQL.Parser.ReservedWords
 import Test.QuickCheck.Gen
 
--- BASIC
 lowerCharGen :: Gen Char
 lowerCharGen = elements ['a' .. 'z']
 

diff --git a/src/Language/Parser/Instance.hs → src/Language/CQL/Parser/Instance.hs b/src/Language/Parser/Instance.hs → src/Language/CQL/Parser/Instance.hs
@@ -20,16 +20,16 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 -}
 {-# LANGUAGE TupleSections #-}
 
-module Language.Parser.Instance where
-
-import Language.Instance as I
-import Language.Mapping
-import Language.Parser.LexerRules
-import Language.Parser.Mapping as M
-import Language.Parser.Parser
-import Language.Parser.Schema
-import Language.Schema as S
-import Language.Term
+module Language.CQL.Parser.Instance where
+
+import Language.CQL.Instance as I
+import Language.CQL.Mapping
+import Language.CQL.Parser.LexerRules
+import Language.CQL.Parser.Mapping as M
+import Language.CQL.Parser.Parser
+import Language.CQL.Parser.Schema
+import Language.CQL.Schema as S
+import Language.CQL.Term
 
 -- base
 import Data.Maybe

diff --git a/src/Language/Parser/LexerRules.hs → src/Language/CQL/Parser/LexerRules.hs b/src/Language/Parser/LexerRules.hs → src/Language/CQL/Parser/LexerRules.hs
@@ -18,7 +18,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
 -}
-module Language.Parser.LexerRules where
+module Language.CQL.Parser.LexerRules where
 
 -- megaparsec
 import Text.Megaparsec

diff --git a/src/Language/Parser/Mapping.hs → src/Language/CQL/Parser/Mapping.hs b/src/Language/Parser/Mapping.hs → src/Language/CQL/Parser/Mapping.hs
@@ -18,13 +18,13 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
 -}
-module Language.Parser.Mapping where
+module Language.CQL.Parser.Mapping where
 
-import Language.Mapping
-import Language.Parser.LexerRules
-import Language.Parser.Parser
-import Language.Parser.Schema hiding (attParser, fkParser)
-import Language.Term
+import Language.CQL.Mapping
+import Language.CQL.Parser.LexerRules
+import Language.CQL.Parser.Parser
+import Language.CQL.Parser.Schema hiding (attParser, fkParser)
+import Language.CQL.Term
 
 -- megaparsec
 import Text.Megaparsec

diff --git a/src/Language/Parser/Parser.hs → src/Language/CQL/Parser/Parser.hs b/src/Language/Parser/Parser.hs → src/Language/CQL/Parser/Parser.hs
@@ -18,10 +18,10 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
 -}
-module Language.Parser.Parser where
+module Language.CQL.Parser.Parser where
 
-import Language.Parser.LexerRules
-import Language.Parser.ReservedWords
+import Language.CQL.Parser.LexerRules
+import Language.CQL.Parser.ReservedWords
 
 -- base
 import Data.Char
@@ -34,7 +34,7 @@ import qualified Text.Megaparsec.Char.Lexer as L
 
 -- scientific
 import Data.Scientific (Scientific)
-import Language.Term
+import Language.CQL.Term
 
 rawTermParser :: Parser RawTerm
 rawTermParser =

diff --git a/src/Language/Parser/ReservedWords.hs → src/Language/CQL/Parser/ReservedWords.hs b/src/Language/Parser/ReservedWords.hs → src/Language/CQL/Parser/ReservedWords.hs
@@ -18,7 +18,7 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
 -}
-module Language.Parser.ReservedWords where
+module Language.CQL.Parser.ReservedWords where
 
 reservedWords :: [String]
 reservedWords =

diff --git a/src/Language/Parser/Schema.hs → src/Language/CQL/Parser/Schema.hs b/src/Language/Parser/Schema.hs → src/Language/CQL/Parser/Schema.hs
@@ -21,14 +21,14 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 {-# LANGUAGE TupleSections #-}
 
-module Language.Parser.Schema where
-
-import Language.Parser.LexerRules
-import Language.Parser.Parser
-import Language.Parser.Typeside
-import Language.Schema as X
-import Language.Term
-import Language.Typeside
+module Language.CQL.Parser.Schema where
+
+import Language.CQL.Parser.LexerRules
+import Language.CQL.Parser.Parser
+import Language.CQL.Parser.Typeside
+import Language.CQL.Schema as X
+import Language.CQL.Term
+import Language.CQL.Typeside
 
 -- base
 import Data.Maybe

diff --git a/src/Language/Parser/Transform.hs → src/Language/CQL/Parser/Transform.hs b/src/Language/Parser/Transform.hs → src/Language/CQL/Parser/Transform.hs
@@ -18,16 +18,16 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program. If not, see <https://www.gnu.org/licenses/>.
 -}
-module Language.Parser.Transform (transExpParser) where
-
-import Language.Instance
-import Language.Mapping
-import Language.Parser.Instance
-import Language.Parser.LexerRules
-import Language.Parser.Mapping
-import Language.Parser.Parser
-import Language.Term
-import Language.Transform
+module Language.CQL.Parser.Transform (transExpParser) where
+
+import Language.CQL.Instance
+import Language.CQL.Mapping
+import Language.CQL.Parser.Instance
+import Language.CQL.Parser.LexerRules
+import Language.CQL.Parser.Mapping
+import Language.CQL.Parser.Parser
+import Language.CQL.Term
+import Language.CQL.Transform
 
 -- prelude
 import Data.Maybe

diff --git a/src/Language/Parser/Typeside.hs → src/Language/CQL/Parser/Typeside.hs b/src/Language/Parser/Typeside.hs → src/Language/CQL/Parser/Typeside.hs
@@ -21,12 +21,12 @@ along with this program. If not, see <https://www.gnu.org/licenses/>.
 
 {-# LANGUAGE TupleSections #-}
 
-module Language.Parser.Typeside where
+module Language.CQL.Parser.Typeside where
 
-import Language.Parser.LexerRules
-import Language.Parser.Parser
-import Language.Term
-import Language.Typeside as X
+import Language.CQL.Parser.LexerRules
+import Language.CQL.Parser.Parser
+import Language.CQL.Term
+import Language.CQL.Typeside as X
 
 -- base
 import Data.Maybe