83df846 · project-m36 · git.iko.soy

git.iko.soy/project-m36

--amend

commit83df846f95ed99489400fb529b7abac97da7b143 authorJohnny Liao <dycan0716@gmail.com> dateMon 4 Jun 2018, 15:24 (8 years ago) parentbfa3f0a

4 files changed+8−6

compare with master

unifiedsplit

src/bin/TutorialD/Interpreter/DatabaseContextExpr.hs−1 src/bin/TutorialD/Interpreter/DatabaseContextIOOperator.hs−1 src/lib/ProjectM36/.ghci+6 src/lib/ProjectM36/Arbitrary.hs+2−4

src/bin/TutorialD/Interpreter/DatabaseContextExpr.hs−1

@@ -16,7 +16,6 @@ import ProjectM36.Key

1616import ProjectM36.FunctionalDependency

1717import Data.Monoid

1818import Data.Functor

19−import Debug.Trace

2019

2120--parsers which create "database expressions" which modify the database context (such as relvar assignment)

2221databaseContextExprP :: Parser DatabaseContextExpr

src/bin/TutorialD/Interpreter/DatabaseContextIOOperator.hs−1

@@ -7,7 +7,6 @@ import TutorialD.Interpreter.Types

77import Text.Megaparsec

88import Text.Megaparsec.Text

99import Data.Text

10−import Debug.Trace

1110

1211addAtomFunctionExprP :: Parser DatabaseContextIOExpr

1312addAtomFunctionExprP = dbioexprP "addatomfunction" AddAtomFunction

src/lib/ProjectM36/.ghcinew file+6

@@ -0,0 +1,6 @@

1+import Fake.Provider.Person.EN_US

2+import Test.QuickCheck.Arbitrary

3+import Test.QuickCheck

4+import System.Random

5+import Conversion

6+import System.Random.TF.Gen

src/lib/ProjectM36/Arbitrary.hs+2−4

@@ -15,7 +15,6 @@ import Test.QuickCheck

1515import qualified Data.ByteString.Char8 as B

1616import Data.Time

1717import Control.Monad.Reader

18−import Debug.Trace

1918arbitrary' :: AtomType -> WithTCMap Gen (Either RelationalError Atom)

2019arbitrary' IntegerAtomType =

2120 Right . IntegerAtom <$> lift (arbitrary :: Gen Integer)

@@ -48,13 +47,12 @@ arbitrary' ByteStringAtomType =

4847arbitrary' BoolAtomType =

4948 Right . BoolAtom <$> lift (arbitrary :: Gen Bool)

5049arbitrary' constructedAtomType@(ConstructedAtomType tcName tvMap)

51− | traceShow constructedAtomType False = undefined

5250 --special-casing for Interval type

5351 | isIntervalAtomType constructedAtomType = createArbitraryInterval (intervalSubType constructedAtomType)

5452 | otherwise = do

5553 tcMap <- ask

5654 let maybeTCons = findTypeConstructor tcName tcMap

57− let eitherTCons = traceShowId $ maybeToRight (NoSuchTypeConstructorName tcName) maybeTCons

55+ let eitherTCons = maybeToRight (NoSuchTypeConstructorName tcName) maybeTCons

5856 let eitherDCDefs = snd <$> eitherTCons

5957 let eitherGenDCDef = elements <$> eitherDCDefs

6058 case eitherGenDCDef of

@@ -77,7 +75,7 @@ maybeToRight _ (Just x) = Right x

7775maybeToRight y Nothing = Left y

7876

7977instance Arbitrary Text where

80− arbitrary = pack <$> elements ["Mary", "Johnny", "Sunny", "Ted"]

78+ arbitrary = pack <$> (elements $ map (replicate 3) ['A'..'Z'])

8179

8280instance Arbitrary Day where

8381 arbitrary = ModifiedJulianDay <$> (arbitrary :: Gen Integer)