humza/sml-projects
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

propagate 'time' value throughout normal mode updating

Browse Source
This commit is contained in:
Humza Shahid
2025-08-20 13:12:07 +01:00
parent f97a2944ae
commit 0dd7a69777
3 changed files with 86 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
fcore/normal-mode/normal-delete.sml
View File

@@ -244,14 +244,14 @@ struct
end end
fun helpDeleteToChr fun helpDeleteToChr
(app: app_type, buffer, cursorIdx, otherIdx, count, fMove, fInc, chr) = (app: app_type, buffer, cursorIdx, otherIdx, count, fMove, fInc, chr, time) =
if count = 0 then if count = 0 then
let let
val low = Int.min (cursorIdx, otherIdx) val low = Int.min (cursorIdx, otherIdx)
val high = Int.max (cursorIdx, otherIdx) val high = Int.max (cursorIdx, otherIdx)
val length = high - low val length = high - low
in in
deleteAndFinish (app, low, length, buffer, #bufferModifyTime app) deleteAndFinish (app, low, length, buffer, time)
end end
else else
let let
@@ -261,10 +261,19 @@ struct
val newOtherIdx = fInc (newOtherIdx, 1) val newOtherIdx = fInc (newOtherIdx, 1)
in in
helpDeleteToChr helpDeleteToChr
(app, buffer, cursorIdx, newOtherIdx, newCount, fMove, fInc, chr) ( app
, buffer
, cursorIdx
, newOtherIdx
, newCount
, fMove
, fInc
, chr
, time
)
end end
fun deleteToChr (app: app_type, count, fMove, fInc, chr) = fun deleteToChr (app: app_type, count, fMove, fInc, chr, time) =
helpDeleteToChr helpDeleteToChr
( app ( app
, #buffer app , #buffer app
@@ -274,6 +283,7 @@ struct
, fMove , fMove
, fInc , fInc
, chr , chr
, time
) )
fun deleteToStart (app: app_type, time) = fun deleteToStart (app: app_type, time) =

132
fcore/normal-mode/normal-mode.sml
View File

@@ -31,7 +31,7 @@ struct
| #"g" => NormalMove.moveToStart app | #"g" => NormalMove.moveToStart app
| _ => Finish.clearMode app | _ => Finish.clearMode app
fun parseChr (app: app_type, count, chr, str) = fun parseChr (app: app_type, count, chr, str, time) =
case chr of case chr of
#"h" => MoveViH.move (app, count) #"h" => MoveViH.move (app, count)
| #"j" => MoveViJ.move (app, count) | #"j" => MoveViJ.move (app, count)
@@ -81,7 +81,7 @@ struct
if String.size str = 0 then NormalMove.moveToEnd app if String.size str = 0 then NormalMove.moveToEnd app
else NormalMove.moveToLine (app, count - 1) else NormalMove.moveToLine (app, count - 1)
| #"%" => NormalMove.moveToMatchingPair app | #"%" => NormalMove.moveToMatchingPair app
| #"x" => NormalDelete.removeChr (app, count) | #"x" => NormalDelete.removeChr (app, count, time)
(* multi-char commands which can be appended *) (* multi-char commands which can be appended *)
| #"t" => appendChr (app, chr, str) | #"t" => appendChr (app, chr, str)
| #"T" => appendChr (app, chr, str) | #"T" => appendChr (app, chr, str)
@@ -102,56 +102,58 @@ struct
AppWith.mode (app, mode, []) AppWith.mode (app, mode, [])
end end
fun parseDeleteInside (app, chr) = fun parseDeleteInside (app, chr, time) =
case chr of case chr of
#"w" => NormalDelete.deleteInsideWord app #"w" => NormalDelete.deleteInsideWord (app, time)
| #"W" => NormalDelete.deleteInsideWORD app | #"W" => NormalDelete.deleteInsideWORD (app, time)
| #"(" => NormalDelete.deleteInsideChrOpen (app, chr) | #"(" => NormalDelete.deleteInsideChrOpen (app, chr, time)
| #"[" => NormalDelete.deleteInsideChrOpen (app, chr) | #"[" => NormalDelete.deleteInsideChrOpen (app, chr, time)
| #"{" => NormalDelete.deleteInsideChrOpen (app, chr) | #"{" => NormalDelete.deleteInsideChrOpen (app, chr, time)
| #"<" => NormalDelete.deleteInsideChrOpen (app, chr) | #"<" => NormalDelete.deleteInsideChrOpen (app, chr, time)
| #")" => NormalDelete.deleteInsideChrClose (app, chr) | #")" => NormalDelete.deleteInsideChrClose (app, chr, time)
| #"]" => NormalDelete.deleteInsideChrClose (app, chr) | #"]" => NormalDelete.deleteInsideChrClose (app, chr, time)
| #"}" => NormalDelete.deleteInsideChrClose (app, chr) | #"}" => NormalDelete.deleteInsideChrClose (app, chr, time)
| #">" => NormalDelete.deleteInsideChrClose (app, chr) | #">" => NormalDelete.deleteInsideChrClose (app, chr, time)
| _ => Finish.clearMode app | _ => Finish.clearMode app
fun parseDeleteAround (app, chr) = fun parseDeleteAround (app, chr, time) =
case chr of case chr of
#"(" => NormalDelete.deleteInsideChrOpen (app, chr) #"(" => NormalDelete.deleteInsideChrOpen (app, chr, time)
| #"[" => NormalDelete.deleteInsideChrOpen (app, chr) | #"[" => NormalDelete.deleteInsideChrOpen (app, chr, time)
| #"{" => NormalDelete.deleteInsideChrOpen (app, chr) | #"{" => NormalDelete.deleteInsideChrOpen (app, chr, time)
| #"<" => NormalDelete.deleteInsideChrOpen (app, chr) | #"<" => NormalDelete.deleteInsideChrOpen (app, chr, time)
| #")" => NormalDelete.deleteAroundChrClose (app, chr) | #")" => NormalDelete.deleteAroundChrClose (app, chr, time)
| #"]" => NormalDelete.deleteAroundChrClose (app, chr) | #"]" => NormalDelete.deleteAroundChrClose (app, chr, time)
| #"}" => NormalDelete.deleteAroundChrClose (app, chr) | #"}" => NormalDelete.deleteAroundChrClose (app, chr, time)
| #">" => NormalDelete.deleteAroundChrClose (app, chr) | #">" => NormalDelete.deleteAroundChrClose (app, chr, time)
| _ => Finish.clearMode app | _ => Finish.clearMode app
fun parseDeleteTerminal (str, count, app, chrCmd) = fun parseDeleteTerminal (str, count, app, chrCmd, time) =
case chrCmd of case chrCmd of
(* terminal commands: require no input after *) (* terminal commands: require no input after *)
#"h" => NormalDelete.delete (app, count, Cursor.viH) #"h" => NormalDelete.delete (app, count, Cursor.viH, time)
| #"l" => NormalDelete.delete (app, count, Cursor.viL) | #"l" => NormalDelete.delete (app, count, Cursor.viL, time)
(* vi's 'j' and 'k' commands move up or down a column (* vi's 'j' and 'k' commands move up or down a column
* but 'dj' or 'dk' delete whole lines * but 'dj' or 'dk' delete whole lines
* so their implementation differs from * so their implementation differs from
* other cursor motions *) * other cursor motions *)
| #"j" => NormalDelete.deleteLine (app, count + 1) | #"j" => NormalDelete.deleteLine (app, count + 1, time)
| #"k" => NormalDelete.deleteLineBack (app, count) | #"k" => NormalDelete.deleteLineBack (app, count, time)
| #"w" => NormalDelete.deleteByDfa (app, count, Cursor.nextWord) | #"w" => NormalDelete.deleteByDfa (app, count, Cursor.nextWord, time)
| #"W" => NormalDelete.deleteByDfa (app, count, Cursor.nextWORD) | #"W" => NormalDelete.deleteByDfa (app, count, Cursor.nextWORD, time)
| #"b" => NormalDelete.deleteByDfa (app, count, Cursor.prevWord) | #"b" => NormalDelete.deleteByDfa (app, count, Cursor.prevWord, time)
| #"B" => NormalDelete.deleteByDfa (app, count, Cursor.prevWORD) | #"B" => NormalDelete.deleteByDfa (app, count, Cursor.prevWORD, time)
| #"e" => NormalDelete.deleteByDfa (app, count, Cursor.endOfWordForDelete) | #"e" =>
| #"E" => NormalDelete.deleteByDfa (app, count, Cursor.endOfWORDForDelete) NormalDelete.deleteByDfa (app, count, Cursor.endOfWordForDelete, time)
| #"0" => NormalDelete.delete (app, 1, Cursor.vi0) | #"E" =>
| #"$" => NormalDelete.deleteToEndOfLine app NormalDelete.deleteByDfa (app, count, Cursor.endOfWORDForDelete, time)
| #"^" => NormalDelete.deleteToFirstNonSpaceChr app | #"0" => NormalDelete.delete (app, 1, Cursor.vi0, time)
| #"d" => NormalDelete.deleteLine (app, count) | #"$" => NormalDelete.deleteToEndOfLine (app, time)
| #"n" => NormalDelete.deleteToNextMatch (app, count) | #"^" => NormalDelete.deleteToFirstNonSpaceChr (app, time)
| #"N" => NormalDelete.deleteToPrevMatch (app, count) | #"d" => NormalDelete.deleteLine (app, count, time)
| #"%" => NormalDelete.deletePair app | #"n" => NormalDelete.deleteToNextMatch (app, count, time)
| #"N" => NormalDelete.deleteToPrevMatch (app, count, time)
| #"%" => NormalDelete.deletePair (app, time)
(* non-terminal commands which require appending chr *) (* non-terminal commands which require appending chr *)
| #"t" => appendChr (app, chrCmd, str) | #"t" => appendChr (app, chrCmd, str)
| #"T" => appendChr (app, chrCmd, str) | #"T" => appendChr (app, chrCmd, str)
@@ -163,34 +165,38 @@ struct
(* invalid command: reset mode *) (* invalid command: reset mode *)
| _ => Finish.clearMode app | _ => Finish.clearMode app
fun parseDeleteGo (app, count, chrCmd) = fun parseDeleteGo (app, count, chrCmd, time) =
case chrCmd of case chrCmd of
#"e" => NormalDelete.deleteByDfa (app, count, Cursor.endOfPrevWord) #"e" => NormalDelete.deleteByDfa (app, count, Cursor.endOfPrevWord, time)
| #"E" => NormalDelete.deleteByDfa (app, count, Cursor.endOfPrevWORD) | #"E" => NormalDelete.deleteByDfa (app, count, Cursor.endOfPrevWORD, time)
| #"g" => NormalDelete.deleteToStart app | #"g" => NormalDelete.deleteToStart (app, time)
| _ => Finish.clearMode app | _ => Finish.clearMode app
fun parseDelete (strPos, str, count, app, chrCmd) = fun parseDelete (strPos, str, count, app, chrCmd, time) =
if strPos = String.size str - 1 then if strPos = String.size str - 1 then
parseDeleteTerminal (str, count, app, chrCmd) parseDeleteTerminal (str, count, app, chrCmd, time)
else else
(* have to continue parsing string *) (* have to continue parsing string *)
case String.sub (str, strPos + 1) of case String.sub (str, strPos + 1) of
#"t" => #"t" =>
NormalDelete.deleteToChr (app, 1, Cursor.tillNextChr, op+, chrCmd) NormalDelete.deleteToChr
(app, 1, Cursor.tillNextChr, op+, chrCmd, time)
| #"T" => | #"T" =>
NormalDelete.deleteToChr (app, 1, Cursor.tillPrevChr, op-, chrCmd) NormalDelete.deleteToChr
(app, 1, Cursor.tillPrevChr, op-, chrCmd, time)
| #"f" => | #"f" =>
NormalDelete.deleteToChr (app, count, Cursor.toNextChr, op+, chrCmd) NormalDelete.deleteToChr
(app, count, Cursor.toNextChr, op+, chrCmd, time)
| #"F" => | #"F" =>
NormalDelete.deleteToChr (app, count, Cursor.toPrevChr, op-, chrCmd) NormalDelete.deleteToChr
| #"g" => parseDeleteGo (app, count, chrCmd) (app, count, Cursor.toPrevChr, op-, chrCmd, time)
| #"i" => parseDeleteInside (app, chrCmd) | #"g" => parseDeleteGo (app, count, chrCmd, time)
| #"a" => parseDeleteAround (app, chrCmd) | #"i" => parseDeleteInside (app, chrCmd, time)
| #"a" => parseDeleteAround (app, chrCmd, time)
| _ => Finish.clearMode app | _ => Finish.clearMode app
(* useful reference as list of non-terminal commands *) (* useful reference as list of non-terminal commands *)
fun parseAfterCount (strPos, str, count, app, chrCmd) = fun parseAfterCount (strPos, str, count, app, chrCmd, time) =
(* we are trying to parse multi-char but non-terminal strings here. (* 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 * For example, we don't want to parse 3w which is a terminal commmand
* to go 3 words forwards * to go 3 words forwards
@@ -208,7 +214,7 @@ struct
(* to just before chr, backward *) (* to just before chr, backward *)
parseMoveToChr (1, app, Cursor.tillPrevChr, chrCmd) parseMoveToChr (1, app, Cursor.tillPrevChr, chrCmd)
| #"y" => (* yank *) Finish.clearMode app | #"y" => (* yank *) Finish.clearMode app
| #"d" => (* delete *) parseDelete (strPos, str, count, app, chrCmd) | #"d" => (* delete *) parseDelete (strPos, str, count, app, chrCmd, time)
| #"f" => | #"f" =>
(* to chr, forward *) (* to chr, forward *)
parseMoveToChr (count, app, Cursor.toNextChr, chrCmd) parseMoveToChr (count, app, Cursor.toNextChr, chrCmd)
@@ -222,13 +228,13 @@ struct
* this case should never happen*) * this case should never happen*)
Finish.clearMode app Finish.clearMode app
fun parseNormalModeCommand (app, str, chrCmd) = fun parseNormalModeCommand (app, str, chrCmd, time) =
if String.size str = 0 then if String.size str = 0 then
parseChr (app, 1, chrCmd, str) parseChr (app, 1, chrCmd, str, time)
else if String.size str = 1 then else if String.size str = 1 then
case Int.fromString str of case Int.fromString str of
SOME count => parseChr (app, count, chrCmd, str) SOME count => parseChr (app, count, chrCmd, str, time)
| NONE => parseAfterCount (0, str, 1, app, chrCmd) | NONE => parseAfterCount (0, str, 1, app, chrCmd, time)
else else
let let
val numLength = getNumLength (0, str) val numLength = getNumLength (0, str)
@@ -240,15 +246,15 @@ struct
in in
if numLength = String.size str then if numLength = String.size str then
(* reached end of str; str only contained numbers *) (* reached end of str; str only contained numbers *)
parseChr (app, count, chrCmd, str) parseChr (app, count, chrCmd, str, time)
else else
(* continue parsing. *) (* continue parsing. *)
parseAfterCount (numLength, str, count, app, chrCmd) parseAfterCount (numLength, str, count, app, chrCmd, time)
end end
fun update (app, str, msg) = fun update (app, str, msg, time) =
case msg of case msg of
CHAR_EVENT chrCmd => parseNormalModeCommand (app, str, chrCmd) CHAR_EVENT chrCmd => parseNormalModeCommand (app, str, chrCmd, time)
| KEY_ESC => Finish.clearMode app | KEY_ESC => Finish.clearMode app
| RESIZE_EVENT (width, height) => Finish.resizeText (app, width, height) | RESIZE_EVENT (width, height) => Finish.resizeText (app, width, height)
| WITH_SEARCH_LIST searchList => Finish.withSearchList (app, searchList) | WITH_SEARCH_LIST searchList => Finish.withSearchList (app, searchList)

3
shf-tests.mlb
View File

@@ -35,3 +35,6 @@ 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