Port new shlex code to Go

kovidgoyal · Dec 4, 2023 · a1f2a7d · a1f2a7d
1 parent 04eafbe
commit a1f2a7d
Show file tree

Hide file tree

Showing 4 changed files with 198 additions and 433 deletions.
diff --git a/kittens/ssh/utils_test.go b/kittens/ssh/utils_test.go
@@ -28,6 +28,9 @@ func TestParseSSHArgs(t *testing.T) {
 		if err != nil {
 			t.Fatal(err)
 		}
+		if len(ans) == 0 {
+			ans = []string{}
+		}
 		return ans
 	}
 
@@ -39,7 +42,7 @@ func TestParseSSHArgs(t *testing.T) {
 		check := func(a, b any) {
 			diff := cmp.Diff(a, b)
 			if diff != "" {
-				t.Fatalf("Unexpected value for args: %s\n%s", args, diff)
+				t.Fatalf("Unexpected value for args: %#v\n%s", args, diff)
 			}
 		}
 		check(split(expected_ssh_args), ssh_args)

diff --git a/kitty/shlex.c b/kitty/shlex.c
@@ -109,21 +109,16 @@ next_word(Shlex *self, PyObject *args UNUSED) {
                 switch(ch) {
                     case STRING_WITHOUT_ESCAPES_DELIM:
                         set_state(self, WORD);
-                        if (self->buf_pos && self->state == NORMAL) return get_word(self);
                         break;
                     default: write_ch(self, ch); break;
                 } break;
             case STRING_WITH_ESCAPES:
                 switch(ch) {
                     case STRING_WITH_ESCAPES_DELIM:
                         set_state(self, WORD);
-                        if (self->buf_pos && self->state == NORMAL) return get_word(self);
                         break;
                     case ESCAPE_CHAR:
-                        if (self->src_pos < self->src_sz) {
-                            Py_UCS4 nch = PyUnicode_READ(self->kind, self->src_data, self->src_pos); self->src_pos++;
-                            write_ch(self, nch);
-                        }
+                        write_escape_ch(self);
                         break;
                     default: write_ch(self, ch); break;
                 } break;