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

change representation of search list to be a plain int vector and not a zipper (I am not using it for incremental purposes anyway so no point using a zipper)

Browse Source
This commit is contained in:
Humza Shahid
2025-08-06 00:42:24 +01:00
parent e06a27d5ad
commit fab8cfcf20
4 changed files with 22 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fcore/app-update.sml
View File

@@ -24,7 +24,6 @@ struct
val newBuffer = LineGap.goToLine (startLine, buffer) val newBuffer = LineGap.goToLine (startLine, buffer)
val lineIdx = TextBuilder.getLineAbsIdx (startLine, buffer) val lineIdx = TextBuilder.getLineAbsIdx (startLine, buffer)
val searchList = SearchList.goToNum (lineIdx, searchList)
val drawMsg = TextBuilder.build val drawMsg = TextBuilder.build
( startLine ( startLine
@@ -60,7 +59,6 @@ struct
* and move searchList to idx where line starts as well *) * and move searchList to idx where line starts as well *)
val buffer = LineGap.goToLine (startLine, buffer) val buffer = LineGap.goToLine (startLine, buffer)
val lineIdx = TextBuilder.getLineAbsIdx (startLine, buffer) val lineIdx = TextBuilder.getLineAbsIdx (startLine, buffer)
val searchList = SearchList.goToNum (lineIdx, searchList)
val drawMsg = TextBuilder.build val drawMsg = TextBuilder.build
( startLine ( startLine
@@ -97,7 +95,6 @@ struct
val buffer = LineGap.goToLine (startLine, buffer) val buffer = LineGap.goToLine (startLine, buffer)
val lineIdx = TextBuilder.getLineAbsIdx (startLine, buffer) val lineIdx = TextBuilder.getLineAbsIdx (startLine, buffer)
val searchList = SearchList.goToNum (lineIdx, searchList)
val drawMsg = TextBuilder.build val drawMsg = TextBuilder.build
( startLine ( startLine
@@ -123,7 +120,6 @@ struct
val cursorIdx = 0 val cursorIdx = 0
val startLine = 0 val startLine = 0
val buffer = LineGap.goToIdx (cursorIdx, buffer) val buffer = LineGap.goToIdx (cursorIdx, buffer)
val searchList = SearchList.goToNum (0, searchList)
val drawMsg = TextBuilder.build val drawMsg = TextBuilder.build
( startLine ( startLine
@@ -164,7 +160,6 @@ struct
val buffer = LineGap.goToLine (bufferLine, buffer) val buffer = LineGap.goToLine (bufferLine, buffer)
val lineIdx = TextBuilder.getLineAbsIdx (bufferLine, buffer) val lineIdx = TextBuilder.getLineAbsIdx (bufferLine, buffer)
val searchList = SearchList.goToNum (lineIdx, searchList)
val drawMsg = TextBuilder.build val drawMsg = TextBuilder.build
( bufferLine ( bufferLine
@@ -207,7 +202,6 @@ struct
val buffer = LineGap.goToLine (startLine, buffer) val buffer = LineGap.goToLine (startLine, buffer)
val lineIdx = TextBuilder.getLineAbsIdx (startLine, buffer) val lineIdx = TextBuilder.getLineAbsIdx (startLine, buffer)
val searchList = SearchList.goToNum (lineIdx, searchList)
val drawMsg = TextBuilder.build val drawMsg = TextBuilder.build
( startLine ( startLine
@@ -244,7 +238,6 @@ struct
val buffer = LineGap.goToLine (startLine, buffer) val buffer = LineGap.goToLine (startLine, buffer)
val lineIdx = TextBuilder.getLineAbsIdx (startLine, buffer) val lineIdx = TextBuilder.getLineAbsIdx (startLine, buffer)
val searchList = SearchList.goToNum (lineIdx, searchList)
in in
if if
TextWindow.isCursorVisible TextWindow.isCursorVisible
@@ -281,7 +274,6 @@ struct
val buffer = LineGap.goToLine (startLine, buffer) val buffer = LineGap.goToLine (startLine, buffer)
val lineIdx = TextBuilder.getLineAbsIdx (startLine, buffer) val lineIdx = TextBuilder.getLineAbsIdx (startLine, buffer)
val searchList = SearchList.goToNum (lineIdx, searchList)
val drawMsg = TextBuilder.build val drawMsg = TextBuilder.build
( startLine ( startLine
@@ -636,7 +628,6 @@ struct
val cursorIdx = 0 val cursorIdx = 0
val startLine = 0 val startLine = 0
val buffer = LineGap.goToIdx (cursorIdx, buffer) val buffer = LineGap.goToIdx (cursorIdx, buffer)
val searchList = SearchList.goToNum (0, searchList)
val drawMsg = TextBuilder.build val drawMsg = TextBuilder.build
( startLine ( startLine

1
fcore/finish.sml
View File

@@ -17,7 +17,6 @@ struct
(* move buffer to new startLine as required by TextBuilder.build *) (* move buffer to new startLine as required by TextBuilder.build *)
val buffer = LineGap.goToLine (startLine, buffer) val buffer = LineGap.goToLine (startLine, buffer)
val lineIdx = TextBuilder.getLineAbsIdx (startLine, buffer) val lineIdx = TextBuilder.getLineAbsIdx (startLine, buffer)
val searchList = SearchList.goToNum (lineIdx, searchList)
val drawMsg = TextBuilder.build val drawMsg = TextBuilder.build
( startLine ( startLine

41
fcore/search-list.sml
View File

@@ -1,36 +1,12 @@
structure SearchList = structure SearchList =
struct struct
structure IntSet = type t = int vector
MakeGapSet
(struct
type key = int
val maxNodeSize = 32
fun l (a, b: int) = a < b val empty = Vector.fromList []
fun eq (a, b: int) = a = b
fun g (a, b: int) = a > b
end)
type t = IntSet.t
val empty = IntSet.empty
val goToNum = IntSet.moveTo
fun cons (num, acc) =
let
val num = Vector.fromList [num]
in
case acc of
hd :: tl =>
if Vector.length hd < 32 then (Vector.concat [num, hd]) :: tl
else num :: acc
| [] => num :: acc
end
fun searchStep (pos, hd, absIdx, tl, acc, searchPos, searchString) = fun searchStep (pos, hd, absIdx, tl, acc, searchPos, searchString) =
if searchPos < 0 then if searchPos < 0 then
cons (absIdx + 1, acc) (absIdx + 1) :: acc
else if pos < 0 then else if pos < 0 then
case tl of case tl of
hd :: tl => hd :: tl =>
@@ -54,7 +30,7 @@ struct
case tl of case tl of
hd :: tl => hd :: tl =>
loopSearch (String.size hd - 1, hd, absIdx, tl, acc, searchString) loopSearch (String.size hd - 1, hd, absIdx, tl, acc, searchString)
| [] => acc | [] => Vector.fromList acc
else else
let let
val acc = searchStep val acc = searchStep
@@ -65,10 +41,8 @@ struct
(* Prerequisite: move buffer/LineGap to end *) (* Prerequisite: move buffer/LineGap to end *)
fun search (buffer: LineGap.t, searchString) = fun search (buffer: LineGap.t, searchString) =
let
val acc =
if String.size searchString = 0 then if String.size searchString = 0 then
[] empty
else else
let let
val {leftStrings, idx = absIdx, ...} = buffer val {leftStrings, idx = absIdx, ...} = buffer
@@ -77,10 +51,7 @@ struct
hd :: tl => hd :: tl =>
loopSearch loopSearch
(String.size hd - 1, hd, absIdx - 1, tl, [], searchString) (String.size hd - 1, hd, absIdx - 1, tl, [], searchString)
| [] => [] | [] => empty
end
in
{left = [], right = acc}
end end
fun build (buffer, searchString) = fun build (buffer, searchString) =

51
fcore/text-builder.sml
View File

@@ -325,34 +325,11 @@ struct
, bgAcc , bgAcc
, env: env_data , env: env_data
, searchHd , searchHd
, searchTl
, searchPos , searchPos
, searchLen , searchLen
) = ) =
if searchPos = Vector.length searchHd then if searchPos = Vector.length searchHd then
case searchTl of (* exhausted search list so call normal build function *)
searchHd :: searchTl =>
(* go to next search hd/tl *)
buildTextStringSearch
( pos
, str
, acc
, posX
, posY
, startX
, tl
, absIdx
, cursorPos
, cursorAcc
, bgAcc
, env
, searchHd
, searchTl
, 0
, searchLen
)
| [] =>
(* exhausted search hd/tl so call normal build function *)
buildTextString buildTextString
( pos ( pos
, str , str
@@ -401,7 +378,6 @@ struct
, bgAcc , bgAcc
, env , env
, searchHd , searchHd
, searchTl
, searchPos , searchPos
, searchLen , searchLen
) )
@@ -421,7 +397,6 @@ struct
, bgAcc , bgAcc
, env , env
, searchHd , searchHd
, searchTl
, searchPos , searchPos
, searchLen , searchLen
) )
@@ -447,7 +422,6 @@ struct
, bgAcc , bgAcc
, env , env
, searchHd , searchHd
, searchTl
, searchPos , searchPos
, searchLen , searchLen
) )
@@ -470,7 +444,6 @@ struct
, bgAcc , bgAcc
, env , env
, searchHd , searchHd
, searchTl
, searchPos , searchPos
, searchLen , searchLen
) )
@@ -496,7 +469,6 @@ struct
, bgAcc , bgAcc
, env , env
, searchHd , searchHd
, searchTl
, searchPos , searchPos
, searchLen , searchLen
) )
@@ -547,7 +519,6 @@ struct
, bgAcc , bgAcc
, env , env
, searchHd , searchHd
, searchTl
, searchPos , searchPos
, searchLen , searchLen
) )
@@ -580,7 +551,6 @@ struct
, bgAcc , bgAcc
, env , env
, searchHd , searchHd
, searchTl
, searchPos , searchPos
, searchLen , searchLen
) )
@@ -607,7 +577,6 @@ struct
, bgAcc , bgAcc
, env , env
, searchHd , searchHd
, searchTl
, searchPos , searchPos
, searchLen , searchLen
) )
@@ -643,7 +612,6 @@ struct
, bgAcc , bgAcc
, env , env
, searchHd , searchHd
, searchTl
, searchPos , searchPos
, searchLen , searchLen
) )
@@ -679,7 +647,6 @@ struct
, bgAcc , bgAcc
, env , env
, searchHd , searchHd
, searchTl
, searchPos , searchPos
, searchLen , searchLen
) )
@@ -706,7 +673,6 @@ struct
, bgAcc , bgAcc
, env , env
, searchHd , searchHd
, searchTl
, searchPos , searchPos
, searchLen , searchLen
) )
@@ -779,12 +745,9 @@ struct
} }
val cursorAcc = Vector.fromList [] val cursorAcc = Vector.fromList []
val searchPos = BinSearch.equalOrMore (absIdx, searchList)
in in
(case #right searchList of if searchPos < Vector.length searchList then
searchHd :: searchTl =>
let
val searchPos = BinSearch.equalOrMore (absIdx, searchHd)
in
buildTextStringSearch buildTextStringSearch
( startIdx ( startIdx
, rStrHd , rStrHd
@@ -798,13 +761,11 @@ struct
, cursorAcc , cursorAcc
, [] , []
, env , env
, searchHd , searchList
, searchTl
, searchPos , searchPos
, String.size searchString , String.size searchString
) )
end else
| [] =>
buildTextString buildTextString
( startIdx ( startIdx
, rStrHd , rStrHd
@@ -818,7 +779,7 @@ struct
, cursorAcc , cursorAcc
, [] , []
, env , env
)) )
end end
| (_, _) => | (_, _) =>
(* requested line goes beyond the buffer, (* requested line goes beyond the buffer,