summaryrefslogtreecommitdiff
path: root/src/example-based
diff options
context:
space:
mode:
Diffstat (limited to 'src/example-based')
-rw-r--r--src/example-based/ExampleDemo.hs4
-rw-r--r--src/example-based/ExampleService.hs10
-rw-r--r--src/example-based/todo.txt2
3 files changed, 10 insertions, 6 deletions
diff --git a/src/example-based/ExampleDemo.hs b/src/example-based/ExampleDemo.hs
index 2f344f0a3..1d5fabcaf 100644
--- a/src/example-based/ExampleDemo.hs
+++ b/src/example-based/ExampleDemo.hs
@@ -42,8 +42,8 @@ data Environ = Env {getTypeMap :: TypeMap, -- mapping between a
}
-getNext :: Environ -> ([MyFunc],[MyFunc])
-getNext env =
+getNext :: Environ -> Environ -> ([MyFunc],[MyFunc])
+getNext env example_env =
let sgs = getSigs env
allfuncs = getAll env
names = Set.fromList $ map getName $ concat $ Map.elems sgs
diff --git a/src/example-based/ExampleService.hs b/src/example-based/ExampleService.hs
index 0065fd4dd..185e4fd94 100644
--- a/src/example-based/ExampleService.hs
+++ b/src/example-based/ExampleService.hs
@@ -22,12 +22,16 @@ cgiMain' root cwd cache =
do command <- getInp "command"
environ <- parseEnviron =<< getInp "state"
case command of
- "possibilities" -> outputJSONP (E.getNext environ)
- "provide_example" -> doProvideExample root cwd cache environ
+ "possibilities" -> doPossibilities environ
+ "provide_example" -> doProvideExample root cwd cache environ
"abstract_example" -> doAbstractExample cwd cache environ
- "test_function" -> doTestFunction cwd cache environ
+ "test_function" -> doTestFunction cwd cache environ
_ -> throwCGIError 400 ("Unknown command: "++command) []
+doPossibilities environ =
+ do example_environ <- parseEnviron =<< getInp "example_state"
+ outputJSONP (E.getNext environ example_environ)
+
doProvideExample root cwd cache environ =
do Just lang <- readInput "lang"
fun <- getCId "fun"
diff --git a/src/example-based/todo.txt b/src/example-based/todo.txt
index ebecba435..196dbc097 100644
--- a/src/example-based/todo.txt
+++ b/src/example-based/todo.txt
@@ -1,7 +1,7 @@
Editor improvements for example-based grammar writing:
+ Remove the same language from the example language menu
-- Send the other language environment to getNext
++ Send the other language environment to getNext
- Compile a new .pgf automatically when needed
- Update buttons automatically when functions are added or removed
- Switch over to using AbsParadigmsEng.pgf instead of the old exprToAPI function