GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-05-23 09:52:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix the error checking in the word completion

Browse Source
This commit is contained in:
kr.angelov
2008-06-05 12:00:51 +00:00
parent b8854ea2f4
commit abea46022e
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src-3.0/GFI.hs
View File

@@ -114,7 +114,7 @@ emptyGFEnv :: GFEnv
emptyGFEnv = GFEnv emptyGrammar (mkCommandEnv emptyPGF) [] 0 emptyGFEnv = GFEnv emptyGrammar (mkCommandEnv emptyPGF) [] 0
wordCompletion cmdEnv line prefix p = do wordCompletion cmdEnv line prefix p =
case wc_type (take p line) of case wc_type (take p line) of
CmplCmd pref CmplCmd pref
-> ret ' ' [name | name <- Map.keys (commands cmdEnv), isPrefixOf pref name] -> ret ' ' [name | name <- Map.keys (commands cmdEnv), isPrefixOf pref name]
@@ -134,7 +134,10 @@ wordCompletion cmdEnv line prefix p = do
(flg_compls++opt_compls) (flg_compls++opt_compls)
Nothing -> ret ' ' [] Nothing -> ret ' ' []
CmplIdent _ pref CmplIdent _ pref
-> ret ' ' [name | cid <- Map.keys (funs (abstract pgf)), let name = prCId cid, isPrefixOf pref name] -> do mb_abs <- try (evaluate (abstract pgf))
case mb_abs of
Right abs -> ret ' ' [name | cid <- Map.keys (funs abs), let name = prCId cid, isPrefixOf pref name]
Left _ -> ret ' ' []
_ -> ret ' ' [] _ -> ret ' ' []
where where
pgf = multigrammar cmdEnv pgf = multigrammar cmdEnv