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