GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-24 18:28:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Minor renamings in JSON format

Browse Source
This commit is contained in:
John J. Camilleri
2019-07-10 08:49:00 +02:00
parent acd4a5e8cd
commit eab9fb88aa
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/compiler/GF/Compile/PGFtoJSON.hs
View File

@@ -81,16 +81,16 @@ concrete2json (c,cnc) = (showCId c,obj)
, ("productions", JSON.makeObj [ (show cat, JSArray (map frule2json (Set.toList set))) | (cat,set) <- IntMap.toList (productions cnc)]) , ("productions", JSON.makeObj [ (show cat, JSArray (map frule2json (Set.toList set))) | (cat,set) <- IntMap.toList (productions cnc)])
, ("functions", JSArray (map ffun2json (Array.elems (cncfuns cnc)))) , ("functions", JSArray (map ffun2json (Array.elems (cncfuns cnc))))
, ("sequences", JSArray (map seq2json (Array.elems (sequences cnc)))) , ("sequences", JSArray (map seq2json (Array.elems (sequences cnc))))
, ("startCats", JSON.makeObj $ map cats2json (Map.assocs (cnccats cnc))) , ("categories", JSON.makeObj $ map cats2json (Map.assocs (cnccats cnc)))
, ("totalFIds", mkJSInt (totalCats cnc)) , ("totalfids", mkJSInt (totalCats cnc))
] ]
cats2json :: (CId, CncCat) -> (String,JSValue) cats2json :: (CId, CncCat) -> (String,JSValue)
cats2json (c,CncCat start end _) = (showCId c, ixs) cats2json (c,CncCat start end _) = (showCId c, ixs)
where where
ixs = JSON.makeObj ixs = JSON.makeObj
[ ("s", mkJSInt start) [ ("start", mkJSInt start)
, ("e", mkJSInt end) , ("end", mkJSInt end)
] ]
frule2json :: Production -> JSValue frule2json :: Production -> JSValue

16
src/compiler/GF/Compile/pgf.schema.json
View File

@@ -53,8 +53,8 @@
"productions", "productions",
"functions", "functions",
"sequences", "sequences",
"startCats", "categories",
"totalFIds" "totalfids"
], ],
"properties": { "properties": {
"flags": { "flags": {
@@ -106,26 +106,26 @@
} }
} }
}, },
"startCats": { "categories": {
"type": "object", "type": "object",
"additionalProperties": { "additionalProperties": {
"title": "CncCat", "title": "CncCat",
"type": "object", "type": "object",
"required": [ "required": [
"s", "start",
"e" "end"
], ],
"properties": { "properties": {
"s": { "start": {
"type": "integer" "type": "integer"
}, },
"e": { "end": {
"type": "integer" "type": "integer"
} }
} }
} }
}, },
"totalFIds": { "totalfids": {
"type": "integer" "type": "integer"
} }
} }