msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

canonical GF: flatten several concatenations into one json array, and parse the array back into concatenations

Browse Source
This commit is contained in:
Peter Ljunglöf
2019-03-08 18:33:56 +01:00
parent 926a5cf414
commit 01b9e8da8d
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/compiler/GF/Grammar/CanonicalJSON.hs
View File

@@ -136,8 +136,6 @@ instance JSON LinType where
instance JSON LinValue where instance JSON LinValue where
showJSON (LiteralValue l ) = showJSON l showJSON (LiteralValue l ) = showJSON l
-- concatenation is encoded as a JSON array:
showJSON (ConcatValue v v') = showJSON [showJSON v, showJSON v']
-- most values are encoded as JSON objects: -- most values are encoded as JSON objects:
showJSON (ParamConstant pv) = makeObj [(".param", showJSON pv)] showJSON (ParamConstant pv) = makeObj [(".param", showJSON pv)]
showJSON (PredefValue p ) = makeObj [(".predef", showJSON p)] showJSON (PredefValue p ) = makeObj [(".predef", showJSON p)]
@@ -151,6 +149,10 @@ instance JSON LinValue where
showJSON (PreValue pre def) = makeObj [(".pre", showJSON pre),(".default", showJSON def)] showJSON (PreValue pre def) = makeObj [(".pre", showJSON pre),(".default", showJSON def)]
-- records are encoded directly as JSON records: -- records are encoded directly as JSON records:
showJSON (RecordValue rows) = showJSON rows showJSON (RecordValue rows) = showJSON rows
-- concatenation is encoded as a JSON array:
showJSON v@(ConcatValue _ _) = showJSON (flatten v [])
where flatten (ConcatValue v v') = flatten v . flatten v'
flatten v = (v :)
readJSON o = LiteralValue <$> readJSON o readJSON o = LiteralValue <$> readJSON o
<|> ParamConstant <$> o!".param" <|> ParamConstant <$> o!".param"
@@ -164,6 +166,8 @@ instance JSON LinValue where
<|> VariantValue <$> o!".variants" <|> VariantValue <$> o!".variants"
<|> PreValue <$> o!".pre" <*> o!".default" <|> PreValue <$> o!".pre" <*> o!".default"
<|> RecordValue <$> readJSON o <|> RecordValue <$> readJSON o
<|> do vs <- readJSON o :: Result [LinValue]
return (foldr1 ConcatValue vs)
instance JSON LinLiteral where instance JSON LinLiteral where
-- basic values (Str, Float, Int) are encoded as JSON strings/numbers: -- basic values (Str, Float, Int) are encoded as JSON strings/numbers: