diff options
| -rw-r--r-- | src/compiler/GF/Compile/PGFtoJSON.hs | 8 | ||||
| -rw-r--r-- | src/compiler/GF/Compile/pgf.schema.json | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/src/compiler/GF/Compile/PGFtoJSON.hs b/src/compiler/GF/Compile/PGFtoJSON.hs index 3fd3b60cb..e634dae67 100644 --- a/src/compiler/GF/Compile/PGFtoJSON.hs +++ b/src/compiler/GF/Compile/PGFtoJSON.hs @@ -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 diff --git a/src/compiler/GF/Compile/pgf.schema.json b/src/compiler/GF/Compile/pgf.schema.json index a8f31e399..2058e9a70 100644 --- a/src/compiler/GF/Compile/pgf.schema.json +++ b/src/compiler/GF/Compile/pgf.schema.json @@ -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" } } |