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

clean up some dead code

Browse Source
This commit is contained in:
Humza Shahid
2025-08-06 00:16:50 +01:00
parent faa55abd3d
commit f0f28a1318
8 changed files with 58 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
fcore/app-update.sml
View File

@@ -357,17 +357,6 @@ struct
(* text-delete functions *) (* text-delete functions *)
(** equivalent of vi's 'x' command **) (** equivalent of vi's 'x' command **)
fun deleteSearchList (cursorIdx, length, searchString, searchList, buffer) =
let
val searchList =
SearchList.delete (cursorIdx, length, searchString, searchList)
val searchList = SearchList.mapFrom (cursorIdx, ~length, searchList)
in
BuildSearchList.fromRange
(cursorIdx, length, buffer, searchString, searchList)
end
fun helpRemoveChr (app: app_type, buffer, searchList, cursorIdx, count) = fun helpRemoveChr (app: app_type, buffer, searchList, cursorIdx, count) =
if count = 0 then if count = 0 then
Finish.buildTextAndClear (app, buffer, cursorIdx, searchList) Finish.buildTextAndClear (app, buffer, cursorIdx, searchList)
@@ -400,11 +389,11 @@ struct
let let
(* delete char at cursor and then decrement cursorIdx by 1 (* delete char at cursor and then decrement cursorIdx by 1
* if cursorIdx is not 0 *) * if cursorIdx is not 0 *)
val {searchString, ...} = app val searchString = #searchString app
val buffer = LineGap.delete (cursorIdx, 1, buffer) val buffer = LineGap.delete (cursorIdx, 1, buffer)
val (buffer, searchList) = deleteSearchList val (buffer, searchList) =
(cursorIdx, 1, searchString, searchList, buffer) SearchLineGap.build (buffer, searchString)
val cursorIdx = val cursorIdx =
if if
@@ -417,11 +406,11 @@ struct
end end
else else
let let
val {searchString, ...} = app val searchString = #searchString app
val buffer = LineGap.delete (cursorIdx, 1, buffer) val buffer = LineGap.delete (cursorIdx, 1, buffer)
val (buffer, searchList) = deleteSearchList val (buffer, searchList) =
(cursorIdx, 1, searchString, searchList, buffer) SearchLineGap.build (buffer, searchString)
in in
helpRemoveChr (app, buffer, searchList, cursorIdx, count - 1) helpRemoveChr (app, buffer, searchList, cursorIdx, count - 1)
end end
@@ -447,9 +436,8 @@ struct
val buffer = LineGap.delete (low, length, buffer) val buffer = LineGap.delete (low, length, buffer)
val {searchList, searchString, ...} = app val searchString = #searchString app
val (buffer, searchList) = deleteSearchList val (buffer, searchList) = SearchLineGap.build (buffer, searchString)
(low, length, searchString, searchList, buffer)
(* If we have deleted from the buffer so that cursorIdx (* If we have deleted from the buffer so that cursorIdx
* is no longer a valid idx, * is no longer a valid idx,
@@ -474,7 +462,7 @@ struct
fun deleteByDfa (app: app_type, count, fMove) = fun deleteByDfa (app: app_type, count, fMove) =
let let
val {buffer, cursorIdx, searchList, searchString, ...} = app val {buffer, cursorIdx, searchString, ...} = app
val buffer = LineGap.goToIdx (cursorIdx, buffer) val buffer = LineGap.goToIdx (cursorIdx, buffer)
val otherIdx = fMove (buffer, cursorIdx, count) val otherIdx = fMove (buffer, cursorIdx, count)
@@ -485,8 +473,7 @@ struct
val buffer = LineGap.delete (low, length, buffer) val buffer = LineGap.delete (low, length, buffer)
val (buffer, searchList) = deleteSearchList val (buffer, searchList) = SearchLineGap.build (buffer, searchString)
(low, length, searchString, searchList, buffer)
val buffer = LineGap.goToIdx (low, buffer) val buffer = LineGap.goToIdx (low, buffer)
in in
@@ -514,9 +501,8 @@ struct
val buffer = LineGap.delete (cursorIdx, length, buffer) val buffer = LineGap.delete (cursorIdx, length, buffer)
(* delete from searchList and map *) (* delete from searchList and map *)
val {searchList, searchString, ...} = app val searchString = #searchString app
val (buffer, searchList) = deleteSearchList val (buffer, searchList) = SearchLineGap.build (buffer, searchString)
(cursorIdx, length, searchString, searchList, buffer)
in in
helpRemoveChr (app, buffer, searchList, cursorIdx, 1) helpRemoveChr (app, buffer, searchList, cursorIdx, 1)
end end
@@ -524,7 +510,7 @@ struct
fun deleteLine (app: app_type, count) = fun deleteLine (app: app_type, count) =
let let
val {buffer, cursorIdx, searchList, searchString, ...} = app val {buffer, cursorIdx, searchString, ...} = app
val buffer = LineGap.goToIdx (cursorIdx, buffer) val buffer = LineGap.goToIdx (cursorIdx, buffer)
val startIdx = Cursor.vi0 (buffer, cursorIdx) val startIdx = Cursor.vi0 (buffer, cursorIdx)
@@ -533,8 +519,7 @@ struct
val length = finishIdx - startIdx val length = finishIdx - startIdx
val buffer = LineGap.delete (startIdx, length, buffer) val buffer = LineGap.delete (startIdx, length, buffer)
val (buffer, searchList) = deleteSearchList val (buffer, searchList) = SearchLineGap.build (buffer, searchString)
(startIdx, length, searchString, searchList, buffer)
val buffer = LineGap.goToIdx (startIdx, buffer) val buffer = LineGap.goToIdx (startIdx, buffer)
in in
@@ -548,9 +533,8 @@ struct
val length = high - low val length = high - low
val buffer = LineGap.delete (low, length, buffer) val buffer = LineGap.delete (low, length, buffer)
val {searchList, searchString, ...} = app val searchString = #searchString app
val (buffer, searchList) = deleteSearchList val (buffer, searchList) = SearchLineGap.build (buffer, searchString)
(low, length, searchString, searchList, buffer)
val buffer = LineGap.goToIdx (low, buffer) val buffer = LineGap.goToIdx (low, buffer)
in in
@@ -585,7 +569,6 @@ struct
, windowHeight , windowHeight
, startLine , startLine
, searchString , searchString
, searchList
, ... , ...
} = app } = app
@@ -602,8 +585,7 @@ struct
val length = high - low val length = high - low
val buffer = LineGap.delete (low, length, buffer) val buffer = LineGap.delete (low, length, buffer)
val (buffer, searchList) = deleteSearchList val (buffer, searchList) = SearchLineGap.build (buffer, searchString)
(low, length, searchString, searchList, buffer)
in in
Finish.buildTextAndClear (app, buffer, low, searchList) Finish.buildTextAndClear (app, buffer, low, searchList)
end end
@@ -617,9 +599,8 @@ struct
val length = high - low val length = high - low
val buffer = LineGap.delete (low, length, buffer) val buffer = LineGap.delete (low, length, buffer)
val {searchString, searchList, ...} = app val searchString = #searchString app
val (buffer, searchList) = deleteSearchList val (buffer, searchList) = SearchLineGap.build (buffer, searchString)
(low, length, searchString, searchList, buffer)
in in
buildTextAndClearAfterChr (app, buffer, low, searchList) buildTextAndClearAfterChr (app, buffer, low, searchList)
end end
@@ -648,19 +629,11 @@ struct
fun deleteToStart (app: app_type) = fun deleteToStart (app: app_type) =
let let
val val {cursorIdx, buffer, windowWidth, windowHeight, searchString, ...} =
{ cursorIdx app
, buffer
, windowWidth
, windowHeight
, searchList
, searchString
, ...
} = app
val buffer = LineGap.delete (0, cursorIdx, buffer) val buffer = LineGap.delete (0, cursorIdx, buffer)
val (buffer, searchList) = deleteSearchList val (buffer, searchList) = SearchLineGap.build (buffer, searchString)
(0, cursorIdx, searchString, searchList, buffer)
val cursorIdx = 0 val cursorIdx = 0
val startLine = 0 val startLine = 0

