From e736ae0ca1b962e33c03ca1a52a307748ee521ce Mon Sep 17 00:00:00 2001 From: ShikiSuen Date: Fri, 13 May 2022 10:01:25 +0800 Subject: [PATCH] KeyHandler & Megrez // Nomenclature updates. --- Source/Modules/ControllerModules/KeyHandler_Core.swift | 6 +++--- Source/Modules/ControllerModules/KeyHandler_States.swift | 2 +- .../LanguageParsers/Megrez/1_BlockReadingBuilder.swift | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Modules/ControllerModules/KeyHandler_Core.swift b/Source/Modules/ControllerModules/KeyHandler_Core.swift index 9c790668..c42d0440 100644 --- a/Source/Modules/ControllerModules/KeyHandler_Core.swift +++ b/Source/Modules/ControllerModules/KeyHandler_Core.swift @@ -312,11 +312,11 @@ class KeyHandler: NSObject { } func deleteBuilderReadingInFrontOfCursor() { - _builder.deleteReadingBeforeCursor() + _builder.deleteReadingAtTheRearOfCursor() } - func deleteBuilderReadingAfterCursor() { - _builder.deleteReadingAfterCursor() + func deleteBuilderReadingToTheFrontOfCursor() { + _builder.deleteReadingToTheFrontOfCursor() } func getKeyLengthAtIndexZero() -> Int { diff --git a/Source/Modules/ControllerModules/KeyHandler_States.swift b/Source/Modules/ControllerModules/KeyHandler_States.swift index 454db395..2d7f8cfd 100644 --- a/Source/Modules/ControllerModules/KeyHandler_States.swift +++ b/Source/Modules/ControllerModules/KeyHandler_States.swift @@ -372,7 +372,7 @@ extension KeyHandler { if _composer.isEmpty { if getBuilderCursorIndex() != getBuilderLength() { - deleteBuilderReadingAfterCursor() + deleteBuilderReadingToTheFrontOfCursor() walk() let inputting = buildInputtingState() // 這裡不用「count > 0」,因為該整數變數只要「!isEmpty」那就必定滿足這個條件。 diff --git a/Source/Modules/LanguageParsers/Megrez/1_BlockReadingBuilder.swift b/Source/Modules/LanguageParsers/Megrez/1_BlockReadingBuilder.swift index d07d3af9..78b659f0 100644 --- a/Source/Modules/LanguageParsers/Megrez/1_BlockReadingBuilder.swift +++ b/Source/Modules/LanguageParsers/Megrez/1_BlockReadingBuilder.swift @@ -60,7 +60,7 @@ extension Megrez { public func readings() -> [String] { mutReadings } - @discardableResult public func deleteReadingBeforeCursor() -> Bool { + @discardableResult public func deleteReadingAtTheRearOfCursor() -> Bool { if mutCursorIndex == 0 { return false } @@ -72,7 +72,7 @@ extension Megrez { return true } - @discardableResult public func deleteReadingAfterCursor() -> Bool { + @discardableResult public func deleteReadingToTheFrontOfCursor() -> Bool { if mutCursorIndex == mutReadings.count { return false }