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

progress functorising

Browse Source
This commit is contained in:
Humza Shahid
2025-08-04 04:24:24 +01:00
parent 895c286b4b
commit fe9dd0f034
1 changed files with 104 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

240
fcore/cursor.sml
View File

@@ -863,146 +863,114 @@ struct
val toPrevChr = ToPrevChr.foldPrev
fun helpTillPrevChr
( strPos
, str
, absIdx
, stl
, ltl
, origIdx
, findChr
, lastNonLine
, lastLine
, lastValid
) =
if strPos < 0 then
case (stl, ltl) of
(shd :: stl, lhd :: ltl) =>
helpTillPrevChr
( String.size shd - 1
, shd
, absIdx
, stl
, ltl
, origIdx
, findChr
, lastNonLine
, lastLine
, lastValid
)
| (_, _) => origIdx
else
let
val chr = String.sub (str, strPos)
in
if chr = findChr then
if lastLine = lastNonLine then lastNonLine
else if absIdx + 1 = lastLine then lastValid + 1
else Int.min (lastLine, lastNonLine)
else
let
val lastLine = if chr = #"\n" then absIdx else lastLine
val lastNonLine = if chr = #"\n" then lastNonLine else absIdx
structure TillPrevChr =
MakeIfCharFolderPrev
(struct
type env = char
(* There is a slightly tricky edge case
* which is the reason the lastValid variable.
* Say we have a string "a\n\n\nbcd"
* and we type "Ta" with the cursor at the end.
* We want the cursor to go to the second line break
* because (graphical-chr -> \n) should not be selectable.
* However, with only lastLine and lastNonLine variables,
* we only have information about the most recent \n
* and the most recent graphical-chr.
* This means we don't have information about the case
* where a graphical-chr is followed by multiple '\n's.
* The lastValid variable keeps track of this information
* so we can use it to provide the expected behaviour.
* *)
val lastValid =
if lastLine = lastNonLine + 1 then lastLine + 1
else Int.min (lastLine, lastNonLine)
in
helpTillPrevChr
( strPos - 1
, str
, absIdx - 1
, stl
, ltl
, origIdx
, findChr
, lastNonLine
, lastLine
, lastValid
)
end
end
fun helpTillPrevChr
( strPos
, str
, absIdx
, stl
, origIdx
, findChr
, lastNonLine
, lastLine
, lastValid
) =
if strPos < 0 then
case stl of
shd :: stl =>
helpTillPrevChr
( String.size shd - 1
, shd
, absIdx
, stl
, origIdx
, findChr
, lastNonLine
, lastLine
, lastValid
)
| [] => origIdx
else
let
val chr = String.sub (str, strPos)
in
if chr = findChr then
if lastLine = lastNonLine then lastNonLine
else if absIdx + 1 = lastLine then lastValid + 1
else Int.min (lastLine, lastNonLine)
else
let
val lastLine = if chr = #"\n" then absIdx else lastLine
val lastNonLine = if chr = #"\n" then lastNonLine else absIdx
fun startTillPrevChr (shd, strIdx, absIdx, stl, ltl, findChr) =
(* we want to start iterating from Prev char after strIdx *)
if strIdx > 0 then
helpTillPrevChr
( strIdx - 1
, shd
, absIdx - 1
, stl
, ltl
, absIdx
, findChr
, absIdx
, absIdx
, absIdx
)
else
case (stl, ltl) of
(stlhd :: stltl, ltlhd :: ltltl) =>
helpTillPrevChr
( String.size stlhd - 1
, stlhd
, absIdx - 1
, stltl
, ltltl
, absIdx
, findChr
, absIdx
, absIdx
, absIdx
)
| (_, _) => (* tl is empty; return 0 for lineGap start *) 0
(* There is a slightly tricky edge case
* which is the reason the lastValid variable.
* Say we have a string "a\n\n\nbcd"
* and we type "Ta" with the cursor at the end.
* We want the cursor to go to the second line break
* because (graphical-chr -> \n) should not be selectable.
* However, with only lastLine and lastNonLine variables,
* we only have information about the most recent \n
* and the most recent graphical-chr.
* This means we don't have information about the case
* where a graphical-chr is followed by multiple '\n's.
* The lastValid variable keeps track of this information
* so we can use it to provide the expected behaviour.
* *)
val lastValid =
if lastLine = lastNonLine + 1 then lastLine + 1
else Int.min (lastLine, lastNonLine)
in
helpTillPrevChr
( strPos - 1
, str
, absIdx - 1
, stl
, origIdx
, findChr
, lastNonLine
, lastLine
, lastValid
)
end
end
fun prevChr (lineGap: LineGap.t, cursorIdx, chr, fStart) =
let
val
{rightStrings, rightLines, idx = bufferIdx, leftStrings, leftLines, ...} =
lineGap
in
case (rightStrings, rightLines) of
(shd :: stl, lhd :: ltl) =>
let
(* convert absolute cursorIdx to idx relative to hd string *)
val strIdx = cursorIdx - bufferIdx
in
if strIdx < String.size shd then
(* strIdx is in this string *)
fStart (shd, strIdx, cursorIdx, leftStrings, leftLines, chr)
else
(* strIdx is in tl *)
(case (stl, ltl) of
(stlhd :: stltl, ltlhd :: ltltl) =>
let
val strIdx = strIdx - String.size shd
val leftStrings = shd :: leftStrings
val leftLines = lhd :: leftLines
in
fStart
(shd, strIdx, cursorIdx, leftStrings, leftLines, chr)
end
| (_, _) => cursorIdx)
end
| (_, _) => cursorIdx
end
fun fStart (strIdx, shd, _, absIdx, stl, ltl, findChr) =
(* we want to start iterating from Prev char after strIdx *)
if strIdx > 0 then
helpTillPrevChr
( strIdx - 1
, shd
, absIdx - 1
, stl
, absIdx
, findChr
, absIdx
, absIdx
, absIdx
)
else
case stl of
stlhd :: stltl =>
helpTillPrevChr
( String.size stlhd - 1
, stlhd
, absIdx - 1
, stltl
, absIdx
, findChr
, absIdx
, absIdx
, absIdx
)
| [] => (* tl is empty; return 0 for lineGap start *) 0
end)
fun tillPrevChr (lineGap, cursorIdx, chr) =
prevChr (lineGap, cursorIdx, chr, startTillPrevChr)
val tillPrevChr = TillPrevChr.foldPrev
fun helpMatchPairNext
(strPos, str, absIdx, stl, origIdx, openChr, openNum, closeChr, closeNum) =