bump version

CMakeLists.txt

@@ -2,15 +2,29 @@ cmake_minimum_required(VERSION 3.15)
 project(ke C)  # Specify C language explicitly
 
 set(CMAKE_C_STANDARD 99)
-set(KE_VERSION "1.0.8")
+set(KE_VERSION "1.1.0")
 
 set(CMAKE_C_FLAGS "-Wall -Wextra -pedantic -Wshadow -Werror -std=c99 -g")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_DEFAULT_SOURCE -D_XOPEN_SOURCE")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
 
+# Optionally enable AddressSanitizer (ASan)
+option(ENABLE_ASAN "Enable AddressSanitizer for builds" OFF)
+
+if (ENABLE_ASAN)
+    message(STATUS "ASan enabled")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -fno-omit-frame-pointer")
+    # Ensure the sanitizer is linked too (especially important on some platforms)
+    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address")
+endif()
+
+include(GNUInstallDirs)
 
 # Add executable
 add_executable(ke main.c)
-
-# Define KE_VERSION for use in C code (e.g., #define KE_VERSION)
 target_compile_definitions(ke PRIVATE KE_VERSION="ke version ${KE_VERSION}")
+install(TARGETS ke RUNTIME DESTINATION bin)
+install(FILES ke.1 TYPE MAN)
+
+install(TARGETS ke RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES ke.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
+

Makefile

@@ -0,0 +1,17 @@
+TARGET :=		ke
+KE_VERSION :=	devel
+
+
+CFLAGS :=	-Wall -Wextra -pedantic -Wshadow -Werror -std=c99 -g
+CFLAGS +=	-D_DEFAULT_SOURCE -D_XOPEN_SOURCE
+CFLAGS +=	-fsanitize=address -fno-omit-frame-pointer
+
+LDFLAGS :=	-fsanitize=address
+
+all: $(TARGET)
+
+$(TARGET): main.c
+	$(CC) $(CFLAGS) -o $(TARGET) $(LDFLAGS) main.c
+
+clean:
+	rm -f $(TARGET)

README.txt

@@ -11,4 +11,8 @@ It should be available via homebrew, even:
     brew tap kisom/homebrew-tap
     brew install ke
 
-Released under an ISC license.
+To get verbose ASAN messages:
+
+    export LSAN_OPTIONS=verbosity=1:log_threads=1
+
+Released under an ISC license.

ke.1

@@ -26,6 +26,8 @@ saving a file can be done with either C-k s or C-k C-s.
 Delete from the cursor to the beginning of the line.
 .It C-k d
 Delete from the cursor to the end of the line.
+.It C-k C-d
+Delete the entire link.
 .It C-k e
 Edit a new file. Also C-k C-e.
 .It C-k f

main.c

@@ -120,8 +120,14 @@ void	 editor_set_status(const char *fmt, ...);
 
 /* miscellaneous */
 void		 die(const char *s);
+int		 iswspace(const char c);
 int		 get_winsz(int *rows, int *cols);
 void		 goto_line(void);
+int		 cursor_at_eol(void);
+void		 find_next_word(void);
+void		 delete_next_word(void);
+void		 find_prev_word(void);
+void		 delete_prev_word(void);
 void		 delete_row(int at);
 void		 row_append_row(struct erow *row, char *s, int len);
 void		 row_insert_ch(struct erow *row, int at, int16_t c);
@@ -364,7 +370,7 @@ erow_update(struct erow *row)
 		}
 	}
 
-	if (row->rsize) {
+	if (row->rsize || row->render != NULL) {
 		free(row->render);
 		row->rsize = 0;
 	}
@@ -463,6 +469,12 @@ die(const char *s)
 }
 
 
