From 262290a4e8bd6d8f975f84a03bb10809623bd61a Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Thu, 15 Apr 2021 08:45:09 -0700 Subject: . --- shell/gap-buffer.mu | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/shell/gap-buffer.mu b/shell/gap-buffer.mu index ab515812..f4ddc7dd 100644 --- a/shell/gap-buffer.mu +++ b/shell/gap-buffer.mu @@ -161,6 +161,11 @@ fn add-grapheme-at-gap _self: (addr gap-buffer), g: grapheme { push-grapheme-stack left, g } +fn add-code-point-at-gap self: (addr gap-buffer), c: code-point { + var g/eax: grapheme <- copy c + add-grapheme-at-gap self, g +} + fn gap-to-start self: (addr gap-buffer) { { var curr/eax: grapheme <- gap-left self @@ -322,10 +327,9 @@ fn test-gap-buffer-equal-from-end { var g/esi: (addr gap-buffer) <- address _g initialize-gap-buffer g, 0x10 # - var c/eax: grapheme <- copy 0x61/a - add-grapheme-at-gap g, c - add-grapheme-at-gap g, c - add-grapheme-at-gap g, c + add-code-point-at-gap g, 0x61/a + add-code-point-at-gap g, 0x61/a + add-code-point-at-gap g, 0x61/a # gap is at end (right is empty) var result/eax: boolean <- gap-buffer-equal? g, "aaa" check result, "F - test-gap-buffer-equal-from-end" @@ -336,10 +340,9 @@ fn test-gap-buffer-equal-from-middle { var g/esi: (addr gap-buffer) <- address _g initialize-gap-buffer g, 0x10 # - var c/eax: grapheme <- copy 0x61/a - add-grapheme-at-gap g, c - add-grapheme-at-gap g, c - add-grapheme-at-gap g, c + add-code-point-at-gap g, 0x61/a + add-code-point-at-gap g, 0x61/a + add-code-point-at-gap g, 0x61/a var dummy/eax: grapheme <- gap-left g # gap is in the middle var result/eax: boolean <- gap-buffer-equal? g, "aaa" @@ -351,10 +354,9 @@ fn test-gap-buffer-equal-from-start { var g/esi: (addr gap-buffer) <- address _g initialize-gap-buffer g, 0x10 # - var c/eax: grapheme <- copy 0x61/a - add-grapheme-at-gap g, c - add-grapheme-at-gap g, c - add-grapheme-at-gap g, c + add-code-point-at-gap g, 0x61/a + add-code-point-at-gap g, 0x61/a + add-code-point-at-gap g, 0x61/a var dummy/eax: grapheme <- gap-left g dummy <- gap-left g dummy <- gap-left g @@ -368,10 +370,9 @@ fn test-gap-buffer-equal-fails { var _g: gap-buffer var g/esi: (addr gap-buffer) <- address _g initialize-gap-buffer g, 0x10 - var c/eax: grapheme <- copy 0x61/a - add-grapheme-at-gap g, c - add-grapheme-at-gap g, c - add-grapheme-at-gap g, c + add-code-point-at-gap g, 0x61/a + add-code-point-at-gap g, 0x61/a + add-code-point-at-gap g, 0x61/a # var result/eax: boolean <- gap-buffer-equal? g, "aa" check-not result, "F - test-gap-buffer-equal-fails" -- cgit 1.4.1-2-gfad0