From df20641af14f67efb3f2f7a3d529dda3b4d6dc45 Mon Sep 17 00:00:00 2001
From: Humza Shahid <humzasaur@gmail.com>
Date: Fri, 23 Jan 2026 10:08:57 +0000
Subject: [PATCH] refactor functional core into its own .mlb file that can be
 shared across different shells

---
 fcore.mlb     |  62 ++++++++++++++++++++++++++++++++++++++++++++++++++
 shf-rgfw      | Bin 390680 -> 390680 bytes
 shf-rgfw.mlb  |  61 +------------------------------------------------
 shf-tests.mlb |  61 +------------------------------------------------
 shf.mlb       |  61 +------------------------------------------------
 5 files changed, 65 insertions(+), 180 deletions(-)
 create mode 100644 fcore.mlb

diff --git a/fcore.mlb b/fcore.mlb
new file mode 100644
index 0000000..13ce9f7
--- /dev/null
+++ b/fcore.mlb
@@ -0,0 +1,62 @@
+$(SML_LIB)/basis/basis.mlb
+
+(* LIBRARIES (purely functional) *)
+lib/brolib-sml/src/line_gap.sml
+lib/brolib-sml/src/gap_set.sml
+lib/cozette-sml/fonts-with-z-index/cozette-ascii.mlb
+
+(* FUNCTIONAL CORE *)
+fcore/bin-search.sml
+
+ann
+  "allowVectorExps true"
+in
+  fcore/persistent-vector.sml
+end
+fcore/search-list/dfa-gen.sml
+fcore/search-list/search-list.sml
+
+message-types/input-msg.sml
+message-types/draw-msg.sml
+message-types/mailbox-type.sml
+
+fcore/app-type.sml
+fcore/normal-mode/normal-mode-with.sml
+fcore/normal-mode/normal-search-mode-with.sml
+fcore/app-with.sml
+
+fcore/text-constants.sml
+ann
+  "allowVectorExps true"
+in
+  fcore/cursor-dfa/make-dfa-loop.sml
+  fcore/cursor-dfa/vi-word-dfa.sml
+  fcore/cursor-dfa/vi-caps-word-dfa.sml
+  fcore/cursor-dfa/vi-dlr-dfa.sml
+  fcore/cursor-dfa/vi-l-dfa.sml
+  fcore/cursor-dfa/vi-h-dfa.sml
+  fcore/rect.sml
+  fcore/pipe-cursor.sml
+end
+fcore/text-builder/text-builder-utils.sml
+fcore/text-builder/text-builder-with-cursor.sml
+fcore/text-builder/text-builder-with-highlight.sml
+fcore/text-builder/normal-mode-text-builder.sml
+fcore/text-builder/search-bar.sml
+
+fcore/cursor.sml
+fcore/text-scroll.sml
+
+fcore/normal-mode/normal-finish.sml
+fcore/normal-mode/normal-search-finish.sml
+fcore/move.sml
+
+fcore/normal-mode/normal-move.sml
+fcore/normal-mode/normal-yank.sml
+fcore/normal-mode/make-normal-delete.sml
+fcore/normal-mode/normal-delete.sml
+fcore/normal-mode/normal-yank-delete.sml
+fcore/normal-mode/normal-mode.sml
+fcore/normal-mode/normal-search-mode.sml
+
+fcore/app-update.sml
diff --git a/shf-rgfw b/shf-rgfw
index 19dce6098a5357fde682d5c3caae2d3ca7004fd1..83eeb0194632b4ad7c52932a023477b7c068b250 100755
GIT binary patch
delta 3287
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
MdzF7jq$S(`1Bq7=j{pDw

delta 3299
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

diff --git a/shf-rgfw.mlb b/shf-rgfw.mlb
index 8891cb6..5412487 100644
--- a/shf-rgfw.mlb
+++ b/shf-rgfw.mlb
@@ -1,65 +1,6 @@
 $(SML_LIB)/basis/basis.mlb
 
-(* LIBRARIES *)
-lib/brolib-sml/src/line_gap.sml
-lib/brolib-sml/src/gap_set.sml
-lib/cozette-sml/fonts-with-z-index/cozette-ascii.mlb
-
-(* FUNCTIONAL CORE *)
-fcore/bin-search.sml
-
-ann
-  "allowVectorExps true"
-in
-  fcore/persistent-vector.sml
-end
-fcore/search-list/dfa-gen.sml
-fcore/search-list/search-list.sml
-
-message-types/input-msg.sml
-message-types/draw-msg.sml
-message-types/mailbox-type.sml
-
-fcore/app-type.sml
-fcore/normal-mode/normal-mode-with.sml
-fcore/normal-mode/normal-search-mode-with.sml
-fcore/app-with.sml
-
-fcore/text-constants.sml
-ann
-  "allowVectorExps true"
-in
-  fcore/cursor-dfa/make-dfa-loop.sml
-  fcore/cursor-dfa/vi-word-dfa.sml
-  fcore/cursor-dfa/vi-caps-word-dfa.sml
-  fcore/cursor-dfa/vi-dlr-dfa.sml
-  fcore/cursor-dfa/vi-l-dfa.sml
-  fcore/cursor-dfa/vi-h-dfa.sml
-  fcore/rect.sml
-  fcore/pipe-cursor.sml
-end
-fcore/text-builder/text-builder-utils.sml
-fcore/text-builder/text-builder-with-cursor.sml
-fcore/text-builder/text-builder-with-highlight.sml
-fcore/text-builder/normal-mode-text-builder.sml
-fcore/text-builder/search-bar.sml
-
-fcore/cursor.sml
-fcore/text-scroll.sml
-
-fcore/normal-mode/normal-finish.sml
-fcore/normal-mode/normal-search-finish.sml
-fcore/move.sml
-
-fcore/normal-mode/normal-move.sml
-fcore/normal-mode/normal-yank.sml
-fcore/normal-mode/make-normal-delete.sml
-fcore/normal-mode/normal-delete.sml
-fcore/normal-mode/normal-yank-delete.sml
-fcore/normal-mode/normal-mode.sml
-fcore/normal-mode/normal-search-mode.sml
-
-fcore/app-update.sml
+fcore.mlb
 
 (* IMPERATIVE SHELL *)
 $(SML_LIB)/basis/mlton.mlb
diff --git a/shf-tests.mlb b/shf-tests.mlb
index d346a04..29a6c6e 100644
--- a/shf-tests.mlb
+++ b/shf-tests.mlb
@@ -1,65 +1,6 @@
 $(SML_LIB)/basis/basis.mlb
 
-(* LIBRARIES *)
-lib/brolib-sml/src/line_gap.sml
-lib/brolib-sml/src/gap_set.sml
-lib/cozette-sml/fonts-with-z-index/cozette-ascii.mlb
-
-(* FUNCTIONAL CORE *)
-fcore/bin-search.sml
-
-ann
-  "allowVectorExps true"
-in
-  fcore/persistent-vector.sml
-end
-fcore/search-list/dfa-gen.sml
-fcore/search-list/search-list.sml
-
-message-types/input-msg.sml
-message-types/draw-msg.sml
-message-types/mailbox-type.sml
-
-fcore/app-type.sml
-fcore/normal-mode/normal-mode-with.sml
-fcore/normal-mode/normal-search-mode-with.sml
-fcore/app-with.sml
-
-fcore/text-constants.sml
-ann
-  "allowVectorExps true"
-in
-  fcore/cursor-dfa/make-dfa-loop.sml
-  fcore/cursor-dfa/vi-word-dfa.sml
-  fcore/cursor-dfa/vi-caps-word-dfa.sml
-  fcore/cursor-dfa/vi-dlr-dfa.sml
-  fcore/cursor-dfa/vi-l-dfa.sml
-  fcore/cursor-dfa/vi-h-dfa.sml
-  fcore/rect.sml
-  fcore/pipe-cursor.sml
-end
-fcore/text-builder/text-builder-utils.sml
-fcore/text-builder/text-builder-with-cursor.sml
-fcore/text-builder/text-builder-with-highlight.sml
-fcore/text-builder/normal-mode-text-builder.sml
-fcore/text-builder/search-bar.sml
-
-fcore/cursor.sml
-fcore/text-scroll.sml
-
-fcore/normal-mode/normal-finish.sml
-fcore/normal-mode/normal-search-finish.sml
-fcore/move.sml
-
-fcore/normal-mode/normal-move.sml
-fcore/normal-mode/normal-yank.sml
-fcore/normal-mode/make-normal-delete.sml
-fcore/normal-mode/normal-delete.sml
-fcore/normal-mode/normal-yank-delete.sml
-fcore/normal-mode/normal-mode.sml
-fcore/normal-mode/normal-search-mode.sml
-
-fcore/app-update.sml
+fcore.mlb
 
 (* TEST FILES *)
 $(SML_LIB)/basis/mlton.mlb
diff --git a/shf.mlb b/shf.mlb
index 047ba05..52b500a 100644
--- a/shf.mlb
+++ b/shf.mlb
@@ -1,65 +1,6 @@
 $(SML_LIB)/basis/basis.mlb
 
-(* LIBRARIES *)
-lib/brolib-sml/src/line_gap.sml
-lib/brolib-sml/src/gap_set.sml
-lib/cozette-sml/fonts-with-z-index/cozette-ascii.mlb
-
-(* FUNCTIONAL CORE *)
-fcore/bin-search.sml
-
-ann
-  "allowVectorExps true"
-in
-  fcore/persistent-vector.sml
-end
-fcore/search-list/dfa-gen.sml
-fcore/search-list/search-list.sml
-
-message-types/input-msg.sml
-message-types/draw-msg.sml
-message-types/mailbox-type.sml
-
-fcore/app-type.sml
-fcore/normal-mode/normal-mode-with.sml
-fcore/normal-mode/normal-search-mode-with.sml
-fcore/app-with.sml
-
-fcore/text-constants.sml
-ann
-  "allowVectorExps true"
-in
-  fcore/cursor-dfa/make-dfa-loop.sml
-  fcore/cursor-dfa/vi-word-dfa.sml
-  fcore/cursor-dfa/vi-caps-word-dfa.sml
-  fcore/cursor-dfa/vi-dlr-dfa.sml
-  fcore/cursor-dfa/vi-l-dfa.sml
-  fcore/cursor-dfa/vi-h-dfa.sml
-  fcore/rect.sml
-  fcore/pipe-cursor.sml
-end
-fcore/text-builder/text-builder-utils.sml
-fcore/text-builder/text-builder-with-cursor.sml
-fcore/text-builder/text-builder-with-highlight.sml
-fcore/text-builder/normal-mode-text-builder.sml
-fcore/text-builder/search-bar.sml
-
-fcore/cursor.sml
-fcore/text-scroll.sml
-
-fcore/normal-mode/normal-finish.sml
-fcore/normal-mode/normal-search-finish.sml
-fcore/move.sml
-
-fcore/normal-mode/normal-move.sml
-fcore/normal-mode/normal-yank.sml
-fcore/normal-mode/make-normal-delete.sml
-fcore/normal-mode/normal-delete.sml
-fcore/normal-mode/normal-yank-delete.sml
-fcore/normal-mode/normal-mode.sml
-fcore/normal-mode/normal-search-mode.sml
-
-fcore/app-update.sml
+fcore.mlb
 
 (* IMPERATIVE SHELL *)
 $(SML_LIB)/basis/mlton.mlb