Ticket #132: haskeline.dpatch

New patches:

[Make the code compatible with the stricter labelled-field parsing rules
Ian Lynagh <igloo@earth.li>**20090725212004] {
hunk ./System/Console/Haskeline/Backend/DumbTerm.hs 90
-            put Window {pos=newP}
+            put $ Window {pos=newP}
hunk ./System/Console/Haskeline/Backend/DumbTerm.hs 109
-    put Window {pos=p}
+    put $ Window {pos=p}
hunk ./System/Console/Haskeline/Backend/Posix.hsc 63
-                    then return $ Just Layout {height=fromEnum rows,width=fromEnum cols}
+                    then return $ Just $ Layout {height=fromEnum rows,width=fromEnum cols}
hunk ./System/Console/Haskeline/Backend/Posix.hsc 68
-  withHandle_ "unsafeHandleToFd" h $ \Handle__{haDevice=dev} -> do
+  withHandle_ "unsafeHandleToFd" h $ \(Handle__{haDevice=dev}) -> do
hunk ./System/Console/Haskeline/Backend/Posix.hsc 83
-tryGetLayouts [] = return Layout {height=24,width=80}
+tryGetLayouts [] = return $ Layout {height=24,width=80}
hunk ./System/Console/Haskeline/Backend/Posix.hsc 257
-        Just h -> return fileRT {
+        Just h -> return $ fileRT {
hunk ./System/Console/Haskeline/Backend/Posix.hsc 286
-    return RunTerm {putStrOut = \str -> encoder str >>= putTerm,
+    return $ RunTerm {putStrOut = \str -> encoder str >>= putTerm,
hunk ./System/Console/Haskeline/Backend/Terminfo.hs 46
-    return Actions{leftA = leftA', rightA = rightA',upA = upA',
+    return $ Actions{leftA = leftA', rightA = rightA',upA = upA',
hunk ./System/Console/Haskeline/Backend/Terminfo.hs 144
-                        return Layout {height=r,width=c}
+                        return $ Layout {height=r,width=c}
hunk ./System/Console/Haskeline/Backend/Terminfo.hs 179
-                put TermPos {termRow=r,termCol=c+n}
+                put $ TermPos {termRow=r,termCol=c+n}
hunk ./System/Console/Haskeline/Backend/Terminfo.hs 185
-              put TermPos {termRow=r+linesDown, termCol=newCol}
+              put $ TermPos {termRow=r+linesDown, termCol=newCol}
hunk ./System/Console/Haskeline/Backend/Terminfo.hs 193
-                put TermPos {termRow = r,termCol = c-n}
+                put $ TermPos {termRow = r,termCol = c-n}
hunk ./System/Console/Haskeline/Backend/Terminfo.hs 199
-                put TermPos {termRow = r - linesUp, termCol=newCol}
+                put $ TermPos {termRow = r - linesUp, termCol=newCol}
hunk ./System/Console/Haskeline/Backend/Terminfo.hs 217
-                put TermPos{termRow=r, termCol=c+length str}
+                put $ TermPos{termRow=r, termCol=c+length str}
hunk ./System/Console/Haskeline/Backend/Terminfo.hs 223
-                put TermPos {termRow=r+1,termCol=0}
+                put $ TermPos {termRow=r+1,termCol=0}
hunk ./System/Console/Haskeline/Backend/Terminfo.hs 239
-linesLeft Layout {width=w} TermPos {termCol = c} n
+linesLeft (Layout {width=w}) (TermPos {termCol = c}) n
hunk ./System/Console/Haskeline/Command/History.hs 16
-prevHistoryM _ HistLog {pastHistory = []} = Nothing
-prevHistoryM s HistLog {pastHistory=ls:past, futureHistory=future}
+prevHistoryM _ (HistLog {pastHistory = []}) = Nothing
+prevHistoryM s (HistLog {pastHistory=ls:past, futureHistory=future})
hunk ./System/Console/Haskeline/Command/History.hs 166
-        searchMore d s = doSearch False s {direction=d}
+        searchMore d s = doSearch False (s {direction=d})
hunk ./System/Console/Haskeline/Command/Undo.hs 31
-undoPast ls u@Undo {pastUndo = []} = (ls,u)
-undoPast ls u@Undo {pastUndo = (pastLS:lss)}
+undoPast ls u@(Undo {pastUndo = []}) = (ls,u)
+undoPast ls u@(Undo {pastUndo = (pastLS:lss)})
hunk ./System/Console/Haskeline/Command/Undo.hs 35
-redoFuture ls u@Undo {futureRedo = []} = (ls,u)
-redoFuture ls u@Undo {futureRedo = (futureLS:lss)}
+redoFuture ls u@(Undo {futureRedo = []}) = (ls,u)
+redoFuture ls u@(Undo {futureRedo = (futureLS:lss)})
hunk ./System/Console/Haskeline/IO.hs 64
-    return HD {requestVar = reqV, forkedThread = tid,
-                subthreadFinished = finished}
+    return $ HD {requestVar = reqV, forkedThread = tid,
+                 subthreadFinished = finished}
hunk ./System/Console/Haskeline/Key.hs 47
-metaKey (Key m bc) = Key m {hasMeta = True} bc
+metaKey (Key m bc) = Key (m {hasMeta = True}) bc
hunk ./System/Console/Haskeline/Key.hs 116
-    | hasControl m = Key m {hasControl = False}
+    | hasControl m = Key (m {hasControl = False})
hunk ./System/Console/Haskeline/Key.hs 118
-    | hasShift m = Key m {hasShift = False} (KeyChar (toUpper c))
+    | hasShift m = Key (m {hasShift = False}) (KeyChar (toUpper c))
hunk ./System/Console/Haskeline/Vi.hs 386
-searchText SearchEntry {entryState = IMode xs ys} = reverse xs ++ ys
+searchText (SearchEntry {entryState = IMode xs ys}) = reverse xs ++ ys
hunk ./System/Console/Haskeline/Vi.hs 419
-    result <- doSearch False SearchMode {
+    result <- doSearch False (SearchMode {
hunk ./System/Console/Haskeline/Vi.hs 422
-                                    direction = dir}
+                                    direction = dir})
hunk ./System/Console/Haskeline/Vi.hs 426
-            put vstate {lastSearch = toSearch'}
+            put $ vstate {lastSearch = toSearch'}
hunk ./configure 1
-#!/bin/sh
-# Dummy file to be run by autoconfUserHooks.
rmfile ./configure
}

Context:

[Check for failure when calling SetConsoleCtrlHandler
Ian Lynagh <igloo@earth.li>**20090711005810] 
[Fix some "warn-unused-do-bind" warnings where we want to ignore the value
Ian Lynagh <igloo@earth.li>**20090710203441] 
[Use throwErrnoIfMinus1Retry_ when calling iconv
Ian Lynagh <igloo@earth.li>**20090710202820] 
[Remove unused imports
Ian Lynagh <igloo@earth.li>**20090707181944] 
[Fix unused import warnings
Ian Lynagh <igloo@earth.li>**20090707133608] 
[Remove unused imports
Ian Lynagh <igloo@earth.li>**20090707115839] 
[Added '~' vi command for flipping case.
Judah Jacobson <judah.jacobson@gmail.com>**20090703012501
 Ignore-this: 193d992ad81885f8933764c0dd5382c0
] 
[Add emacs ctrl-t command for transposing chars.
Judah Jacobson <judah.jacobson@gmail.com>**20090702000435
 Ignore-this: 92dea0b2fcac2fa59926bfe45458d133
] 
[Add meta-<, meta-> emacs commands for skipping to the start or end of the history.
Judah Jacobson <judah.jacobson@gmail.com>**20090701235827
 Ignore-this: e0156220376761e553a9c6b5b5d2609e
] 
[Add vi n/N history search commands.
Judah Jacobson <judah.jacobson@gmail.com>**20090701233020
 Ignore-this: 5aa01ddedeb9df24779533b5ef66bb89
] 
[Add vi searching commands '/' and '?'.
Judah Jacobson <judah.jacobson@gmail.com>**20090701231654
 Ignore-this: 12d7c8129f87a66d39f81aa3324c921d
] 
[The HistLog should consist of [Grapheme]s, not Strings.
Judah Jacobson <judah.jacobson@gmail.com>**20090624031019
 Ignore-this: a2b16602f866c05c979f1ff2070d3245
] 
[TAG 0.6.1.6
Judah Jacobson <judah.jacobson@gmail.com>**20090624202950
 Ignore-this: eefaef0ae5eeec535f412c0c95148576
] 
[Allow the vi '.' command to be undoable.
Judah Jacobson <judah.jacobson@gmail.com>**20090623041854
 Ignore-this: 190f25ef4fdc6cfa42493be3e62d2968
] 
[Let the vi '.' command also repeat a sequence of character insertions.
Judah Jacobson <judah.jacobson@gmail.com>**20090623041801
 Ignore-this: a511f73a313a07bdea79a92d733a4a67
] 
[With the new monadic Commands, we don't need hidden arguments anymore.
Judah Jacobson <judah.jacobson@gmail.com>**20090623035028
 Ignore-this: 734a54e6869488675f38ab6a7ac89e60
] 
[Add vi '.' command to repeat the last nontrivial command.
Judah Jacobson <judah.jacobson@gmail.com>**20090623034135
 Ignore-this: b761278d02586ea0a3ab87011bd6e088
] 
[Fix build on Windows from the previous "Major refactoring".
Judah Jacobson <judah.jacobson@gmail.com>**20090622015924
 Ignore-this: 84d6f06663360f498fbd04bee4ed0f8
] 
[Major refactoring.
Judah Jacobson <judah.jacobson@gmail.com>**20090622013227
 Ignore-this: fd3c384e06c31133568e50c033e39f1b
   Summary of changes:
    - Removed RankNTypes; added Rank2Types, UndecidableInstances
    - Revamped Command interface to be simpler and more monadic
    - Refactored key/command processing into new module RunCommand
    - Begin infrastructure for emacs/vi modes to have their own state.
    - Make Monad boilerplate a little simpler
    - TODO: The Windows build is broken.
] 
[Use the more flexible Command interface to clean up the completion command.
Judah Jacobson <judah.jacobson@gmail.com>**20090618170639
 Ignore-this: 16b8e291ae321a144f5c53fc16b21c02
] 
[Add emacs ctrl-p, ctrl-n (history commands).  Patch from Eval Klitzke.
Judah Jacobson <judah.jacobson@gmail.com>**20090617010426
 Ignore-this: 72eada59a118ade5c0e849dd51efb97d
] 
[Refactor kill stuff (again), adding the notion of a KillHelper.  Fixes behavior of '%' and makes the code for vi deletions a little more straightforward.
Judah Jacobson <judah.jacobson@gmail.com>**20090616203047
 Ignore-this: 9eabbb59fb9e89fbfac2a7c5d8a1cc9d
] 
[Added vi '%' command (doesn't work right with deletions yet).
Judah Jacobson <judah.jacobson@gmail.com>**20090616155925
 Ignore-this: 17d2d145aadc25bb5d6e036fccb76f4a
] 
[Add vi commands: f/F/t/T.
Judah Jacobson <judah.jacobson@gmail.com>**20090616051052
 Ignore-this: 8b1b961b04353724d87896b1049c3e94
] 
[Add comment about hacky case.
Judah Jacobson <judah.jacobson@gmail.com>**20090616050911
 Ignore-this: b31554d02ea9149b222a7ad75973de88
] 
[Add vi 'y' command, and also fix the behavior of paste.
Judah Jacobson <judah.jacobson@gmail.com>**20090613174539
 Ignore-this: 54c663e576b447e171ebffdce96f6dfb
] 
[Ensure that the prefs file is fully read before starting the user interaction.
Judah Jacobson <judah.jacobson@gmail.com>**20090612220755
 Ignore-this: ecec7512819672fcb35a8402c51cafcb
] 
[Some work on #92 : make completionCmd responsible for saving to the undo stack.
Judah Jacobson <judah.jacobson@gmail.com>**20090612220559
 Ignore-this: 8e87c21b55b65b847025cdb16c648866
] 
[Add cut/paste commands for vi mode.
Judah Jacobson <judah.jacobson@gmail.com>**20090612215728
 Ignore-this: 2f192eb9f46ce5a4e2805203e4ed401
] 
[Fix #87: Make replace mode behave more like vim (and handle combining characters better).
Judah Jacobson <judah.jacobson@gmail.com>**20090612185322
 Ignore-this: 9e10242d34d0507050757201d651fd33
] 
[Fix omission from Command refactoring: move to the next line when reaching a Finish command.
Judah Jacobson <judah.jacobson@gmail.com>**20090612180746
 Ignore-this: 676d96bcb92fcb2674d3517b6c1b28cf
] 
[Added emacs bindings for the kill ring.
Judah Jacobson <judah.jacobson@gmail.com>**20090612163556
 Ignore-this: 3c7aaf8878d431608f7b03e8a626bc21
] 
[Fix behavior of 'c$' command.  Seems a little hackish...
Judah Jacobson <judah.jacobson@gmail.com>**20090610003827
 Ignore-this: 762a7b7a38c25bfdbe2d6fa3e03a1b99
] 
[Add C,X,D commands.
Judah Jacobson <judah.jacobson@gmail.com>**20090610003744
 Ignore-this: bb0b61eb6d9e59412f0056b6299feac
] 
[Don't unnecessarily print '(arg: 1)' when moving the cursor in command mode.
Judah Jacobson <judah.jacobson@gmail.com>**20090609213542
 Ignore-this: e302f36dd96ef3a15648baf804c28e26
] 
[Refactor how vi-mode repeated commands are treated.  Also fixes the behavior of dw,cw,ce,etc. (see #86).
Judah Jacobson <judah.jacobson@gmail.com>**20090609211403
 Ignore-this: ea0339a59cb3be539f0097ef1162f43d
] 
[Added vi-mode commands ^,e,E.  Also cleaned up the word-skipping rules a little.
Judah Jacobson <judah.jacobson@gmail.com>**20090609035558
 Ignore-this: 87cc3e0346b72a8fe068ed9b9fb303ba
] 
[Add j/k vi-mode history commands (and add comment about #85)
Judah Jacobson <judah.jacobson@gmail.com>**20090609030520
 Ignore-this: c511124fd01088996120116c0ed24758
] 
[Change the type of try; makes some code slightly more concise.
Judah Jacobson <judah.jacobson@gmail.com>**20090608215925
 Ignore-this: 2167a3caa232fa6dd3ab472da17071aa
] 
[Add emacs bindings M-u, M-c, M-l.  Adapted from a patch by Max Desyatov.
Judah Jacobson <judah.jacobson@gmail.com>**20090607202307
 Ignore-this: be5dfba91fc08c2f75d239c293a5289f
] 
[Rework Commands to be more flexible and straightforward to use.
Judah Jacobson <judah.jacobson@gmail.com>**20090607174724
 Ignore-this: 5c49375581ad9638d6cad93dea92b63d
] 
[Temp fix for replaceChar missing case.
Judah Jacobson <judah.jacobson@gmail.com>**20090607132253
 Ignore-this: f997f9f38ee1abd953952eabe86cc9fb
] 
[Partial fix for #81: Use grapheme clusters to model the line state.  Currently only works with combining characters whose Unicode general category is NonSpacingMark.
Judah Jacobson <judah.jacobson@gmail.com>**20090603173341
 Ignore-this: ee9b51fb22b75739b93815e7307ad14b
] 
[Bump up to 0.6.2 (preparing for ghc-6.10.4 release).
Judah Jacobson <judah.jacobson@gmail.com>**20090601203815
 Ignore-this: f6f1a0c57cdd02d68b70f2f61f315f35
] 
[work around new name clash with System.Win32.HRESULT
Simon Marlow <marlowsd@gmail.com>**20090629122344
 Ignore-this: 62035b69bf3d8818764b106a84c6f1a3
] 
[TAG 2009-06-25
Ian Lynagh <igloo@earth.li>**20090625160248] 
Patch bundle hash:
c2b20179d0f8a88bf02eae9f77a32ad592ad37ed