From 908b2634c6daab8a0d91127044aca1f2daef05bb Mon Sep 17 00:00:00 2001
From: "Kartik K. Agaram" <vc@akkartik.com>
Date: Sun, 28 Nov 2021 14:57:49 -0800
Subject: split a lumpy abstraction into two cleaner ones

I'm mindful of the way abstractions can create duplicate effort:
  https://flak.tedunangst.com/post/browser-ktrace-browsing

== Kartik's SAD theorem
As programs grow complex, you will be repeatedly forced to either:
  - maintain some State,
  - perform some computations Again,
  - or Duplicate some code.

Here a small amount of duplication seems like the best alternative.
Particularly since no syscalls are involved.
---
 src/lua.c | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/lua.c b/src/lua.c
index 33d1f60..102d1a1 100644
--- a/src/lua.c
+++ b/src/lua.c
@@ -908,25 +908,28 @@ restart:
 }
 
 
-/* return false if:
- *  - editor_state was successfully loaded, and
- *  - editor_state is applicable to this run, and
- *  - we successfully switched to the desired view */
-extern int edit_from(lua_State* L, char* filename, const char* message, int rowoff, int coloff, int cy, int cx);
-int load_view_from_editor_state (lua_State *L) {
+/* return true if:
+ *  - editor_state exists, and
+ *  - editor_state is applicable to the current image */
+int editor_view_in_progress (lua_State *L) {
   int status;
   status = luaL_loadfile(L, "teliva_editor_state");
-  if (status != 0) return 1;
+  if (status != 0) return 0;
   status = docall(L, 0, 0);
-  if (status != 0) return 1;
+  if (status != 0) return 0;
   lua_getglobal(L, "__teliva_editor_state");
   int editor_state_index = lua_gettop(L);
   lua_getfield(L, editor_state_index, "image");
   const char *image_name = lua_tostring(L, -1);
-  if (strcmp(image_name, Image_name) != 0) {
-    lua_settop(L, editor_state_index);
-    return 1;
-  }
+  const int result = (strcmp(image_name, Image_name) == 0);
+  lua_settop(L, editor_state_index);
+  return result;
+}
+
+extern int edit_from(lua_State* L, char* filename, const char* message, int rowoff, int coloff, int cy, int cx);
+int editor_view (lua_State *L) {
+  lua_getglobal(L, "__teliva_editor_state");
+  int editor_state_index = lua_gettop(L);
   lua_getfield(L, editor_state_index, "definition");
   const char *definition = lua_tostring(L, -1);
   save_to_current_definition_and_editor_buffer(L, definition);
@@ -954,7 +957,10 @@ void developer_mode (lua_State *L) {
   for (int i = 0; i < 8; ++i)
     init_pair(i+8, -1, i);
   nodelay(stdscr, 0);  /* make getch() block */
-  if (load_view_from_editor_state(L))
+  int switch_to_big_picture_view = 1;
+  if (editor_view_in_progress(L))
+    switch_to_big_picture_view = editor_view(L);
+  if (switch_to_big_picture_view)
     big_picture_view(L);
   cleanup_curses();
   execv(Argv[0], Argv);
-- 
cgit 1.4.1-2-gfad0