GitHub/gf-core
1
0
Fork 1
mirror of https://github.com/GrammaticalFramework/gf-core.git synced 2026-04-23 11:42:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

edit command ct pos

Browse Source
This commit is contained in:
aarne
2005-08-17 13:43:50 +00:00
parent 73c6ae2a4c
commit dfba9956ae
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/GF/Shell/CommandL.hs
View File

@@ -5,9 +5,9 @@
-- Stability : (stable) -- Stability : (stable)
-- Portability : (portable) -- Portability : (portable)
-- --
-- > CVS $Date: 2005/06/11 20:27:05 $ -- > CVS $Date: 2005/08/17 14:43:50 $
-- > CVS $Author: aarne $ -- > CVS $Author: aarne $
-- > CVS $Revision: 1.19 $ -- > CVS $Revision: 1.20 $
-- --
-- (Description of the module) -- (Description of the module)
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
@@ -110,6 +110,7 @@ pCommandMsg s = (m,pCommandWords $ words c) where
"'" : _ -> CTop "'" : _ -> CTop
"+" : _ -> CLast "+" : _ -> CLast
"mp" : p -> CMovePosition (readIntList (unwords p)) "mp" : p -> CMovePosition (readIntList (unwords p))
"ct" : p -> CCopyPosition (readIntList (unwords p))
"r" : f : _ -> CRefineWithAtom f "r" : f : _ -> CRefineWithAtom f
"w" : f:i : _ -> CWrapWithFun (f, readIntArg i) "w" : f:i : _ -> CWrapWithFun (f, readIntArg i)
"ch": f : _ -> CChangeHead f "ch": f : _ -> CChangeHead f

12
src/GF/Shell/Commands.hs
View File

@@ -5,9 +5,9 @@
-- Stability : (stable) -- Stability : (stable)
-- Portability : (portable) -- Portability : (portable)
-- --
-- > CVS $Date: 2005/06/11 20:27:05 $ -- > CVS $Date: 2005/08/17 14:43:50 $
-- > CVS $Author: aarne $ -- > CVS $Author: aarne $
-- > CVS $Revision: 1.39 $ -- > CVS $Revision: 1.40 $
-- --
-- temporary hacks for GF 2.0 -- temporary hacks for GF 2.0
-- --
@@ -76,6 +76,7 @@ data Command =
| CTop | CTop
| CLast | CLast
| CMovePosition [Int] | CMovePosition [Int]
| CCopyPosition [Int]
| CRefineWithTree String | CRefineWithTree String
| CRefineWithClip Int | CRefineWithClip Int
| CRefineWithAtom String | CRefineWithAtom String
@@ -256,6 +257,13 @@ execECommand env c = case c of
in (case et of in (case et of
Ok t -> refineByTrees der cgr [t] s Ok t -> refineByTrees der cgr [t] s
Bad m -> changeMsg [m] s) Bad m -> changeMsg [m] s)
CCopyPosition p -> action2command $ \s -> do
s1 <- goPosition p s
let t = actTree s1
let compat = actVal s1 == actVal s
if compat
then refineWithTree der cgr t s
else return s
CRefineParse str -> \s -> CRefineParse str -> \s ->
let cat = cat2CFCat (qualifTop sgr (actCat (stateSState s))) let cat = cat2CFCat (qualifTop sgr (actCat (stateSState s)))