GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-16 00:09:31 -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)])
, ("functions", JSArray (map ffun2json (Array.elems (cncfuns cnc))))
, ("sequences", JSArray (map seq2json (Array.elems (sequences cnc))))
, ("startCats", JSON.makeObj $ map cats2json (Map.assocs (cnccats cnc)))
, ("totalFIds", mkJSInt (totalCats cnc))
, ("categories", JSON.makeObj $ map cats2json (Map.assocs (cnccats cnc)))
, ("totalfids", mkJSInt (totalCats cnc))
]
cats2json :: (CId, CncCat) -> (String,JSValue)
cats2json (c,CncCat start end _) = (showCId c, ixs)
where
ixs = JSON.makeObj
[ ("s", mkJSInt start)
, ("e", mkJSInt end)
[ ("start", mkJSInt start)
, ("end", mkJSInt end)
]
frule2json :: Production -> JSValue

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

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