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

reduce indentation level in MakeDfaLoop functors a bit, by performing 'strIdx = ...' calculation before we branch in case expression

Browse Source
This commit is contained in:
Humza Shahid
2025-07-20 13:48:14 +01:00
parent f57af737b9
commit c6f4d1d8f3
1 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fcore/cursor-dfa/make-dfa-loop.sml
View File

@@ -9,23 +9,22 @@ struct
fun next (lineGap: LineGap.t, cursorIdx) = fun next (lineGap: LineGap.t, cursorIdx) =
let let
val {rightStrings, idx = bufferIdx, ...} = lineGap val {rightStrings, idx = bufferIdx, ...} = lineGap
in
case rightStrings of
shd :: stl =>
let
(* convert absolute cursorIdx to idx relative to hd string *) (* convert absolute cursorIdx to idx relative to hd string *)
val strIdx = cursorIdx - bufferIdx val strIdx = cursorIdx - bufferIdx
in in
case rightStrings of
shd :: stl =>
if strIdx < String.size shd then if strIdx < String.size shd then
(* strIdx is in this string *) (* strIdx is in this string *)
M.fStart (strIdx, cursorIdx, shd, stl, M.startState, 1) M.fStart (strIdx, cursorIdx, shd, stl, M.startState, 1)
else else
(* strIdx is in tl *) (* strIdx is in tl *)
case stl of (case stl of
stlhd :: stltl => stlhd :: stltl =>
M.fStart (strIdx, cursorIdx, stlhd, stltl, M.startState, 1) let val strIdx = strIdx - String.size shd
| _ => cursorIdx in M.fStart (strIdx, cursorIdx, stlhd, stltl, M.startState, 1)
end end
| _ => cursorIdx)
| [] => cursorIdx | [] => cursorIdx
end end
end end
@@ -35,13 +34,11 @@ struct
fun prev (lineGap: LineGap.t, cursorIdx) = fun prev (lineGap: LineGap.t, cursorIdx) =
let let
val {rightStrings, leftStrings, idx = bufferIdx, ...} = lineGap val {rightStrings, leftStrings, idx = bufferIdx, ...} = lineGap
in
case rightStrings of
shd :: stl =>
let
(* convert absolute cursorIdx to idx relative to hd string *) (* convert absolute cursorIdx to idx relative to hd string *)
val strIdx = cursorIdx - bufferIdx val strIdx = cursorIdx - bufferIdx
in in
case rightStrings of
shd :: stl =>
if strIdx < String.size shd then if strIdx < String.size shd then
(* strIdx is in this string *) (* strIdx is in this string *)
M.fStart (strIdx, cursorIdx, shd, leftStrings, M.startState, 1) M.fStart (strIdx, cursorIdx, shd, leftStrings, M.startState, 1)
@@ -57,7 +54,6 @@ struct
(strIdx, cursorIdx, stlhd, leftStrings, M.startState, 1) (strIdx, cursorIdx, stlhd, leftStrings, M.startState, 1)
end end
| [] => cursorIdx) | [] => cursorIdx)
end
| [] => cursorIdx | [] => cursorIdx
end end
end end