23
fcore/build-search-list.sml
View File

@@ -1,23 +0,0 @@
structure BuildSearchList =
struct
fun fromStart (app, cursorIdx, buffer, searchString) =
if String.size searchString > 0 then
let
val buffer = LineGap.goToEnd buffer
val searchList = SearchLineGap.search (buffer, searchString)
val buffer = LineGap.goToStart buffer
in
AppWith.searchList (app, searchList, buffer, searchString)
end
else
app
fun fromRange (startIdx, length, buffer, searchString, searchList) =
let
val buffer = LineGap.goToEnd buffer
val searchList = SearchLineGap.search (buffer, searchString)
val buffer = LineGap.goToStart buffer
in
(buffer, searchList)
end
end

31
fcore/search-list.sml
View File

@@ -17,8 +17,9 @@ end
structure SearchList: SEARCH_LIST = structure SearchList: SEARCH_LIST =
struct struct
structure IntSet = MakeGapSet ( structure IntSet =
struct MakeGapSet
(struct
type key = int type key = int
val maxNodeSize = 32 val maxNodeSize = 32
@@ -26,8 +27,7 @@ struct
fun l (a: int, b) = a < b fun l (a: int, b) = a < b
fun eq (a: int, b) = a = b fun eq (a: int, b) = a = b
fun g (a: int, b) = a > b fun g (a: int, b) = a > b
end end)
)
type t = IntSet.t type t = IntSet.t
@@ -43,10 +43,8 @@ struct
val empty = IntSet.empty val empty = IntSet.empty
fun insert (num, set) = fun insert (num, set) =
let let val () = print ("adding num: " ^ Int.toString num ^ "\n")
val () = print ("adding num: " ^ Int.toString num ^ "\n") in IntSet.add (num, set)
in
IntSet.add (num, set)
end end
val append = IntSet.add val append = IntSet.add
@@ -63,10 +61,12 @@ struct
val secondVec = toVector result val secondVec = toVector result
val () = print ("delete start has " ^ Int.toString (Vector.length val () = print
firstVec) ^ "elements\n") ("delete start has " ^ Int.toString (Vector.length firstVec)
val () = print ("delete result has " ^ Int.toString (Vector.length ^ "elements\n")
secondVec) ^ "elements\n") val () = print
("delete result has " ^ Int.toString (Vector.length secondVec)
^ "elements\n")
in in
result result
end end
@@ -143,10 +143,11 @@ struct
let let
val vec = toVector {left = left, right = right} val vec = toVector {left = left, right = right}
val () = print ("toString has " ^ Int.toString (Vector.length vec) ^ val () = print
"elements\n") ("toString has " ^ Int.toString (Vector.length vec) ^ "elements\n")
val strList = Vector.foldr (fn (num, acc) => Int.toString num :: acc) [] vec val strList =
Vector.foldr (fn (num, acc) => Int.toString num :: acc) [] vec
in in
"" ""
end end

