done refactoring normal mode functions
This commit is contained in:
@@ -2,276 +2,6 @@ structure AppUpdate =
|
|||||||
struct
|
struct
|
||||||
open AppType
|
open AppType
|
||||||
|
|
||||||
open MailboxType
|
|
||||||
open DrawMsg
|
|
||||||
open InputMsg
|
|
||||||
|
|
||||||
(* command-parsing functions *)
|
|
||||||
(** number of characters which are integers *)
|
|
||||||
fun getNumLength (pos, str) =
|
|
||||||
if pos = String.size str then
|
|
||||||
pos
|
|
||||||
else
|
|
||||||
let val chr = String.sub (str, pos)
|
|
||||||
in if Char.isDigit chr then getNumLength (pos + 1, str) else pos
|
|
||||||
end
|
|
||||||
|
|
||||||
fun appendChr (app: app_type, chr, str) =
|
|
||||||
let
|
|
||||||
val str = str ^ Char.toString chr
|
|
||||||
val mode = NORMAL_MODE str
|
|
||||||
in
|
|
||||||
AppWith.mode (app, mode, [])
|
|
||||||
end
|
|
||||||
|
|
||||||
fun parseMoveToChr (count, app, fMove, newCmd) =
|
|
||||||
case newCmd of
|
|
||||||
CHAR_EVENT chr => NormalMove.moveToChr (app, count, fMove, chr)
|
|
||||||
| KEY_ESC => Finish.clearMode app
|
|
||||||
| RESIZE_EVENT (width, height) => Finish.resizeText (app, width, height)
|
|
||||||
| WITH_SEARCH_LIST searchList => Finish.withSearchList (app, searchList)
|
|
||||||
|
|
||||||
fun parseGo (count, app, newCmd) =
|
|
||||||
case newCmd of
|
|
||||||
CHAR_EVENT chr =>
|
|
||||||
(case chr of
|
|
||||||
#"e" => MoveToEndOfPrevWord.move (app, count)
|
|
||||||
| #"E" => MoveToEndOfPrevWORD.move (app, count)
|
|
||||||
| #"g" => NormalMove.moveToStart app
|
|
||||||
| _ => Finish.clearMode app)
|
|
||||||
| KEY_ESC => Finish.clearMode app
|
|
||||||
| RESIZE_EVENT (width, height) => Finish.resizeText (app, width, height)
|
|
||||||
| WITH_SEARCH_LIST searchList => Finish.withSearchList (app, searchList)
|
|
||||||
|
|
||||||
fun handleChr (app: app_type, count, chr, str) =
|
|
||||||
case chr of
|
|
||||||
#"h" => MoveViH.move (app, count)
|
|
||||||
| #"j" => MoveViJ.move (app, count)
|
|
||||||
| #"k" => MoveViK.move (app, count)
|
|
||||||
| #"l" => MoveViL.move (app, count)
|
|
||||||
| #"w" => MoveToNextWord.move (app, count)
|
|
||||||
| #"W" => MoveToNextWORD.move (app, count)
|
|
||||||
| #"b" => MoveToPrevWord.move (app, count)
|
|
||||||
| #"B" => MoveToPrevWORD.move (app, count)
|
|
||||||
| #"e" => MoveToEndOfWord.move (app, count)
|
|
||||||
| #"E" => MoveToEndOfWORD.move (app, count)
|
|
||||||
| #"n" => NormalMove.moveToNextMatch (app, count)
|
|
||||||
| #"N" => NormalMove.moveToPrevMatch (app, count)
|
|
||||||
| #"z" => Finish.centreToCursor app
|
|
||||||
(* can only move to start or end of line once
|
|
||||||
* so hardcode count as 1 *)
|
|
||||||
| #"0" =>
|
|
||||||
(* 0 is a bit of a special case.
|
|
||||||
* If 0 is pressed without any preceding characters,
|
|
||||||
* then it should move cursor to the start of the line.
|
|
||||||
* However, if a number was pressed previously before 0 was,
|
|
||||||
* then this means user is entering a count.
|
|
||||||
* In that case, we append 0 to the string. *)
|
|
||||||
if String.size str > 0 then
|
|
||||||
let
|
|
||||||
val lastChr = String.sub (str, String.size str - 1)
|
|
||||||
in
|
|
||||||
if Char.isDigit lastChr then
|
|
||||||
let
|
|
||||||
val chr = Char.toString chr
|
|
||||||
val str = str ^ chr
|
|
||||||
val mode = NORMAL_MODE str
|
|
||||||
in
|
|
||||||
AppWith.mode (app, mode, [])
|
|
||||||
end
|
|
||||||
else
|
|
||||||
MoveToStartOfLine.move (app, 1)
|
|
||||||
end
|
|
||||||
else
|
|
||||||
MoveToStartOfLine.move (app, 1)
|
|
||||||
| #"$" => MoveToEndOfLine.move (app, 1)
|
|
||||||
| #"^" => NormalMove.firstNonSpaceChr app
|
|
||||||
| #"G" =>
|
|
||||||
(* if str has a size larger than 0,
|
|
||||||
* interpret as "go to line" command;
|
|
||||||
* else, interpret as a command to move to end *)
|
|
||||||
if String.size str = 0 then NormalMove.moveToEnd app
|
|
||||||
else NormalMove.moveToLine (app, count - 1)
|
|
||||||
| #"%" => NormalMove.moveToMatchingPair app
|
|
||||||
| #"x" => NormalDelete.removeChr (app, count)
|
|
||||||
(* multi-char commands which can be appended *)
|
|
||||||
| #"t" => appendChr (app, chr, str)
|
|
||||||
| #"T" => appendChr (app, chr, str)
|
|
||||||
| #"y" => appendChr (app, chr, str)
|
|
||||||
| #"d" => appendChr (app, chr, str)
|
|
||||||
| #"f" => appendChr (app, chr, str)
|
|
||||||
| #"F" => appendChr (app, chr, str)
|
|
||||||
| #"g" => appendChr (app, chr, str)
|
|
||||||
| #"c" => appendChr (app, chr, str)
|
|
||||||
| _ =>
|
|
||||||
(* user may be entering a cmd with more than one chr
|
|
||||||
* such as "2dw" to delete two word
|
|
||||||
* so add current chr to mode, and save it in the app state *)
|
|
||||||
let
|
|
||||||
val str = if Char.isDigit chr then str ^ Char.toString chr else ""
|
|
||||||
val mode = NORMAL_MODE str
|
|
||||||
in
|
|
||||||
AppWith.mode (app, mode, [])
|
|
||||||
end
|
|
||||||
|
|
||||||
fun parseDelete (strPos, str, count, app, newCmd) =
|
|
||||||
if strPos = String.size str - 1 then
|
|
||||||
(* have to check newCmd *)
|
|
||||||
case newCmd of
|
|
||||||
CHAR_EVENT chr =>
|
|
||||||
(case chr of
|
|
||||||
(* terminal commands: require no input after *)
|
|
||||||
#"h" => NormalDelete.delete (app, count, Cursor.viH)
|
|
||||||
| #"l" => NormalDelete.delete (app, count, Cursor.viL)
|
|
||||||
(* vi's 'j' and 'k' commands move up or down a column
|
|
||||||
* but 'dj' or 'dk' delete whole lines
|
|
||||||
* so their implementation differs from
|
|
||||||
* other cursor motions *)
|
|
||||||
| #"j" => NormalDelete.deleteLine (app, count + 1)
|
|
||||||
| #"k" => NormalDelete.deleteLineBack (app, count)
|
|
||||||
| #"w" => NormalDelete.deleteByDfa (app, count, Cursor.nextWord)
|
|
||||||
| #"W" => NormalDelete.deleteByDfa (app, count, Cursor.nextWORD)
|
|
||||||
| #"b" => NormalDelete.deleteByDfa (app, count, Cursor.prevWord)
|
|
||||||
| #"B" => NormalDelete.deleteByDfa (app, count, Cursor.prevWORD)
|
|
||||||
| #"e" => NormalDelete.deleteByDfa (app, count, Cursor.endOfWordForDelete)
|
|
||||||
| #"E" => NormalDelete.deleteByDfa (app, count, Cursor.endOfWORDForDelete)
|
|
||||||
| #"0" => NormalDelete.delete (app, 1, Cursor.vi0)
|
|
||||||
| #"$" => NormalDelete.deleteToEndOfLine app
|
|
||||||
| #"^" => NormalDelete.deleteToFirstNonSpaceChr app
|
|
||||||
| #"d" => NormalDelete.deleteLine (app, count)
|
|
||||||
| #"n" => NormalDelete.deleteToNextMatch (app, count)
|
|
||||||
| #"N" => NormalDelete.deleteToPrevMatch (app, count)
|
|
||||||
(* non-terminal commands which require appending chr *)
|
|
||||||
| #"t" => appendChr (app, chr, str)
|
|
||||||
| #"T" => appendChr (app, chr, str)
|
|
||||||
| #"f" => appendChr (app, chr, str)
|
|
||||||
| #"F" => appendChr (app, chr, str)
|
|
||||||
| #"g" => appendChr (app, chr, str)
|
|
||||||
(* invalid command: reset mode *)
|
|
||||||
| _ => Finish.clearMode app)
|
|
||||||
| KEY_ESC => Finish.clearMode app
|
|
||||||
| RESIZE_EVENT (width, height) => Finish.resizeText (app, width, height)
|
|
||||||
| WITH_SEARCH_LIST searchList => Finish.withSearchList (app, searchList)
|
|
||||||
else
|
|
||||||
(* have to continue parsing string *)
|
|
||||||
case String.sub (str, strPos + 1) of
|
|
||||||
#"t" =>
|
|
||||||
(* delete till chr, forwards *)
|
|
||||||
(case newCmd of
|
|
||||||
CHAR_EVENT chr =>
|
|
||||||
NormalDelete.deleteToChr (app, 1, Cursor.tillNextChr, op+, chr)
|
|
||||||
| KEY_ESC => Finish.clearMode app
|
|
||||||
| RESIZE_EVENT (width, height) => Finish.resizeText (app, width, height)
|
|
||||||
| WITH_SEARCH_LIST searchList => Finish.withSearchList (app, searchList))
|
|
||||||
| #"T" =>
|
|
||||||
(* delete till chr, backwards *)
|
|
||||||
(case newCmd of
|
|
||||||
CHAR_EVENT chr =>
|
|
||||||
NormalDelete.deleteToChr (app, 1, Cursor.tillPrevChr, op-, chr)
|
|
||||||
| KEY_ESC => Finish.clearMode app
|
|
||||||
| RESIZE_EVENT (width, height) => Finish.resizeText (app, width, height)
|
|
||||||
| WITH_SEARCH_LIST searchList => Finish.withSearchList (app, searchList))
|
|
||||||
| #"f" =>
|
|
||||||
(case newCmd of
|
|
||||||
CHAR_EVENT chr =>
|
|
||||||
NormalDelete.deleteToChr (app, count, Cursor.toNextChr, op+, chr)
|
|
||||||
| KEY_ESC => Finish.clearMode app
|
|
||||||
| RESIZE_EVENT (width, height) => Finish.resizeText (app, width, height)
|
|
||||||
| WITH_SEARCH_LIST searchList => Finish.withSearchList (app, searchList))
|
|
||||||
| #"F" =>
|
|
||||||
(* delete to chr, backwards *)
|
|
||||||
(case newCmd of
|
|
||||||
CHAR_EVENT chr =>
|
|
||||||
NormalDelete.deleteToChr (app, count, Cursor.toPrevChr, op-, chr)
|
|
||||||
| KEY_ESC => Finish.clearMode app
|
|
||||||
| RESIZE_EVENT (width, height) => Finish.resizeText (app, width, height)
|
|
||||||
| WITH_SEARCH_LIST searchList => Finish.withSearchList (app, searchList))
|
|
||||||
| #"g" =>
|
|
||||||
(* same events as parseGo *)
|
|
||||||
(case newCmd of
|
|
||||||
CHAR_EVENT chr =>
|
|
||||||
(case chr of
|
|
||||||
#"e" => NormalDelete.deleteByDfa (app, count, Cursor.endOfPrevWord)
|
|
||||||
| #"E" => NormalDelete.deleteByDfa (app, count, Cursor.endOfPrevWORD)
|
|
||||||
| #"g" => NormalDelete.deleteToStart app
|
|
||||||
| _ => Finish.clearMode app)
|
|
||||||
| KEY_ESC => Finish.clearMode app
|
|
||||||
| RESIZE_EVENT (width, height) => Finish.resizeText (app, width, height)
|
|
||||||
| WITH_SEARCH_LIST searchList => Finish.withSearchList (app, searchList))
|
|
||||||
| _ => Finish.clearMode app
|
|
||||||
|
|
||||||
(* useful reference as list of non-terminal commands *)
|
|
||||||
fun parseAfterCount (strPos, str, count, app, newCmd) =
|
|
||||||
(* we are trying to parse multi-char but non-terminal strings here.
|
|
||||||
* For example, we don't want to parse 3w which is a terminal commmand
|
|
||||||
* to go 3 words forwards
|
|
||||||
* but we do want to parse 3d which is a non-terminal command
|
|
||||||
* which can be made terminal by adding "w" or "e" at the end.
|
|
||||||
* *)
|
|
||||||
case String.sub (str, strPos) of
|
|
||||||
#"t" =>
|
|
||||||
(* to just before char, forward
|
|
||||||
* tillNextChr with count of 1 has same effect
|
|
||||||
* as tillNextChr with any count above 1
|
|
||||||
* so just hardcode 1 *)
|
|
||||||
parseMoveToChr (1, app, Cursor.tillNextChr, newCmd)
|
|
||||||
| #"T" =>
|
|
||||||
(* to just before chr, backward *)
|
|
||||||
parseMoveToChr (1, app, Cursor.tillPrevChr, newCmd)
|
|
||||||
| #"y" => (* yank *) Finish.clearMode app
|
|
||||||
| #"d" => (* delete *) parseDelete (strPos, str, count, app, newCmd)
|
|
||||||
| #"f" =>
|
|
||||||
(* to chr, forward *)
|
|
||||||
parseMoveToChr (count, app, Cursor.toNextChr, newCmd)
|
|
||||||
| #"F" =>
|
|
||||||
(* to chr, backward *)
|
|
||||||
parseMoveToChr (count, app, Cursor.toPrevChr, newCmd)
|
|
||||||
| #"g" => (* go *) parseGo (count, app, newCmd)
|
|
||||||
| #"c" => (* change *) Finish.clearMode app
|
|
||||||
| _ =>
|
|
||||||
(* isn't a non-terminal cmd
|
|
||||||
* this case should never happen*)
|
|
||||||
Finish.clearMode app
|
|
||||||
|
|
||||||
fun parseNormalModeCommand (app, str, newCmd) =
|
|
||||||
if String.size str = 0 then
|
|
||||||
case newCmd of
|
|
||||||
CHAR_EVENT chr => handleChr (app, 1, chr, str)
|
|
||||||
| KEY_ESC => Finish.clearMode app
|
|
||||||
| RESIZE_EVENT (width, height) => Finish.resizeText (app, width, height)
|
|
||||||
| WITH_SEARCH_LIST searchList => Finish.withSearchList (app, searchList)
|
|
||||||
else if String.size str = 1 then
|
|
||||||
case newCmd of
|
|
||||||
CHAR_EVENT chr =>
|
|
||||||
(case Int.fromString str of
|
|
||||||
SOME count => handleChr (app, count, chr, str)
|
|
||||||
| NONE => parseAfterCount (0, str, 1, app, newCmd))
|
|
||||||
| KEY_ESC => Finish.clearMode app
|
|
||||||
| RESIZE_EVENT (width, height) => Finish.resizeText (app, width, height)
|
|
||||||
| WITH_SEARCH_LIST searchList => Finish.withSearchList (app, searchList)
|
|
||||||
else
|
|
||||||
let
|
|
||||||
val numLength = getNumLength (0, str)
|
|
||||||
val count = String.substring (str, 0, numLength)
|
|
||||||
val count =
|
|
||||||
case Int.fromString count of
|
|
||||||
SOME x => x
|
|
||||||
| NONE => 1
|
|
||||||
in
|
|
||||||
if numLength = String.size str then
|
|
||||||
(* reached end of str; str only contained numbers *)
|
|
||||||
case newCmd of
|
|
||||||
CHAR_EVENT chr => handleChr (app, count, chr, str)
|
|
||||||
| KEY_ESC => Finish.clearMode app
|
|
||||||
| RESIZE_EVENT (width, height) => Finish.resizeText (app, width, height)
|
|
||||||
| WITH_SEARCH_LIST searchList => Finish.withSearchList (app, searchList)
|
|
||||||
else
|
|
||||||
(* continue parsing. *)
|
|
||||||
parseAfterCount (numLength, str, count, app, newCmd)
|
|
||||||
end
|
|
||||||
|
|
||||||
fun updateNormalMode (app, str, msg) = parseNormalModeCommand (app, str, msg)
|
|
||||||
|
|
||||||
fun update (app, msg) =
|
fun update (app, msg) =
|
||||||
case #mode app of NORMAL_MODE str => updateNormalMode (app, str, msg)
|
case #mode app of NORMAL_MODE str => NormalMode.update (app, str, msg)
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -281,7 +281,8 @@ struct
|
|||||||
val searchList =
|
val searchList =
|
||||||
SearchList.buildRange (buffer, searchString, cursorIdx - 777)
|
SearchList.buildRange (buffer, searchString, cursorIdx - 777)
|
||||||
in
|
in
|
||||||
Finish.buildTextAndClearAfterChr (app, buffer, low, searchList, initialMsg)
|
Finish.buildTextAndClearAfterChr
|
||||||
|
(app, buffer, low, searchList, initialMsg)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
let
|
let
|
||||||
@@ -363,8 +364,10 @@ struct
|
|||||||
val {cursorIdx, searchList, ...} = app
|
val {cursorIdx, searchList, ...} = app
|
||||||
val newCursorIdx = SearchList.nextMatch (cursorIdx, searchList, count)
|
val newCursorIdx = SearchList.nextMatch (cursorIdx, searchList, count)
|
||||||
in
|
in
|
||||||
if newCursorIdx = ~1 orelse newCursorIdx <= cursorIdx then Finish.clearMode app
|
if newCursorIdx = ~1 orelse newCursorIdx <= cursorIdx then
|
||||||
else helpDeleteToMatch (app, cursorIdx, newCursorIdx)
|
Finish.clearMode app
|
||||||
|
else
|
||||||
|
helpDeleteToMatch (app, cursorIdx, newCursorIdx)
|
||||||
end
|
end
|
||||||
|
|
||||||
fun deleteToPrevMatch (app: app_type, count) =
|
fun deleteToPrevMatch (app: app_type, count) =
|
||||||
@@ -372,7 +375,9 @@ struct
|
|||||||
val {cursorIdx, searchList, ...} = app
|
val {cursorIdx, searchList, ...} = app
|
||||||
val newCursorIdx = SearchList.prevMatch (cursorIdx, searchList, count)
|
val newCursorIdx = SearchList.prevMatch (cursorIdx, searchList, count)
|
||||||
in
|
in
|
||||||
if newCursorIdx = ~1 orelse newCursorIdx >= cursorIdx then Finish.clearMode app
|
if newCursorIdx = ~1 orelse newCursorIdx >= cursorIdx then
|
||||||
else helpDeleteToMatch (app, newCursorIdx, cursorIdx)
|
Finish.clearMode app
|
||||||
|
else
|
||||||
|
helpDeleteToMatch (app, newCursorIdx, cursorIdx)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
288
fcore/normal-mode/normal-mode.sml
Normal file
288
fcore/normal-mode/normal-mode.sml
Normal file
@@ -0,0 +1,288 @@
|
|||||||
|
structure NormalMode =
|
||||||
|
struct
|
||||||
|
(* parsing functions, deciding what to do while we are in normal mode *)
|
||||||
|
|
||||||
|
open AppType
|
||||||
|
open InputMsg
|
||||||
|
|
||||||
|
|
||||||
|
fun getNumLength (pos, str) =
|
||||||
|
if pos = String.size str then
|
||||||
|
pos
|
||||||
|
else
|
||||||
|
let val chr = String.sub (str, pos)
|
||||||
|
in if Char.isDigit chr then getNumLength (pos + 1, str) else pos
|
||||||
|
end
|
||||||
|
|
||||||
|
fun appendChr (app: app_type, chr, str) =
|
||||||
|
let
|
||||||
|
val str = str ^ Char.toString chr
|
||||||
|
val mode = NORMAL_MODE str
|
||||||
|
in
|
||||||
|
AppWith.mode (app, mode, [])
|
||||||
|
end
|
||||||
|
|
||||||
|
fun parseMoveToChr (count, app, fMove, newCmd) =
|
||||||
|
case newCmd of
|
||||||
|
CHAR_EVENT chr => NormalMove.moveToChr (app, count, fMove, chr)
|
||||||
|
| KEY_ESC => Finish.clearMode app
|
||||||
|
| RESIZE_EVENT (width, height) => Finish.resizeText (app, width, height)
|
||||||
|
| WITH_SEARCH_LIST searchList => Finish.withSearchList (app, searchList)
|
||||||
|
|
||||||
|
fun parseGo (count, app, newCmd) =
|
||||||
|
case newCmd of
|
||||||
|
CHAR_EVENT chr =>
|
||||||
|
(case chr of
|
||||||
|
#"e" => MoveToEndOfPrevWord.move (app, count)
|
||||||
|
| #"E" => MoveToEndOfPrevWORD.move (app, count)
|
||||||
|
| #"g" => NormalMove.moveToStart app
|
||||||
|
| _ => Finish.clearMode app)
|
||||||
|
| KEY_ESC => Finish.clearMode app
|
||||||
|
| RESIZE_EVENT (width, height) => Finish.resizeText (app, width, height)
|
||||||
|
| WITH_SEARCH_LIST searchList => Finish.withSearchList (app, searchList)
|
||||||
|
|
||||||
|
fun parseChr (app: app_type, count, chr, str) =
|
||||||
|
case chr of
|
||||||
|
#"h" => MoveViH.move (app, count)
|
||||||
|
| #"j" => MoveViJ.move (app, count)
|
||||||
|
| #"k" => MoveViK.move (app, count)
|
||||||
|
| #"l" => MoveViL.move (app, count)
|
||||||
|
| #"w" => MoveToNextWord.move (app, count)
|
||||||
|
| #"W" => MoveToNextWORD.move (app, count)
|
||||||
|
| #"b" => MoveToPrevWord.move (app, count)
|
||||||
|
| #"B" => MoveToPrevWORD.move (app, count)
|
||||||
|
| #"e" => MoveToEndOfWord.move (app, count)
|
||||||
|
| #"E" => MoveToEndOfWORD.move (app, count)
|
||||||
|
| #"n" => NormalMove.moveToNextMatch (app, count)
|
||||||
|
| #"N" => NormalMove.moveToPrevMatch (app, count)
|
||||||
|
| #"z" => Finish.centreToCursor app
|
||||||
|
(* can only move to start or end of line once
|
||||||
|
* so hardcode count as 1 *)
|
||||||
|
| #"0" =>
|
||||||
|
(* 0 is a bit of a special case.
|
||||||
|
* If 0 is pressed without any preceding characters,
|
||||||
|
* then it should move cursor to the start of the line.
|
||||||
|
* However, if a number was pressed previously before 0 was,
|
||||||
|
* then this means user is entering a count.
|
||||||
|
* In that case, we append 0 to the string. *)
|
||||||
|
if String.size str > 0 then
|
||||||
|
let
|
||||||
|
val lastChr = String.sub (str, String.size str - 1)
|
||||||
|
in
|
||||||
|
if Char.isDigit lastChr then
|
||||||
|
let
|
||||||
|
val chr = Char.toString chr
|
||||||
|
val str = str ^ chr
|
||||||
|
val mode = NORMAL_MODE str
|
||||||
|
in
|
||||||
|
AppWith.mode (app, mode, [])
|
||||||
|
end
|
||||||
|
else
|
||||||
|
MoveToStartOfLine.move (app, 1)
|
||||||
|
end
|
||||||
|
else
|
||||||
|
MoveToStartOfLine.move (app, 1)
|
||||||
|
| #"$" => MoveToEndOfLine.move (app, 1)
|
||||||
|
| #"^" => NormalMove.firstNonSpaceChr app
|
||||||
|
| #"G" =>
|
||||||
|
(* if str has a size larger than 0,
|
||||||
|
* interpret as "go to line" command;
|
||||||
|
* else, interpret as a command to move to end *)
|
||||||
|
if String.size str = 0 then NormalMove.moveToEnd app
|
||||||
|
else NormalMove.moveToLine (app, count - 1)
|
||||||
|
| #"%" => NormalMove.moveToMatchingPair app
|
||||||
|
| #"x" => NormalDelete.removeChr (app, count)
|
||||||
|
(* multi-char commands which can be appended *)
|
||||||
|
| #"t" => appendChr (app, chr, str)
|
||||||
|
| #"T" => appendChr (app, chr, str)
|
||||||
|
| #"y" => appendChr (app, chr, str)
|
||||||
|
| #"d" => appendChr (app, chr, str)
|
||||||
|
| #"f" => appendChr (app, chr, str)
|
||||||
|
| #"F" => appendChr (app, chr, str)
|
||||||
|
| #"g" => appendChr (app, chr, str)
|
||||||
|
| #"c" => appendChr (app, chr, str)
|
||||||
|
| _ =>
|
||||||
|
(* user may be entering a cmd with more than one chr
|
||||||
|
* such as "2dw" to delete two word
|
||||||
|
* so add current chr to mode, and save it in the app state *)
|
||||||
|
let
|
||||||
|
val str = if Char.isDigit chr then str ^ Char.toString chr else ""
|
||||||
|
val mode = NORMAL_MODE str
|
||||||
|
in
|
||||||
|
AppWith.mode (app, mode, [])
|
||||||
|
end
|
||||||
|
|
||||||
|
fun parseDelete (strPos, str, count, app, newCmd) =
|
||||||
|
if strPos = String.size str - 1 then
|
||||||
|
(* have to check newCmd *)
|
||||||
|
case newCmd of
|
||||||
|
CHAR_EVENT chr =>
|
||||||
|
(case chr of
|
||||||
|
(* terminal commands: require no input after *)
|
||||||
|
#"h" => NormalDelete.delete (app, count, Cursor.viH)
|
||||||
|
| #"l" => NormalDelete.delete (app, count, Cursor.viL)
|
||||||
|
(* vi's 'j' and 'k' commands move up or down a column
|
||||||
|
* but 'dj' or 'dk' delete whole lines
|
||||||
|
* so their implementation differs from
|
||||||
|
* other cursor motions *)
|
||||||
|
| #"j" => NormalDelete.deleteLine (app, count + 1)
|
||||||
|
| #"k" => NormalDelete.deleteLineBack (app, count)
|
||||||
|
| #"w" => NormalDelete.deleteByDfa (app, count, Cursor.nextWord)
|
||||||
|
| #"W" => NormalDelete.deleteByDfa (app, count, Cursor.nextWORD)
|
||||||
|
| #"b" => NormalDelete.deleteByDfa (app, count, Cursor.prevWord)
|
||||||
|
| #"B" => NormalDelete.deleteByDfa (app, count, Cursor.prevWORD)
|
||||||
|
| #"e" =>
|
||||||
|
NormalDelete.deleteByDfa (app, count, Cursor.endOfWordForDelete)
|
||||||
|
| #"E" =>
|
||||||
|
NormalDelete.deleteByDfa (app, count, Cursor.endOfWORDForDelete)
|
||||||
|
| #"0" => NormalDelete.delete (app, 1, Cursor.vi0)
|
||||||
|
| #"$" => NormalDelete.deleteToEndOfLine app
|
||||||
|
| #"^" => NormalDelete.deleteToFirstNonSpaceChr app
|
||||||
|
| #"d" => NormalDelete.deleteLine (app, count)
|
||||||
|
| #"n" => NormalDelete.deleteToNextMatch (app, count)
|
||||||
|
| #"N" => NormalDelete.deleteToPrevMatch (app, count)
|
||||||
|
(* non-terminal commands which require appending chr *)
|
||||||
|
| #"t" => appendChr (app, chr, str)
|
||||||
|
| #"T" => appendChr (app, chr, str)
|
||||||
|
| #"f" => appendChr (app, chr, str)
|
||||||
|
| #"F" => appendChr (app, chr, str)
|
||||||
|
| #"g" => appendChr (app, chr, str)
|
||||||
|
(* invalid command: reset mode *)
|
||||||
|
| _ => Finish.clearMode app)
|
||||||
|
| KEY_ESC => Finish.clearMode app
|
||||||
|
| RESIZE_EVENT (width, height) => Finish.resizeText (app, width, height)
|
||||||
|
| WITH_SEARCH_LIST searchList => Finish.withSearchList (app, searchList)
|
||||||
|
else
|
||||||
|
(* have to continue parsing string *)
|
||||||
|
case String.sub (str, strPos + 1) of
|
||||||
|
#"t" =>
|
||||||
|
(* delete till chr, forwards *)
|
||||||
|
(case newCmd of
|
||||||
|
CHAR_EVENT chr =>
|
||||||
|
NormalDelete.deleteToChr (app, 1, Cursor.tillNextChr, op+, chr)
|
||||||
|
| KEY_ESC => Finish.clearMode app
|
||||||
|
| RESIZE_EVENT (width, height) =>
|
||||||
|
Finish.resizeText (app, width, height)
|
||||||
|
| WITH_SEARCH_LIST searchList =>
|
||||||
|
Finish.withSearchList (app, searchList))
|
||||||
|
| #"T" =>
|
||||||
|
(* delete till chr, backwards *)
|
||||||
|
(case newCmd of
|
||||||
|
CHAR_EVENT chr =>
|
||||||
|
NormalDelete.deleteToChr (app, 1, Cursor.tillPrevChr, op-, chr)
|
||||||
|
| KEY_ESC => Finish.clearMode app
|
||||||
|
| RESIZE_EVENT (width, height) =>
|
||||||
|
Finish.resizeText (app, width, height)
|
||||||
|
| WITH_SEARCH_LIST searchList =>
|
||||||
|
Finish.withSearchList (app, searchList))
|
||||||
|
| #"f" =>
|
||||||
|
(case newCmd of
|
||||||
|
CHAR_EVENT chr =>
|
||||||
|
NormalDelete.deleteToChr (app, count, Cursor.toNextChr, op+, chr)
|
||||||
|
| KEY_ESC => Finish.clearMode app
|
||||||
|
| RESIZE_EVENT (width, height) =>
|
||||||
|
Finish.resizeText (app, width, height)
|
||||||
|
| WITH_SEARCH_LIST searchList =>
|
||||||
|
Finish.withSearchList (app, searchList))
|
||||||
|
| #"F" =>
|
||||||
|
(* delete to chr, backwards *)
|
||||||
|
(case newCmd of
|
||||||
|
CHAR_EVENT chr =>
|
||||||
|
NormalDelete.deleteToChr (app, count, Cursor.toPrevChr, op-, chr)
|
||||||
|
| KEY_ESC => Finish.clearMode app
|
||||||
|
| RESIZE_EVENT (width, height) =>
|
||||||
|
Finish.resizeText (app, width, height)
|
||||||
|
| WITH_SEARCH_LIST searchList =>
|
||||||
|
Finish.withSearchList (app, searchList))
|
||||||
|
| #"g" =>
|
||||||
|
(* same events as parseGo *)
|
||||||
|
(case newCmd of
|
||||||
|
CHAR_EVENT chr =>
|
||||||
|
(case chr of
|
||||||
|
#"e" =>
|
||||||
|
NormalDelete.deleteByDfa (app, count, Cursor.endOfPrevWord)
|
||||||
|
| #"E" =>
|
||||||
|
NormalDelete.deleteByDfa (app, count, Cursor.endOfPrevWORD)
|
||||||
|
| #"g" => NormalDelete.deleteToStart app
|
||||||
|
| _ => Finish.clearMode app)
|
||||||
|
| KEY_ESC => Finish.clearMode app
|
||||||
|
| RESIZE_EVENT (width, height) =>
|
||||||
|
Finish.resizeText (app, width, height)
|
||||||
|
| WITH_SEARCH_LIST searchList =>
|
||||||
|
Finish.withSearchList (app, searchList))
|
||||||
|
| _ => Finish.clearMode app
|
||||||
|
|
||||||
|
(* useful reference as list of non-terminal commands *)
|
||||||
|
fun parseAfterCount (strPos, str, count, app, newCmd) =
|
||||||
|
(* we are trying to parse multi-char but non-terminal strings here.
|
||||||
|
* For example, we don't want to parse 3w which is a terminal commmand
|
||||||
|
* to go 3 words forwards
|
||||||
|
* but we do want to parse 3d which is a non-terminal command
|
||||||
|
* which can be made terminal by adding "w" or "e" at the end.
|
||||||
|
* *)
|
||||||
|
case String.sub (str, strPos) of
|
||||||
|
#"t" =>
|
||||||
|
(* to just before char, forward
|
||||||
|
* tillNextChr with count of 1 has same effect
|
||||||
|
* as tillNextChr with any count above 1
|
||||||
|
* so just hardcode 1 *)
|
||||||
|
parseMoveToChr (1, app, Cursor.tillNextChr, newCmd)
|
||||||
|
| #"T" =>
|
||||||
|
(* to just before chr, backward *)
|
||||||
|
parseMoveToChr (1, app, Cursor.tillPrevChr, newCmd)
|
||||||
|
| #"y" => (* yank *) Finish.clearMode app
|
||||||
|
| #"d" => (* delete *) parseDelete (strPos, str, count, app, newCmd)
|
||||||
|
| #"f" =>
|
||||||
|
(* to chr, forward *)
|
||||||
|
parseMoveToChr (count, app, Cursor.toNextChr, newCmd)
|
||||||
|
| #"F" =>
|
||||||
|
(* to chr, backward *)
|
||||||
|
parseMoveToChr (count, app, Cursor.toPrevChr, newCmd)
|
||||||
|
| #"g" => (* go *) parseGo (count, app, newCmd)
|
||||||
|
| #"c" => (* change *) Finish.clearMode app
|
||||||
|
| _ =>
|
||||||
|
(* isn't a non-terminal cmd
|
||||||
|
* this case should never happen*)
|
||||||
|
Finish.clearMode app
|
||||||
|
|
||||||
|
fun parseNormalModeCommand (app, str, newCmd) =
|
||||||
|
if String.size str = 0 then
|
||||||
|
case newCmd of
|
||||||
|
CHAR_EVENT chr => parseChr (app, 1, chr, str)
|
||||||
|
| KEY_ESC => Finish.clearMode app
|
||||||
|
| RESIZE_EVENT (width, height) => Finish.resizeText (app, width, height)
|
||||||
|
| WITH_SEARCH_LIST searchList => Finish.withSearchList (app, searchList)
|
||||||
|
else if String.size str = 1 then
|
||||||
|
case newCmd of
|
||||||
|
CHAR_EVENT chr =>
|
||||||
|
(case Int.fromString str of
|
||||||
|
SOME count => parseChr (app, count, chr, str)
|
||||||
|
| NONE => parseAfterCount (0, str, 1, app, newCmd))
|
||||||
|
| KEY_ESC => Finish.clearMode app
|
||||||
|
| RESIZE_EVENT (width, height) => Finish.resizeText (app, width, height)
|
||||||
|
| WITH_SEARCH_LIST searchList => Finish.withSearchList (app, searchList)
|
||||||
|
else
|
||||||
|
let
|
||||||
|
val numLength = getNumLength (0, str)
|
||||||
|
val count = String.substring (str, 0, numLength)
|
||||||
|
val count =
|
||||||
|
case Int.fromString count of
|
||||||
|
SOME x => x
|
||||||
|
| NONE => 1
|
||||||
|
in
|
||||||
|
if numLength = String.size str then
|
||||||
|
(* reached end of str; str only contained numbers *)
|
||||||
|
case newCmd of
|
||||||
|
CHAR_EVENT chr => parseChr (app, count, chr, str)
|
||||||
|
| KEY_ESC => Finish.clearMode app
|
||||||
|
| RESIZE_EVENT (width, height) =>
|
||||||
|
Finish.resizeText (app, width, height)
|
||||||
|
| WITH_SEARCH_LIST searchList =>
|
||||||
|
Finish.withSearchList (app, searchList)
|
||||||
|
else
|
||||||
|
(* continue parsing. *)
|
||||||
|
parseAfterCount (numLength, str, count, app, newCmd)
|
||||||
|
end
|
||||||
|
|
||||||
|
fun update (app, str, msg) = parseNormalModeCommand (app, str, msg)
|
||||||
|
end
|
||||||
@@ -209,7 +209,8 @@ struct
|
|||||||
|
|
||||||
fun helpMoveToChr (app: app_type, buffer, cursorIdx, count, fMove, chr) =
|
fun helpMoveToChr (app: app_type, buffer, cursorIdx, count, fMove, chr) =
|
||||||
if count = 0 then
|
if count = 0 then
|
||||||
Finish.buildTextAndClearAfterChr (app, buffer, cursorIdx, #searchList app, [])
|
Finish.buildTextAndClearAfterChr
|
||||||
|
(app, buffer, cursorIdx, #searchList app, [])
|
||||||
else
|
else
|
||||||
let
|
let
|
||||||
(* move LineGap to cursorIdx, which is necessary for finding newCursorIdx *)
|
(* move LineGap to cursorIdx, which is necessary for finding newCursorIdx *)
|
||||||
@@ -230,8 +231,11 @@ struct
|
|||||||
val {cursorIdx, searchList, buffer, ...} = app
|
val {cursorIdx, searchList, buffer, ...} = app
|
||||||
val newCursorIdx = SearchList.nextMatch (cursorIdx, searchList, count)
|
val newCursorIdx = SearchList.nextMatch (cursorIdx, searchList, count)
|
||||||
in
|
in
|
||||||
if newCursorIdx = ~1 then Finish.clearMode app
|
if newCursorIdx = ~1 then
|
||||||
else Finish.buildTextAndClearAfterChr (app, buffer, newCursorIdx, searchList, [])
|
Finish.clearMode app
|
||||||
|
else
|
||||||
|
Finish.buildTextAndClearAfterChr
|
||||||
|
(app, buffer, newCursorIdx, searchList, [])
|
||||||
end
|
end
|
||||||
|
|
||||||
fun moveToPrevMatch (app: app_type, count) =
|
fun moveToPrevMatch (app: app_type, count) =
|
||||||
@@ -239,8 +243,11 @@ struct
|
|||||||
val {cursorIdx, searchList, buffer, ...} = app
|
val {cursorIdx, searchList, buffer, ...} = app
|
||||||
val newCursorIdx = SearchList.prevMatch (cursorIdx, searchList, count)
|
val newCursorIdx = SearchList.prevMatch (cursorIdx, searchList, count)
|
||||||
in
|
in
|
||||||
if newCursorIdx = ~1 then Finish.clearMode app
|
if newCursorIdx = ~1 then
|
||||||
else Finish.buildTextAndClearAfterChr (app, buffer, newCursorIdx, searchList, [])
|
Finish.clearMode app
|
||||||
|
else
|
||||||
|
Finish.buildTextAndClearAfterChr
|
||||||
|
(app, buffer, newCursorIdx, searchList, [])
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -35,10 +35,10 @@ fcore/move.sml
|
|||||||
|
|
||||||
fcore/normal-mode/normal-move.sml
|
fcore/normal-mode/normal-move.sml
|
||||||
fcore/normal-mode/normal-delete.sml
|
fcore/normal-mode/normal-delete.sml
|
||||||
|
fcore/normal-mode/normal-mode.sml
|
||||||
|
|
||||||
fcore/app-update.sml
|
fcore/app-update.sml
|
||||||
|
|
||||||
|
|
||||||
(* TEST FILES *)
|
(* TEST FILES *)
|
||||||
$(SML_LIB)/basis/mlton.mlb
|
$(SML_LIB)/basis/mlton.mlb
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user