summaryrefslogtreecommitdiff
path: root/src/server
diff options
context:
space:
mode:
authorhallgren <hallgren@chalmers.se>2017-02-21 13:21:59 +0000
committerhallgren <hallgren@chalmers.se>2017-02-21 13:21:59 +0000
commitae512e09e0ea8e260145be3c74c40853dfc71219 (patch)
tree1e91c497a6d7ae9494f86f99db5d4d32a3f28ea0 /src/server
parent94f41cc63dfc0a55d8957762500eb93f2331e1da (diff)
Fix compilation errors caused by changes in PGF2
These prevented GF from being built with C run-time support (-fc-runtime).
Diffstat (limited to 'src/server')
-rw-r--r--src/server/PGFService.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/PGFService.hs b/src/server/PGFService.hs
index 4647c4eb4..d84f2b3c2 100644
--- a/src/server/PGFService.hs
+++ b/src/server/PGFService.hs
@@ -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'