From e77a6b8bb5557a23cc053014ef1cd2bd73c4e15c Mon Sep 17 00:00:00 2001 From: kichikuou Date: Tue, 10 Dec 2024 09:15:26 +0900 Subject: [PATCH] Rename skip_string to skip_syseng_string for consistency --- src/sys/nact_sys1.cpp | 2 +- src/sys/nact_sys2.cpp | 4 ++-- src/sys/scenario.cpp | 2 +- src/sys/scenario.h | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/sys/nact_sys1.cpp b/src/sys/nact_sys1.cpp index b31e8e0..24da926 100644 --- a/src/sys/nact_sys1.cpp +++ b/src/sys/nact_sys1.cpp @@ -217,7 +217,7 @@ void NACT_Sys1::cmd_branch() cali(); cali(); } else if (cmd == '\'' || cmd == '"') { // SysEng - sco.skip_string(encoding.get(), cmd); + sco.skip_syseng_string(encoding.get(), cmd); } else if (is_message(cmd)) { sco.ungetd(); sco.skip(encoding->mblen(sco.ptr())); diff --git a/src/sys/nact_sys2.cpp b/src/sys/nact_sys2.cpp index 08e3c87..e32fba7 100644 --- a/src/sys/nact_sys2.cpp +++ b/src/sys/nact_sys2.cpp @@ -174,7 +174,7 @@ void NACT_Sys2::cmd_branch() } else if(cmd == 'M') { uint8 val = sco.getd(); if (val == '\'' || val == '"') { // SysEng - sco.skip_string(encoding.get(), val); + sco.skip_syseng_string(encoding.get(), val); } else { while (val != ':') val = sco.getd(); @@ -255,7 +255,7 @@ void NACT_Sys2::cmd_branch() cali(); cali(); } else if (cmd == '\'' || cmd == '"') { // SysEng - sco.skip_string(encoding.get(), cmd); + sco.skip_syseng_string(encoding.get(), cmd); } else if (is_message(cmd)) { sco.ungetd(); sco.skip(encoding->mblen(sco.ptr())); diff --git a/src/sys/scenario.cpp b/src/sys/scenario.cpp index 40f1dfd..17a7614 100644 --- a/src/sys/scenario.cpp +++ b/src/sys/scenario.cpp @@ -3,7 +3,7 @@ #include "common.h" #include "encoding.h" -void Scenario::skip_string(Encoding *enc, uint8_t terminator) +void Scenario::skip_syseng_string(Encoding *enc, uint8_t terminator) { for (uint8_t c = getd(); c != terminator; c = getd()) { if (c != '\\') diff --git a/src/sys/scenario.h b/src/sys/scenario.h index 00e1339..3f33101 100644 --- a/src/sys/scenario.h +++ b/src/sys/scenario.h @@ -41,7 +41,7 @@ public: return w; } void ungetd() { addr_--; } - void skip_string(Encoding *enc, uint8_t terminator); + void skip_syseng_string(Encoding *enc, uint8_t terminator); void get_syseng_string(char* buf, int size, Encoding *enc, uint8_t terminator); void label_call(int label);