git.iko.soy/project-m36
on master help sign in
Move OverloadedStrings from language pragmas to cabal file
c981accDiogo Biazus
Database/Persist/ProjectM36.hs+1−1
compare with master
unifiedsplit
@@ -1,4 +1,4 @@
1−{-# LANGUAGE RankNTypes, TypeFamilies, GeneralizedNewtypeDeriving, OverloadedStrings, FlexibleInstances, FlexibleContexts #-}
1+{-# LANGUAGE RankNTypes, TypeFamilies, GeneralizedNewtypeDeriving, FlexibleInstances, FlexibleContexts #-}
2{-# OPTIONS_GHC -fno-warn-orphans #-}
2{-# OPTIONS_GHC -fno-warn-orphans #-}
3module Database.Persist.ProjectM36 where
3module Database.Persist.ProjectM36 where
4import Database.Persist hiding (Assign, Update)
4import Database.Persist hiding (Assign, Update)
ProjectM36/Atom.hs−1
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2module ProjectM36.Atom where
1module ProjectM36.Atom where
3import ProjectM36.Base
2import ProjectM36.Base
4import ProjectM36.Error
3import ProjectM36.Error
ProjectM36/AtomFunction.hs+1−2
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2module ProjectM36.AtomFunction where
1module ProjectM36.AtomFunction where
3import ProjectM36.Base
2import ProjectM36.Base
4import ProjectM36.Error
3import ProjectM36.Error
@@ -17,4 +16,4 @@ atomFunctionForName funcName funcSet = if HS.null foundFunc then
17 foundFunc = HS.filter (\(AtomFunction name _ _) -> name == funcName) funcSet
16 foundFunc = HS.filter (\(AtomFunction name _ _) -> name == funcName) funcSet
18
17
19
18
20−
19+
ProjectM36/AtomFunctions/Basic.hs+1−2
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2--atom functions on primitive atom values plus the basic atom functions
1--atom functions on primitive atom values plus the basic atom functions
3module ProjectM36.AtomFunctions.Basic where
2module ProjectM36.AtomFunctions.Basic where
4import ProjectM36.Base
3import ProjectM36.Base
@@ -13,4 +12,4 @@ basicAtomFunctions = HS.unions [primitiveAtomFunctions,
13 dayAtomFunctions,
12 dayAtomFunctions,
14 eitherAtomFunctions,
13 eitherAtomFunctions,
15 maybeAtomFunctions]
14 maybeAtomFunctions]
16−
15+
ProjectM36/AtomFunctions/Primitive.hs+1−2
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2module ProjectM36.AtomFunctions.Primitive where
1module ProjectM36.AtomFunctions.Primitive where
3import ProjectM36.Atom
2import ProjectM36.Atom
4import ProjectM36.Base
3import ProjectM36.Base
@@ -97,4 +96,4 @@ castInt (ConstructedAtom _ _ _) = error "castInt attempt on ConstructedAtom"
97castInt (Atom atom) = case cast atom of
96castInt (Atom atom) = case cast atom of
98 Just i -> i
97 Just i -> i
99 Nothing -> error "int cast failure" -- the type checker must ensure this can never occur
98 Nothing -> error "int cast failure" -- the type checker must ensure this can never occur
100−
99+
ProjectM36/AtomType.hs−1
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2module ProjectM36.AtomType where
1module ProjectM36.AtomType where
3import ProjectM36.Base
2import ProjectM36.Base
4import ProjectM36.ConcreteTypeRep
3import ProjectM36.ConcreteTypeRep
ProjectM36/Client.hs+1−1
@@ -1,4 +1,4 @@
1−{-# LANGUAGE OverloadedStrings, DeriveAnyClass, DeriveGeneric #-}
1+{-# LANGUAGE DeriveAnyClass, DeriveGeneric #-}
2module ProjectM36.Client
2module ProjectM36.Client
3 (ConnectionInfo(..),
3 (ConnectionInfo(..),
4 Connection(..),
4 Connection(..),
ProjectM36/DataTypes/Basic.hs−7
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2-- wraps up primitives plus other basic data types
1-- wraps up primitives plus other basic data types
3module ProjectM36.DataTypes.Basic where
2module ProjectM36.DataTypes.Basic where
4import ProjectM36.DataTypes.Primitive
3import ProjectM36.DataTypes.Primitive
@@ -13,9 +12,3 @@ basicTypeConstructorMapping = (primitiveTypeConstructorMapping ++
13 eitherTypeConstructorMapping ++
12 eitherTypeConstructorMapping ++
14 dayTypeConstructorMapping)
13 dayTypeConstructorMapping)
15
14
16−
17−
18−
19−
20−
21−
ProjectM36/DataTypes/Day.hs−1
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2module ProjectM36.DataTypes.Day where
1module ProjectM36.DataTypes.Day where
3import ProjectM36.Base
2import ProjectM36.Base
4import ProjectM36.DataTypes.Primitive
3import ProjectM36.DataTypes.Primitive
ProjectM36/DataTypes/Either.hs+1−2
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2module ProjectM36.DataTypes.Either where
1module ProjectM36.DataTypes.Either where
3import ProjectM36.Base
2import ProjectM36.Base
4import ProjectM36.DataTypes.Primitive
3import ProjectM36.DataTypes.Primitive
@@ -19,4 +18,4 @@ eitherAtomFunctions = HS.fromList [
19 atomFuncType = [eitherAtomType AnyAtomType AnyAtomType, boolAtomType],
18 atomFuncType = [eitherAtomType AnyAtomType AnyAtomType, boolAtomType],
20 atomFunc = \((ConstructedAtom dConsName _ _):_) -> Atom (dConsName == "Left")
19 atomFunc = \((ConstructedAtom dConsName _ _):_) -> Atom (dConsName == "Left")
21 }
20 }
22− ]
21+ ]
ProjectM36/DataTypes/Interval.hs+2−2
@@ -1,4 +1,4 @@
1−{-# LANGUAGE GeneralizedNewtypeDeriving, StandaloneDeriving, OverloadedStrings #-}
1+{-# LANGUAGE GeneralizedNewtypeDeriving, StandaloneDeriving #-}
2{-# OPTIONS_GHC -fno-warn-orphans #-}
2{-# OPTIONS_GHC -fno-warn-orphans #-}
3module ProjectM36.DataTypes.Interval where
3module ProjectM36.DataTypes.Interval where
4import Data.Interval
4import Data.Interval
@@ -34,4 +34,4 @@ intervalFunctions = [AtomFunction { atomFuncName = "interval_dt_member",
34 boolAtomType],
34 boolAtomType],
35 atomFunc = (\(dt:dtinterval:_) -> Atom $ member ((unsafeCast dt)::UTCTime) ((unsafeCast dtinterval)::(Interval UTCTime)))}
35 atomFunc = (\(dt:dtinterval:_) -> Atom $ member ((unsafeCast dt)::UTCTime) ((unsafeCast dtinterval)::(Interval UTCTime)))}
36
36
37− ]
37+ ]
ProjectM36/DataTypes/Maybe.hs+1−2
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2module ProjectM36.DataTypes.Maybe where
1module ProjectM36.DataTypes.Maybe where
3import ProjectM36.Base
2import ProjectM36.Base
4import ProjectM36.DataTypes.Primitive
3import ProjectM36.DataTypes.Primitive
@@ -21,4 +20,4 @@ maybeAtomFunctions = HS.fromList [
21 atomFuncType = [maybeAtomType AnyAtomType, boolAtomType],
20 atomFuncType = [maybeAtomType AnyAtomType, boolAtomType],
22 atomFunc = \((ConstructedAtom dConsName _ _):_) -> Atom (dConsName == "Nothing")
21 atomFunc = \((ConstructedAtom dConsName _ _):_) -> Atom (dConsName == "Nothing")
23 }
22 }
24− ]
23+ ]
ProjectM36/DataTypes/Primitive.hs−1
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2module ProjectM36.DataTypes.Primitive where
1module ProjectM36.DataTypes.Primitive where
3import ProjectM36.Base
2import ProjectM36.Base
4import Data.Proxy
3import Data.Proxy
ProjectM36/DatabaseContext.hs−1
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2module ProjectM36.DatabaseContext where
1module ProjectM36.DatabaseContext where
3import ProjectM36.Base
2import ProjectM36.Base
4import qualified Data.Map as M
3import qualified Data.Map as M
ProjectM36/DateExamples.hs−1
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2module ProjectM36.DateExamples where
1module ProjectM36.DateExamples where
3import ProjectM36.Base
2import ProjectM36.Base
4import ProjectM36.Atom
3import ProjectM36.Atom
ProjectM36/Key.hs−1
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2module ProjectM36.Key where
1module ProjectM36.Key where
3import ProjectM36.Base
2import ProjectM36.Base
4import ProjectM36.Relation
3import ProjectM36.Relation
ProjectM36/Relation.hs+1−1
@@ -1,4 +1,4 @@
1−{-# LANGUAGE GADTs,ExistentialQuantification,OverloadedStrings #-}
1+{-# LANGUAGE GADTs,ExistentialQuantification #-}
2module ProjectM36.Relation where
2module ProjectM36.Relation where
3import qualified Data.Set as S
3import qualified Data.Set as S
4import qualified Data.HashSet as HS
4import qualified Data.HashSet as HS
ProjectM36/Relation/Parse/CSV.hs−1
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2module ProjectM36.Relation.Parse.CSV where
1module ProjectM36.Relation.Parse.CSV where
3--parse Relations from CSV
2--parse Relations from CSV
4import Data.Csv.Parser
3import Data.Csv.Parser
ProjectM36/Relation/Show/CSV.hs−1
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2{-# OPTIONS_GHC -fno-warn-orphans #-}
1{-# OPTIONS_GHC -fno-warn-orphans #-}
3module ProjectM36.Relation.Show.CSV where
2module ProjectM36.Relation.Show.CSV where
4import ProjectM36.Base
3import ProjectM36.Base
ProjectM36/Relation/Show/Gnuplot.hs−1
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2module ProjectM36.Relation.Show.Gnuplot where
1module ProjectM36.Relation.Show.Gnuplot where
3import ProjectM36.Base
2import ProjectM36.Base
4import ProjectM36.Relation
3import ProjectM36.Relation
ProjectM36/Relation/Show/HTML.hs−1
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2module ProjectM36.Relation.Show.HTML where
1module ProjectM36.Relation.Show.HTML where
3import ProjectM36.Base
2import ProjectM36.Base
4import ProjectM36.Relation
3import ProjectM36.Relation
ProjectM36/Relation/Show/Term.hs−1
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2--writes Relation to a String suitable for terminal output
1--writes Relation to a String suitable for terminal output
3module ProjectM36.Relation.Show.Term where
2module ProjectM36.Relation.Show.Term where
4import ProjectM36.Base
3import ProjectM36.Base
ProjectM36/RelationalExpression.hs+1−2
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2module ProjectM36.RelationalExpression where
1module ProjectM36.RelationalExpression where
3import ProjectM36.Relation
2import ProjectM36.Relation
4import ProjectM36.Tuple
3import ProjectM36.Tuple
@@ -531,4 +530,4 @@ evalTupleExpr context attrs (TupleExpr tupMap) = do
531 when (A.attributeNameSet finalAttrs /= A.attributeNameSet tupAttrs) (traceShow (finalAttrs,tupAttrs) $ Left (TupleAttributeTypeMismatchError tupAttrs))
530 when (A.attributeNameSet finalAttrs /= A.attributeNameSet tupAttrs) (traceShow (finalAttrs,tupAttrs) $ Left (TupleAttributeTypeMismatchError tupAttrs))
532 tup' <- resolveTypesInTuple finalAttrs (reorderTuple finalAttrs tup)
531 tup' <- resolveTypesInTuple finalAttrs (reorderTuple finalAttrs tup)
533 _ <- validateTuple tup' tConss
532 _ <- validateTuple tup' tConss
534− pure tup'
533+ pure tup'
ProjectM36/Sessions.hs−1
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2module ProjectM36.Sessions where
1module ProjectM36.Sessions where
3import Control.Concurrent.STM
2import Control.Concurrent.STM
4import qualified STMContainers.Map as STMMap
3import qualified STMContainers.Map as STMMap
ProjectM36/Transaction.hs−1
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2module ProjectM36.Transaction where
1module ProjectM36.Transaction where
3import ProjectM36.Base
2import ProjectM36.Base
4import qualified Data.Set as S
3import qualified Data.Set as S
ProjectM36/TransactionGraph.hs+1−1
@@ -1,4 +1,4 @@
1−{-# LANGUAGE OverloadedStrings, DeriveAnyClass, DeriveGeneric #-}
1+{-# LANGUAGE DeriveAnyClass, DeriveGeneric #-}
2module ProjectM36.TransactionGraph where
2module ProjectM36.TransactionGraph where
3import ProjectM36.Base
3import ProjectM36.Base
4import ProjectM36.Error
4import ProjectM36.Error
ProjectM36/TransactionGraph/Persist.hs−1
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2module ProjectM36.TransactionGraph.Persist where
1module ProjectM36.TransactionGraph.Persist where
3import ProjectM36.Error
2import ProjectM36.Error
4import ProjectM36.TransactionGraph
3import ProjectM36.TransactionGraph
ProjectM36/TransactionGraph/Show.hs+1−2
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2module ProjectM36.TransactionGraph.Show where
1module ProjectM36.TransactionGraph.Show where
3import ProjectM36.Base
2import ProjectM36.Base
4import ProjectM36.TransactionGraph
3import ProjectM36.TransactionGraph
@@ -19,4 +18,4 @@ showGraphStructure graph@(TransactionGraph _ transSet) = S.foldr folder "" trans
19 where
18 where
20 folder trans acc = acc ++ showTransactionStructure trans graph ++ "\n"
19 folder trans acc = acc ++ showTransactionStructure trans graph ++ "\n"
21
20
22−
21+
TutorialD/Interpreter.hs+1−1
@@ -1,4 +1,4 @@
1−{-# LANGUAGE GADTs,OverloadedStrings #-}
1+{-# LANGUAGE GADTs #-}
2module TutorialD.Interpreter where
2module TutorialD.Interpreter where
3import TutorialD.Interpreter.Base
3import TutorialD.Interpreter.Base
4import TutorialD.Interpreter.RODatabaseContextOperator
4import TutorialD.Interpreter.RODatabaseContextOperator
TutorialD/Interpreter/Base.hs−1
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2module TutorialD.Interpreter.Base where
1module TutorialD.Interpreter.Base where
3import Text.Parsec
2import Text.Parsec
4import Text.Parsec.String
3import Text.Parsec.String
TutorialD/Interpreter/DatabaseContextExpr.hs−1
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2module TutorialD.Interpreter.DatabaseContextExpr where
1module TutorialD.Interpreter.DatabaseContextExpr where
3import Text.Parsec
2import Text.Parsec
4import Text.Parsec.String
3import Text.Parsec.String
TutorialD/Interpreter/InformationOperator.hs+1−1
@@ -1,4 +1,4 @@
1−{-# LANGUAGE CPP, OverloadedStrings #-}
1+{-# LANGUAGE CPP #-}
2module TutorialD.Interpreter.InformationOperator where
2module TutorialD.Interpreter.InformationOperator where
3import Data.Text
3import Data.Text
4import Text.Parsec
4import Text.Parsec
TutorialD/Interpreter/RODatabaseContextOperator.hs+2−2
@@ -1,4 +1,4 @@
1−{-# LANGUAGE GADTs,OverloadedStrings #-}
1+{-# LANGUAGE GADTs #-}
2module TutorialD.Interpreter.RODatabaseContextOperator where
2module TutorialD.Interpreter.RODatabaseContextOperator where
3import ProjectM36.Base
3import ProjectM36.Base
4import qualified ProjectM36.Client as C
4import qualified ProjectM36.Client as C
@@ -135,4 +135,4 @@ interpretRODatabaseContextOp sessionId conn tutdstring = case parse roDatabaseCo
135 Left err -> pure $ DisplayErrorResult (T.pack (show err))
135 Left err -> pure $ DisplayErrorResult (T.pack (show err))
136 Right parsed -> evalRODatabaseContextOp sessionId conn parsed
136 Right parsed -> evalRODatabaseContextOp sessionId conn parsed
137
137
138−
138+
TutorialD/tutd.hs+1−1
@@ -1,4 +1,4 @@
1−{-# LANGUAGE OverloadedStrings, CPP #-}
1+{-# LANGUAGE CPP #-}
2import TutorialD.Interpreter
2import TutorialD.Interpreter
3import ProjectM36.Base
3import ProjectM36.Base
4import ProjectM36.Client
4import ProjectM36.Client
docs/on_null.markdown+1−1
@@ -377,7 +377,7 @@ Algebraic data types in SQL are effectively impossible.
377Any Haskell data type can be turned into a value (called an "atom") in Project:M36. The following example illustrates:
377Any Haskell data type can be turned into a value (called an "atom") in Project:M36. The following example illustrates:
378
378
379```haskell
379```haskell
380−{-# LANGUAGE OverloadedStrings,DeriveAnyClass,DeriveGeneric #-}
380+{-# LANGUAGE DeriveAnyClass,DeriveGeneric #-}
381module Hospital where
381module Hospital where
382
382
383import ProjectM36.Client
383import ProjectM36.Client
examples/Hospital.hs+2−2
@@ -1,4 +1,4 @@
1−{-# LANGUAGE OverloadedStrings,DeriveAnyClass,DeriveGeneric #-}
1+{-# LANGUAGE DeriveAnyClass,DeriveGeneric #-}
2module Hospital where
2module Hospital where
3
3
4import ProjectM36.Client
4import ProjectM36.Client
@@ -60,4 +60,4 @@ runExample = do
60 Just age_value_out' -> do
60 Just age_value_out' -> do
61 putStrLn (show (age_value_in == age_value_out'))
61 putStrLn (show (age_value_in == age_value_out'))
62
62
63−
63+
examples/SimpleClient.hs+1−2
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2import ProjectM36.Client
1import ProjectM36.Client
3import ProjectM36.TupleSet
2import ProjectM36.TupleSet
4import ProjectM36.Atom
3import ProjectM36.Atom
@@ -39,4 +38,4 @@ main = do
39 Right rel -> putStrLn (show $ showRelation rel)
38 Right rel -> putStrLn (show $ showRelation rel)
40
39
41 --7. close the connection
40 --7. close the connection
42− close conn
41+ close conn
examples/out_of_the_tarpit.hs+2−2
@@ -1,5 +1,5 @@
1-- the Out-of-the-Tarpit example in Haskell and Project:M36
1-- the Out-of-the-Tarpit example in Haskell and Project:M36
2−{-# LANGUAGE OverloadedStrings, DeriveAnyClass #-}
2+{-# LANGUAGE DeriveAnyClass #-}
3import ProjectM36.Client
3import ProjectM36.Client
4import qualified Data.Text as T
4import qualified Data.Text as T
5import ProjectM36.Atom
5import ProjectM36.Atom
@@ -81,4 +81,4 @@ createSchema conn = do
81 mapM executeDatabaseContextExpr dbcontextExprs
81 mapM executeDatabaseContextExpr dbcontextExprs
82
82
83
83
84−
84+
project-m36.cabal+18
@@ -117,6 +117,7 @@ Library
117 C-sources: ProjectM36/DirectoryFsync.c
117 C-sources: ProjectM36/DirectoryFsync.c
118 Build-Depends: unix
118 Build-Depends: unix
119 Default-Language: Haskell2010
119 Default-Language: Haskell2010
120+ Default-Extensions: OverloadedStrings
120
121
121Executable tutd
122Executable tutd
122 Build-Depends: base >=4.8 && <4.9,
123 Build-Depends: base >=4.8 && <4.9,
@@ -216,6 +217,7 @@ Executable tutd
216 CPP-Options: -DPROJECTM36_VERSION="v0.1"
217 CPP-Options: -DPROJECTM36_VERSION="v0.1"
217 GHC-Options: -Wall
218 GHC-Options: -Wall
218 Default-Language: Haskell2010
219 Default-Language: Haskell2010
220+ Default-Extensions: OverloadedStrings
219 if os(windows)
221 if os(windows)
220 Build-Depends: Win32 >= 2.3 && < 2.4
222 Build-Depends: Win32 >= 2.3 && < 2.4
221 Other-Modules: ProjectM36.Win32Handle
223 Other-Modules: ProjectM36.Win32Handle
@@ -264,6 +266,7 @@ Executable project-m36-server
264 GHC-Options: -Wall -threaded -rtsopts
266 GHC-Options: -Wall -threaded -rtsopts
265 GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall
267 GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall
266 Default-Language: Haskell2010
268 Default-Language: Haskell2010
269+ Default-Extensions: OverloadedStrings
267 Other-Modules: ProjectM36.Atom,
270 Other-Modules: ProjectM36.Atom,
268 ProjectM36.AtomFunction,
271 ProjectM36.AtomFunction,
269 ProjectM36.AtomFunctions.Basic,
272 ProjectM36.AtomFunctions.Basic,
@@ -314,6 +317,7 @@ Executable project-m36-server
314
317
315Executable bigrel
318Executable bigrel
316 Default-Language: Haskell2010
319 Default-Language: Haskell2010
320+ Default-Extensions: OverloadedStrings
317 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, optparse-applicative, stm-containers, list-t
321 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, optparse-applicative, stm-containers, list-t
318 Other-Modules: ProjectM36.Base,
322 Other-Modules: ProjectM36.Base,
319 ProjectM36.Relation
323 ProjectM36.Relation
@@ -362,6 +366,7 @@ Executable bigrel
362
366
363Test-Suite test-tutoriald
367Test-Suite test-tutoriald
364 Default-Language: Haskell2010
368 Default-Language: Haskell2010
369+ Default-Extensions: OverloadedStrings
365 type: exitcode-stdio-1.0
370 type: exitcode-stdio-1.0
366 main-is: test/TutorialD/Interpreter.hs
371 main-is: test/TutorialD/Interpreter.hs
367 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, stm-containers, list-t
372 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, stm-containers, list-t
@@ -378,6 +383,7 @@ Test-Suite test-tutoriald
378
383
379Test-Suite test-relation
384Test-Suite test-relation
380 Default-Language: Haskell2010
385 Default-Language: Haskell2010
386+ Default-Extensions: OverloadedStrings
381 type: exitcode-stdio-1.0
387 type: exitcode-stdio-1.0
382 main-is: test/Relation/Basic.hs
388 main-is: test/Relation/Basic.hs
383 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, stm-containers
389 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, stm-containers
@@ -387,6 +393,7 @@ Test-Suite test-relation
387
393
388Test-Suite test-static-optimizer
394Test-Suite test-static-optimizer
389 Default-Language: Haskell2010
395 Default-Language: Haskell2010
396+ Default-Extensions: OverloadedStrings
390 type: exitcode-stdio-1.0
397 type: exitcode-stdio-1.0
391 main-is: test/Relation/StaticOptimizer.hs
398 main-is: test/Relation/StaticOptimizer.hs
392 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, stm-containers
399 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, stm-containers
@@ -396,6 +403,7 @@ Test-Suite test-static-optimizer
396
403
397Test-Suite test-transactiongraph-persist
404Test-Suite test-transactiongraph-persist
398 Default-Language: Haskell2010
405 Default-Language: Haskell2010
406+ Default-Extensions: OverloadedStrings
399 type: exitcode-stdio-1.0
407 type: exitcode-stdio-1.0
400 main-is: test/TransactionGraph/Persist.hs
408 main-is: test/TransactionGraph/Persist.hs
401 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, stm-containers
409 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, stm-containers
@@ -412,6 +420,7 @@ Test-Suite test-transactiongraph-persist
412
420
413Test-Suite test-relation-import-csv
421Test-Suite test-relation-import-csv
414 Default-Language: Haskell2010
422 Default-Language: Haskell2010
423+ Default-Extensions: OverloadedStrings
415 type: exitcode-stdio-1.0
424 type: exitcode-stdio-1.0
416 main-is: test/Relation/Import/CSV.hs
425 main-is: test/Relation/Import/CSV.hs
417 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, stm-containers
426 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, stm-containers
@@ -421,6 +430,7 @@ Test-Suite test-relation-import-csv
421
430
422Test-Suite test-tutoriald-import-tutoriald
431Test-Suite test-tutoriald-import-tutoriald
423 Default-Language: Haskell2010
432 Default-Language: Haskell2010
433+ Default-Extensions: OverloadedStrings
424 type: exitcode-stdio-1.0
434 type: exitcode-stdio-1.0
425 main-is: test/TutorialD/Interpreter/Import/TutorialD.hs
435 main-is: test/TutorialD/Interpreter/Import/TutorialD.hs
426 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, stm-containers
436 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, stm-containers
@@ -430,6 +440,7 @@ Test-Suite test-tutoriald-import-tutoriald
430
440
431Test-Suite test-relation-export-csv
441Test-Suite test-relation-export-csv
432 Default-Language: Haskell2010
442 Default-Language: Haskell2010
443+ Default-Extensions: OverloadedStrings
433 type: exitcode-stdio-1.0
444 type: exitcode-stdio-1.0
434 main-is: test/Relation/Export/CSV.hs
445 main-is: test/Relation/Export/CSV.hs
435 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, stm-containers
446 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, stm-containers
@@ -439,6 +450,7 @@ Test-Suite test-relation-export-csv
439
450
440Test-Suite test-persistent-driver
451Test-Suite test-persistent-driver
441 Default-Language: Haskell2010
452 Default-Language: Haskell2010
453+ Default-Extensions: OverloadedStrings
442 type: exitcode-stdio-1.0
454 type: exitcode-stdio-1.0
443 main-is: test/persistent-driver/test.hs
455 main-is: test/persistent-driver/test.hs
444 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, template-haskell, transformers, aeson, persistent-template, conduit, persistent >= 2.2 && < 2.3, either, path-pieces, http-api-data, stm-containers, list-t
456 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, template-haskell, transformers, aeson, persistent-template, conduit, persistent >= 2.2 && < 2.3, either, path-pieces, http-api-data, stm-containers, list-t
@@ -456,6 +468,7 @@ Test-Suite test-persistent-driver
456
468
457Test-Suite test-transactiongraph-merge
469Test-Suite test-transactiongraph-merge
458 Default-Language: Haskell2010
470 Default-Language: Haskell2010
471+ Default-Extensions: OverloadedStrings
459 type: exitcode-stdio-1.0
472 type: exitcode-stdio-1.0
460 main-is: test/TransactionGraph/Merge.hs
473 main-is: test/TransactionGraph/Merge.hs
461 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, unix, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, template-haskell, transformers, aeson, persistent-template, conduit, persistent, either, path-pieces, http-api-data, stm-containers, list-t
474 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, unix, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, template-haskell, transformers, aeson, persistent-template, conduit, persistent, either, path-pieces, http-api-data, stm-containers, list-t
@@ -466,6 +479,7 @@ Test-Suite test-transactiongraph-merge
466
479
467benchmark bench
480benchmark bench
468 Default-Language: Haskell2010
481 Default-Language: Haskell2010
482+ Default-Extensions: OverloadedStrings
469 type: exitcode-stdio-1.0
483 type: exitcode-stdio-1.0
470 main-is: benchmark/Relation.hs
484 main-is: benchmark/Relation.hs
471 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, criterion, stm-containers
485 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, criterion, stm-containers
@@ -474,6 +488,7 @@ benchmark bench
474
488
475Test-Suite test-server
489Test-Suite test-server
476 Default-Language: Haskell2010
490 Default-Language: Haskell2010
491+ Default-Extensions: OverloadedStrings
477 type: exitcode-stdio-1.0
492 type: exitcode-stdio-1.0
478 main-is: test/Server/Main.hs
493 main-is: test/Server/Main.hs
479 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t
494 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t
@@ -491,6 +506,7 @@ Test-Suite test-server
491
506
492Executable Example-SimpleClient
507Executable Example-SimpleClient
493 Default-Language: Haskell2010
508 Default-Language: Haskell2010
509+ Default-Extensions: OverloadedStrings
494 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t
510 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t
495 Main-Is: examples/SimpleClient.hs
511 Main-Is: examples/SimpleClient.hs
496 GHC-Options: -Wall
512 GHC-Options: -Wall
@@ -543,6 +559,7 @@ Executable Example-SimpleClient
543
559
544Executable Example-PersistClient
560Executable Example-PersistClient
545 Default-Language: Haskell2010
561 Default-Language: Haskell2010
562+ Default-Extensions: OverloadedStrings
546 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, persistent, aeson, path-pieces, either, conduit, http-api-data, template-haskell, persistent-template
563 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t, persistent, aeson, path-pieces, either, conduit, http-api-data, template-haskell, persistent-template
547 Main-Is: examples/PersistClient.hs
564 Main-Is: examples/PersistClient.hs
548 GHC-Options: -Wall
565 GHC-Options: -Wall
@@ -593,6 +610,7 @@ Executable Example-PersistClient
593
610
594Test-Suite test-scripts
611Test-Suite test-scripts
595 Default-Language: Haskell2010
612 Default-Language: Haskell2010
613+ Default-Extensions: OverloadedStrings
596 type: exitcode-stdio-1.0
614 type: exitcode-stdio-1.0
597 main-is: test/scripts.hs
615 main-is: test/scripts.hs
598 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t
616 Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, transformers, stm-containers, list-t
test/Relation/Basic.hs+1−2
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2import Test.HUnit
1import Test.HUnit
3import ProjectM36.Base
2import ProjectM36.Base
4import ProjectM36.Relation
3import ProjectM36.Relation
@@ -93,4 +92,4 @@ testMkRelationFromExprsBadAttrs = TestCase $ do
93 let context = DBC.empty
92 let context = DBC.empty
94 case evalState (evalRelationalExpr (MakeRelationFromExprs (Just [AttributeAndTypeNameExpr "badAttr1" (PrimitiveTypeConstructor "Int" intAtomType)]) [TupleExpr (M.singleton "badAttr2" (NakedAtomExpr (intAtom 1)))])) context of
93 case evalState (evalRelationalExpr (MakeRelationFromExprs (Just [AttributeAndTypeNameExpr "badAttr1" (PrimitiveTypeConstructor "Int" intAtomType)]) [TupleExpr (M.singleton "badAttr2" (NakedAtomExpr (intAtom 1)))])) context of
95 Left err -> assertEqual "tuple type mismatch" (TupleAttributeTypeMismatchError (A.attributesFromList [Attribute "badAttr2" intAtomType])) err
94 Left err -> assertEqual "tuple type mismatch" (TupleAttributeTypeMismatchError (A.attributesFromList [Attribute "badAttr2" intAtomType])) err
96− Right _ -> assertFailure "expected tuple type mismatch"
95+ Right _ -> assertFailure "expected tuple type mismatch"
test/Relation/Export/CSV.hs−1
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2import Test.HUnit
1import Test.HUnit
3import ProjectM36.Base
2import ProjectM36.Base
4import System.Exit
3import System.Exit
test/Relation/Import/CSV.hs−1
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2import Test.HUnit
1import Test.HUnit
3import ProjectM36.Base
2import ProjectM36.Base
4import ProjectM36.Relation.Parse.CSV
3import ProjectM36.Relation.Parse.CSV
test/Relation/StaticOptimizer.hs−1
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2import ProjectM36.Base
1import ProjectM36.Base
3import ProjectM36.Relation
2import ProjectM36.Relation
4import ProjectM36.DateExamples
3import ProjectM36.DateExamples
test/Server/Main.hs+1−2
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2{-
1{-
3test client/server interaction
2test client/server interaction
4-}
3-}
@@ -163,4 +162,4 @@ testNotification mvar sess conn = TestCase $ do
163 check $ commit sess conn
162 check $ commit sess conn
164 check $ executeDatabaseContextExpr sess conn (Assign "x" (ExistingRelation relationFalse))
163 check $ executeDatabaseContextExpr sess conn (Assign "x" (ExistingRelation relationFalse))
165 check $ commit sess conn
164 check $ commit sess conn
166− takeMVar mvar
165+ takeMVar mvar
test/TransactionGraph/Merge.hs−1
@@ -1,5 +1,4 @@
1-- tests for transaction merging
1-- tests for transaction merging
2−{-# LANGUAGE OverloadedStrings #-}
3import Test.HUnit
2import Test.HUnit
4import ProjectM36.Base
3import ProjectM36.Base
5import ProjectM36.Relation
4import ProjectM36.Relation
test/TransactionGraph/Persist.hs+2−2
@@ -1,4 +1,4 @@
1−{-# LANGUAGE OverloadedStrings,LambdaCase #-}
1+{-# LANGUAGE LambdaCase #-}
2import Test.HUnit
2import Test.HUnit
3import ProjectM36.Base
3import ProjectM36.Base
4import ProjectM36.Persist (DiskSync(NoDiskSync))
4import ProjectM36.Persist (DiskSync(NoDiskSync))
@@ -59,4 +59,4 @@ testDBSimplePersistence = TestCase $ withSystemTempDirectory "m36testdb" $ \temp
59 Right graph'' -> assertBool "graph equality" $ graph'' == graph'
59 Right graph'' -> assertBool "graph equality" $ graph'' == graph'
60
60
61
61
62−
62+
test/TutorialD/Interpreter.hs+1−2
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2import TutorialD.Interpreter.DatabaseContextExpr
1import TutorialD.Interpreter.DatabaseContextExpr
3import TutorialD.Interpreter
2import TutorialD.Interpreter
4import TutorialD.Interpreter.Base
3import TutorialD.Interpreter.Base
@@ -316,4 +315,4 @@ testMergeTransactions = TestCase $ do
316 eRv <- executeRelationalExpr sessionId dbconn (RelationVariable "conflictrv")
315 eRv <- executeRelationalExpr sessionId dbconn (RelationVariable "conflictrv")
317 case eRv of
316 case eRv of
318 Left err -> assertFailure (show err)
317 Left err -> assertFailure (show err)
319− Right conflictrv -> assertEqual "conflict union merge relvar" conflictCheck conflictrv
318+ Right conflictrv -> assertEqual "conflict union merge relvar" conflictCheck conflictrv
test/TutorialD/Interpreter/Import/TutorialD.hs+1−2
@@ -1,4 +1,3 @@
1−{-# LANGUAGE OverloadedStrings #-}
2import Test.HUnit
1import Test.HUnit
3import ProjectM36.Base
2import ProjectM36.Base
4import ProjectM36.Atom
3import ProjectM36.Atom
@@ -20,4 +19,4 @@ testTutdImport = TestCase $ do
20 hClose handle
19 hClose handle
21 let expectedExpr = MultipleExpr [Assign "x" (MakeRelationFromExprs Nothing [TupleExpr (M.fromList [("a",NakedAtomExpr $ intAtom 5),("b",NakedAtomExpr $ textAtom "spam")])])]
20 let expectedExpr = MultipleExpr [Assign "x" (MakeRelationFromExprs Nothing [TupleExpr (M.fromList [("a",NakedAtomExpr $ intAtom 5),("b",NakedAtomExpr $ textAtom "spam")])])]
22 imported <- importTutorialD tempPath
21 imported <- importTutorialD tempPath
23− assertEqual "import tutd" (Right expectedExpr) imported
22+ assertEqual "import tutd" (Right expectedExpr) imported
test/persistent-driver/test.hs+1−2
@@ -6,7 +6,6 @@
6{-# LANGUAGE TypeSynonymInstances #-}
6{-# LANGUAGE TypeSynonymInstances #-}
7{-# LANGUAGE MultiParamTypeClasses #-}
7{-# LANGUAGE MultiParamTypeClasses #-}
8{-# LANGUAGE GeneralizedNewtypeDeriving #-}
8{-# LANGUAGE GeneralizedNewtypeDeriving #-}
9−{-# LANGUAGE OverloadedStrings #-}
10{-# LANGUAGE FlexibleInstances #-}
9{-# LANGUAGE FlexibleInstances #-}
11import Test.HUnit
10import Test.HUnit
12import Database.Persist.ProjectM36
11import Database.Persist.ProjectM36
@@ -173,4 +172,4 @@ testSelectKeys = do
173 keysList <- selectKeysList [PersonAge ==. age2] []
172 keysList <- selectKeysList [PersonAge ==. age2] []
174 liftIO $ assertEqual "select keysList len" 1 (length keysList)
173 liftIO $ assertEqual "select keysList len" 1 (length keysList)
175 liftIO $ assertEqual "select keysList val" m2 (head keysList)
174 liftIO $ assertEqual "select keysList val" m2 (head keysList)
176−
175+