Fix compilation errors caused by changes in PGF2

These prevented GF from being built with C run-time support (-fc-runtime).
This commit is contained in:
hallgren
2017-02-21 13:21:59 +00:00
parent 94f41cc63d
commit ae512e09e0
3 changed files with 9 additions and 7 deletions

View File

@@ -167,7 +167,7 @@ cpgfMain qsem command (t,(pgf,pc)) =
grammar = showJSON $ makeObj
["name".=C.abstractName pgf,
"lastmodified".=show t,
"startcat".=C.startCat pgf,
"startcat".=C.showType [] (C.startCat pgf),
"languages".=languages]
where
languages = [makeObj ["name".= l] | (l,_)<-Map.toList langs]
@@ -313,7 +313,7 @@ instance JSON C.CId where
-}
instance JSON C.Expr where
readJSON x = readJSON x >>= maybe (fail "Bad expression.") return . C.readExpr
showJSON = showJSON . C.showExpr
showJSON = showJSON . C.showExpr []
-- | Convert a 'Tree' to an 'ATree'