Minor renamings in JSON format

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

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