+int
+iswspace(const char c)
+{
+	return isspace(c) || c == '\t';
+}
+
 /*
  * get_winsz uses the TIOCGWINSZ to get the window size.
  *
@@ -508,6 +520,121 @@ goto_line(void)
 }
 
 
+int
+cursor_at_eol(void)
+{
+	assert(editor.curx >= 0);
+	assert(editor.cury >= 0);
+	assert(editor.cury <= editor.nrows);
+	assert(editor.curx <= editor.row[editor.cury].size);
+
+	return editor.curx == editor.row[editor.cury].size;
+}
+
+
+void
+find_next_word(void)
+{
+	while (cursor_at_eol()) {
+		move_cursor(ARROW_RIGHT);
+	}
+	
+	if (isalnum(editor.row[editor.cury].line[editor.curx])) {
+		while (!iswspace(editor.row[editor.cury].line[editor.curx]) && !cursor_at_eol()) {
+			move_cursor(ARROW_RIGHT);
+		}
+
+		return;
+	}
+
+	if (iswspace(editor.row[editor.cury].line[editor.curx])) {
+		while (iswspace(editor.row[editor.cury].line[editor.curx])) {
+			move_cursor(ARROW_RIGHT);
+		}
+
+		find_next_word();
+	}
+}
+
+
+void
+delete_next_word(void)
+{
+	while (cursor_at_eol()) {
+		move_cursor(ARROW_RIGHT);
+		deletech();
+	}
+
+	if (isalnum(editor.row[editor.cury].line[editor.curx])) {
+		while (!iswspace(editor.row[editor.cury].line[editor.curx]) && !cursor_at_eol()) {
+			move_cursor(ARROW_RIGHT);
+			deletech();
+		}
+
+		return;
+	}
+
+	if (iswspace(editor.row[editor.cury].line[editor.curx])) {
+		while (iswspace(editor.row[editor.cury].line[editor.curx])) {
+			move_cursor(ARROW_RIGHT);
+			deletech();
+		}
+
+		delete_next_word();
+	}
+}
+
+
+void
+find_prev_word(void)
+{
+	if (editor.cury == 0 && editor.curx == 0) {
+		return;
+	}
+
+	move_cursor(ARROW_LEFT);
+
+	while (cursor_at_eol() || iswspace(editor.row[editor.cury].line[editor.curx])) {
+		if (editor.cury == 0 && editor.curx == 0) {
+			return;
+		}
+
+		move_cursor(ARROW_LEFT);
+	}
+
+	while (editor.curx > 0 && !iswspace(editor.row[editor.cury].line[editor.curx - 1])) {
+		move_cursor(ARROW_LEFT);
+	}
+}
+
+void
+delete_prev_word(void)
+{
+	if (editor.cury == 0 && editor.curx == 0) {
+		return;
+	}
+
+	deletech();
+
+	while (editor.cury > 0 || editor.curx > 0) {
+		if (editor.curx == 0) {
+			deletech();
+		} else {
+			if (!iswspace(editor.row[editor.cury].line[editor.curx - 1])) {
+				break;
+			}
+			deletech();
+		}
+	}
+
+	while (editor.curx > 0) {
+		if (iswspace(editor.row[editor.cury].line[editor.curx - 1])) {
+			break;
+		}
+		deletech();
+	}
+}
+
 void
 delete_row(int at)
 {
@@ -588,6 +715,9 @@ insertch(int16_t c)
 }
 
 
+/*
+ * deletech
+ */
 void
 deletech(void)
 {
@@ -985,7 +1115,7 @@ void
 move_cursor(int16_t c)
 {
 	struct erow	*row;
-	int	 reps;
+	int		 reps;
 
 	row = (editor.cury >= editor.nrows) ? NULL : &editor.row[editor.cury];
 
@@ -1195,8 +1325,6 @@ process_normal(int16_t c)
 void
 process_escape(int16_t c)
 {
-	struct erow	*row = &editor.row[editor.cury];
-
 	editor_set_status("hi");
 
 	switch (c) {
@@ -1208,16 +1336,17 @@ process_escape(int16_t c)
 		editor.cury = 0;
 		editor.curx = 0;
 		break;
+	case 'b':
+		find_prev_word();
+		break;
+	case 'd':
+		delete_next_word();
+		break;
+	case 'f':
+		find_next_word();
+		break;
 	case BACKSPACE:
-		if (isalnum(row->line[editor.curx])) {
-			editor_set_status("is alnum");
-			while (editor.curx > 0 && isalnum(row->line[editor.curx])) {
-				process_normal(BACKSPACE);
-			}
-		} else {
-			editor_set_status("not alnum");
-			process_normal(BACKSPACE);
-		}
+		delete_prev_word();
 		break;
 	default:
 		editor_set_status("unknown ESC key: %04x", c);