From 5d4b849b140a3df4211294029b16aad4a3dbdb0d Mon Sep 17 00:00:00 2001 From: hallgren Date: Tue, 8 Apr 2014 20:45:54 +0000 Subject: [PATCH] Fix build problem in PGFService.hs when configured without c-runtime --- src/server/PGFService.hs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/server/PGFService.hs b/src/server/PGFService.hs index e0b6cd274..9364475d4 100644 --- a/src/server/PGFService.hs +++ b/src/server/PGFService.hs @@ -167,15 +167,6 @@ cpgfMain command (pgf,pc) = let t = C.readExpr s maybe (badRequest "bad tree" s) return t -lexer = maybe (return id) lexerfun =<< getInput "lexer" - where - lexerfun name = - case name of - "text" -> return (unwords . lexText) - "code" -> return (unwords . lexCode) - "mixed" -> return (unwords . lexMixed) - _ -> throwCGIError 400 "Unknown lexer" ["Unknown lexer: "++name] - {- instance JSON C.CId where readJSON x = readJSON x >>= maybe (fail "Bad language.") return . C.readCId @@ -187,6 +178,15 @@ instance JSON C.Expr where #endif +lexer = maybe (return id) lexerfun =<< getInput "lexer" + where + lexerfun name = + case name of + "text" -> return (unwords . lexText) + "code" -> return (unwords . lexCode) + "mixed" -> return (unwords . lexMixed) + _ -> throwCGIError 400 "Unknown lexer" ["Unknown lexer: "++name] + -------------------------------------------------------------------------------- -- * Haskell run-time functionality