From 8975d1a9f4627fdb91fb9f6d008be3f33268f64b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 20 Nov 2023 19:41:30 +0530
Subject: [PATCH] no need to parametrize sentinel

---
 kitty/simd-string-impl.h |  4 ++--
 kitty/simd-string.c      | 21 ++++++++++-----------
 kitty/simd-string.h      |  2 +-
 kitty/vt-parser.c        |  2 +-
 4 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/kitty/simd-string-impl.h b/kitty/simd-string-impl.h
index ee1184a64..c30afb5f1 100644
--- a/kitty/simd-string-impl.h
+++ b/kitty/simd-string-impl.h
@@ -57,8 +57,8 @@ FUNC(find_either_of_two_bytes)(const uint8_t *haystack, const size_t sz, const u
 }
 
 static inline unsigned
-FUNC(utf8_decode_to_sentinel)(UTF8Decoder *d, const uint8_t *src, const size_t src_sz, const uint8_t sentinel) {
-    (void)d; (void)src; (void)src_sz; (void)sentinel;
+FUNC(utf8_decode_to_esc)(UTF8Decoder *d, const uint8_t *src, size_t src_sz) {
+    (void)d; (void)src; (void)src_sz;
     return 0;
 }
 
diff --git a/kitty/simd-string.c b/kitty/simd-string.c
index c7c751045..0c7da25a2 100644
--- a/kitty/simd-string.c
+++ b/kitty/simd-string.c
@@ -35,11 +35,11 @@ find_either_of_two_bytes(const uint8_t *haystack, const size_t sz, const uint8_t
 // UTF-8 {{{
 
 static bool
-utf8_decode_to_sentinel_scalar(UTF8Decoder *d, const uint8_t *src, const size_t src_sz, const uint8_t sentinel) {
+utf8_decode_to_esc_scalar(UTF8Decoder *d, const uint8_t *src, const size_t src_sz) {
     d->output_sz = 0; d->num_consumed = 0;
     while (d->num_consumed < src_sz && d->output_sz < arraysz(d->output)) {
         const uint8_t ch = src[d->num_consumed++];
-        if (ch == sentinel) {
+        if (ch == 0x1b) {
             if (d->state.cur != UTF8_ACCEPT) d->output[d->output_sz++] = 0xfffd;
             zero_at_ptr(&d->state);
             return true;
@@ -64,11 +64,11 @@ utf8_decode_to_sentinel_scalar(UTF8Decoder *d, const uint8_t *src, const size_t
     return false;
 }
 
-static bool (*utf8_decode_to_sentinel_impl)(UTF8Decoder *d, const uint8_t *src, const size_t src_sz, const uint8_t sentinel) = utf8_decode_to_sentinel_scalar;
+static bool (*utf8_decode_to_esc_impl)(UTF8Decoder *d, const uint8_t *src, size_t src_sz) = utf8_decode_to_esc_scalar;
 
 bool
-utf8_decode_to_sentinel(UTF8Decoder *d, const uint8_t *src, const size_t src_sz, const uint8_t sentinel) {
-    return utf8_decode_to_sentinel_impl(d, src, src_sz, sentinel);
+utf8_decode_to_esc(UTF8Decoder *d, const uint8_t *src, size_t src_sz) {
+    return utf8_decode_to_esc_impl(d, src, src_sz);
 }
 
 // }}}
@@ -79,20 +79,19 @@ test_utf8_decode_to_sentinel(PyObject *self UNUSED, PyObject *args) {
     const uint8_t *src; Py_ssize_t src_sz;
     int which_function = 0;
     static UTF8Decoder d = {0};
-    unsigned char sentinel = 0x1b;
-    if (!PyArg_ParseTuple(args, "s#|iB", &src, &src_sz, &which_function, &sentinel)) return NULL;
+    if (!PyArg_ParseTuple(args, "s#|i", &src, &src_sz, &which_function)) return NULL;
     bool found_sentinel = false;
     switch(which_function) {
         case -1:
             zero_at_ptr(&d); Py_RETURN_NONE;
         case 1:
-            found_sentinel = utf8_decode_to_sentinel_scalar(&d, src, src_sz, sentinel); break;
+            found_sentinel = utf8_decode_to_esc(&d, src, src_sz); break;
         case 2:
-            found_sentinel = utf8_decode_to_sentinel_128(&d, src, src_sz, sentinel); break;
+            found_sentinel = utf8_decode_to_esc_128(&d, src, src_sz); break;
         case 3:
-            found_sentinel = utf8_decode_to_sentinel_256(&d, src, src_sz, sentinel); break;
+            found_sentinel = utf8_decode_to_esc_256(&d, src, src_sz); break;
         default:
-            found_sentinel = utf8_decode_to_sentinel(&d, src, src_sz, sentinel); break;
+            found_sentinel = utf8_decode_to_esc(&d, src, src_sz); break;
     }
     return Py_BuildValue("ON", found_sentinel ? Py_True : Py_False, PyUnicode_FromKindAndData(PyUnicode_4BYTE_KIND, d.output, d.output_sz));
 }
diff --git a/kitty/simd-string.h b/kitty/simd-string.h
index 2fe2d55d3..de1568cbc 100644
--- a/kitty/simd-string.h
+++ b/kitty/simd-string.h
@@ -22,7 +22,7 @@ typedef struct UTF8Decoder {
     struct { uint32_t cur, prev, codep; } state;
 } UTF8Decoder;
 static inline void utf8_decoder_reset(UTF8Decoder *self) { zero_at_ptr(&self->state); }
-bool utf8_decode_to_sentinel(UTF8Decoder *d, const uint8_t *src, const size_t src_sz, const uint8_t sentinel);
+bool utf8_decode_to_esc(UTF8Decoder *d, const uint8_t *src, size_t src_sz);
 
 // Pass a PyModule PyObject* as the argument. Must be called once at application startup
 bool init_simd(void* module);
diff --git a/kitty/vt-parser.c b/kitty/vt-parser.c
index 02dc9d0ba..8d332f052 100644
--- a/kitty/vt-parser.c
+++ b/kitty/vt-parser.c
@@ -235,7 +235,7 @@ dispatch_single_byte_control(PS *self, uint32_t ch) {
 static void
 consume_normal(PS *self) {
     do {
-        const bool sentinel_found = utf8_decode_to_sentinel(&self->utf8_decoder, self->buf + self->read.pos, self->read.sz - self->read.pos, ESC);
+        const bool sentinel_found = utf8_decode_to_esc(&self->utf8_decoder, self->buf + self->read.pos, self->read.sz - self->read.pos);
         self->read.pos += self->utf8_decoder.num_consumed;
         if (self->utf8_decoder.output_sz) {
             REPORT_DRAW(self->utf8_decoder.output, self->utf8_decoder.output_sz);