diff --git a/src/GF/Shell/CommandL.hs b/src/GF/Shell/CommandL.hs index 62d3f9e87..63f4c4258 100644 --- a/src/GF/Shell/CommandL.hs +++ b/src/GF/Shell/CommandL.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/06/03 22:44:36 $ +-- > CVS $Date: 2005/06/10 15:59:58 $ -- > CVS $Author: aarne $ --- > CVS $Revision: 1.17 $ +-- > CVS $Revision: 1.18 $ -- -- (Description of the module) ----------------------------------------------------------------------------- @@ -122,6 +122,7 @@ pCommandMsg s = (m,pCommandWords $ words c) where "u" : _ -> CUndo "d" : _ -> CDelete "ac" : _ -> CAddClip + "pc": i : _ -> CRemoveClip (readIntArg i) "c" : s : _ -> CTermCommand s "a" : _ -> CRefineRandom --- *a*leatoire "m" : _ -> CMenu diff --git a/src/GF/Shell/Commands.hs b/src/GF/Shell/Commands.hs index d95cd51b1..99a7130e9 100644 --- a/src/GF/Shell/Commands.hs +++ b/src/GF/Shell/Commands.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/04/21 16:23:19 $ --- > CVS $Author: bringert $ --- > CVS $Revision: 1.37 $ +-- > CVS $Date: 2005/06/10 15:59:58 $ +-- > CVS $Author: aarne $ +-- > CVS $Revision: 1.38 $ -- -- temporary hacks for GF 2.0 -- @@ -91,6 +91,7 @@ data Command = | CRemoveOption Option | CDelete | CAddClip + | CRemoveClip Int | CUndo | CView | CMenu @@ -284,6 +285,7 @@ execECommand env c = case c of CRemoveOption o -> changeStOptions (removeOption o) CDelete -> action2commandNext $ deleteSubTree cgr CAddClip -> \s -> (addtoClip (actTree (stateSState s))) s + CRemoveClip n -> \s -> (removeClip n) s CUndo -> undoCommand CMenu -> \s -> changeMsg (menuState env s) s CView -> changeView diff --git a/src/GF/UseGrammar/Session.hs b/src/GF/UseGrammar/Session.hs index 34ffeed4a..4aabe9f60 100644 --- a/src/GF/UseGrammar/Session.hs +++ b/src/GF/UseGrammar/Session.hs @@ -5,9 +5,9 @@ -- Stability : (stable) -- Portability : (portable) -- --- > CVS $Date: 2005/04/21 16:23:51 $ --- > CVS $Author: bringert $ --- > CVS $Revision: 1.9 $ +-- > CVS $Date: 2005/06/10 15:59:59 $ +-- > CVS $Author: aarne $ +-- > CVS $Revision: 1.10 $ -- -- (Description of the module) ----------------------------------------------------------------------------- @@ -82,6 +82,9 @@ changeCands ts ss@((s,(_,cb),(_,b)):_) = (s,(ts,cb),(candInfo ts,b)) : ss addtoClip :: Clip -> ECommand addtoClip t ss@((s,(ts,cb),(i,b)):_) = (s,(ts,t:cb),(i,b)) : ss +removeClip :: Int -> ECommand +removeClip n ss@((s,(ts,cb),(i,b)):_) = (s,(ts, drop n cb),(i,b)) : ss + changeMsg :: [String] -> ECommand changeMsg m ((s,ts,(_,b)):ss) = (s,ts,(m,b)) : ss -- just change message