on master help sign in
Renamed StringValue -> StringLiteral. Moved quotes from tests to StringLiteral's arbitrary
cda0a68techtangents
elm/tests/Main.hs+4−4
@@ -27,11 +27,11 @@ tests = [
27 ]
27 ]
28 ]
28 ]
29
29
30−prop_assignString :: ValidIdent -> StringValue -> Bool
30+prop_assignString :: ValidIdent -> StringLiteral -> Bool
31prop_assignString i s =
31prop_assignString i s =
32− parses [qq|{i} = "{s}"|]
32+ parses [qq|{i} = {s}|]
33
33
34−prop_invalidIdent :: ValidIdent -> InvalidIdentChar -> StringValue -> Bool
34+prop_invalidIdent :: ValidIdent -> InvalidIdentChar -> StringLiteral -> Bool
35prop_invalidIdent i z s =
35prop_invalidIdent i z s =
36− parseFails [qq|{i}{z} = "{s}"|]
36+ parseFails [qq|{i}{z} = {s}|]
37
37
elm/tests/Util/Arbs.hs+5−5
@@ -17,13 +17,13 @@ instance Arbitrary ValidIdent where
17 arbitrary = ValidIdent <$> ((:) <$> lowerAlpha <*> (listOf alphaNumUnderPrime))
17 arbitrary = ValidIdent <$> ((:) <$> lowerAlpha <*> (listOf alphaNumUnderPrime))
18
18
19
19
20−newtype StringValue = StringValue String deriving (Eq, Show)
20+newtype StringLiteral = StringLiteral String deriving (Eq, Show)
21
21
22−instance ShowQ StringValue where
22+instance ShowQ StringLiteral where
23− showQ (StringValue v) = v
23+ showQ (StringLiteral v) = v
24
24
25−instance Arbitrary StringValue where
25+instance Arbitrary StringLiteral where
26− arbitrary = StringValue <$> escape <$> arbitrary
26+ arbitrary = StringLiteral <$> (\x -> "\"" ++ x ++ "\"") <$> escape <$> arbitrary
27
27
28
28
29newtype InvalidIdentChar = InvalidIdentChar Char deriving (Eq, Show)
29newtype InvalidIdentChar = InvalidIdentChar Char deriving (Eq, Show)