gfse: edit abstract syntax in text mode with instant syntax error reporting

This is an experimental feature. It requires server support for parsing and is
thus not available while offline, unlike most other editing functionality.

1 files changed, 13 insertions, 10 deletions

diff --git a/src/compiler/GFServer.hs b/src/compiler/GFServer.hs
index 3fcec3f4d..cb66137b2 100644
--- a/src/compiler/GFServer.hs
+++ b/src/compiler/GFServer.hs
@@ -21,10 +21,9 @@ import Network.URI(URI(..),parseURI)
 import Network.Shed.Httpd(initServer,Request(..),Response(..),queryToArguments,
                           noCache)
 --import qualified Network.FastCGI as FCGI -- from hackage direct-fastcgi
---import qualified Data.ByteString.Char8 as BS(pack,unpack,length)
 import Network.CGI(handleErrors,liftIO)
 import FastCGIUtils(outputJSONP,handleCGIErrors,stderrToFile)
-import Text.JSON(encode,showJSON,toJSObject)
+import Text.JSON(encode,showJSON,makeObj)
 import System.IO.Silently(hCapture)
 import System.Process(readProcessWithExitCode)
 import System.Exit(ExitCode(..))
@@ -35,6 +34,7 @@ import qualified ExampleService as ES
 import Data.Version(showVersion)
 import Paths_gf(getDataDir,version)
 import GF.Infra.BuildInfo (buildInfo)
+import SimpleEditor.Convert(parseModule)
 import RunHTTP(cgiHandler)
 
 --logFile :: FilePath
@@ -105,6 +105,7 @@ handle state0 cache execute1
 --         "/stop" ->
 --         "/start" ->
            "/gfshell" -> inDir qs $ look "command" . command
+           "/parse" -> parse qs
            "/cloud" -> inDir qs $ look "command" . cloud
            '/':rpath ->
              case (takeDirectory path,takeFileName path,takeExtension path) of
@@ -157,6 +158,8 @@ handle state0 cache execute1
          let state' = maybe state (flip (M.insert dir) state) st'
          return (state',ok200 output)
 
+    parse qs = return (state,json200 (makeObj (map parseModule qs)))
+
     cloud dir cmd qs =
       case cmd of
         "make" -> make dir qs
@@ -226,14 +229,12 @@ handle state0 cache execute1
 -- * Dynamic content
 
 jsonresult cwd dir cmd (ecode,stdout,stderr) files =
-  toJSObject [
-    field "errorcode" (if ecode==ExitSuccess then "OK" else "Error"),
-    field "command" cmd,
-    field "output" (unlines [rel stderr,rel stdout]),
-    field "minibar_url" ("/minibar/minibar.html?"++dir++pgf)]
+  makeObj [
+    prop "errorcode" (if ecode==ExitSuccess then "OK" else "Error"),
+    prop "command" cmd,
+    prop "output" (unlines [rel stderr,rel stdout]),
+    prop "minibar_url" ("/minibar/minibar.html?"++dir++pgf)]
   where
-    field n v = (n,showJSON v)
-
     pgf = case files of
             (abstract,_):_ -> "%20"++dropExtension abstract++".pgf"
             _ -> ""
@@ -390,4 +391,6 @@ inputs = queryToArguments . fixplus
     decode '+' = "%20" -- httpd-shed bug workaround
     decode c   = [c]
 
-mapFst f xys = [(f x,y)|(x,y)<-xys]
\ No newline at end of file
+mapFst f xys = [(f x,y)|(x,y)<-xys]
+
+prop n v = (n,showJSON v)