12
fcore/search/search-line-gap.sml
View File

@@ -76,16 +76,4 @@ struct
end end
else else
(buffer, SearchList.empty) (buffer, SearchList.empty)
fun buildIntoApp (app, buffer, searchString) =
if String.size searchString > 0 then
let
val buffer = LineGap.goToEnd buffer
val searchList = search (buffer, searchString)
val buffer = LineGap.goToStart buffer
in
AppWith.searchList (app, searchList, buffer, searchString)
end
else
app
end end

10
shell/shell.sml
View File

@@ -65,7 +65,15 @@ struct
val app = AppType.init (lineGap, 1920, 1080) val app = AppType.init (lineGap, 1920, 1080)
(* todo: remove temp line below which tests search list *) (* todo: remove temp line below which tests search list *)
val app = BuildSearchList.fromStart (app, 0, lineGap, "val ") val app =
let
val searchString = "val "
val (buffer, searchList) =
SearchLineGap.build (#buffer app, searchString)
val buffer = LineGap.goToStart buffer
in
AppWith.searchList (app, searchList, buffer, searchString)
end
val () = registerCallbacks window val () = registerCallbacks window

3
shell/update-thread.sml
View File

@@ -30,7 +30,8 @@ struct
val () = ExceptionLogger.addCommand inputMsg val () = ExceptionLogger.addCommand inputMsg
val app = AppUpdate.update (app, inputMsg) handle e => ExceptionLogger.log e val app = AppUpdate.update (app, inputMsg)
handle e => ExceptionLogger.log e
val searchList = #searchList app val searchList = #searchList app
val searchList = SearchList.toString searchList ^ "\n" val searchList = SearchList.toString searchList ^ "\n"

3
shf-tests.mlb
View File

@@ -12,12 +12,11 @@ message-types/mailbox-type.sml
fcore/bin-search.sml fcore/bin-search.sml
fcore/search-list.sml fcore/search-list.sml
fcore/search/search-line-gap.sml
fcore/app-type.sml fcore/app-type.sml
fcore/app-with.sml fcore/app-with.sml
fcore/search/search-line-gap.sml
fcore/build-search-list.sml
fcore/text-constants.sml fcore/text-constants.sml
ann ann
"allowVectorExps true" "allowVectorExps true"

3
shf.mlb
View File

@@ -12,12 +12,11 @@ message-types/mailbox-type.sml
fcore/bin-search.sml fcore/bin-search.sml
fcore/search-list.sml fcore/search-list.sml
fcore/search/search-line-gap.sml
fcore/app-type.sml fcore/app-type.sml
fcore/app-with.sml fcore/app-with.sml
fcore/search/search-line-gap.sml
fcore/build-search-list.sml
fcore/text-constants.sml fcore/text-constants.sml
ann ann
"allowVectorExps true" "allowVectorExps true"