erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-11 03:15:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

fix(developer): rename isuiw() to isIntegerWString()

Browse source
This commit is contained in:
Dr Mark C. Sinclair 2024-06-19 11:30:29 +01:00
parent defc1025fd
commit 8738ee3681
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
developer/src/kmcmplib/src/Compiler.cpp
View file

@ -134,7 +134,7 @@ namespace kmcmp{
int xatoi(PKMX_WCHAR *p);
int atoiW(PKMX_WCHAR p);
bool isuiw(PKMX_WCHAR p);
bool isIntegerWstring(PKMX_WCHAR p);
void safe_wcsncpy(PKMX_WCHAR out, PKMX_WCHAR in, int cbMax);
int GetDeadKey(PFILE_KEYBOARD fk, PKMX_WCHAR p);
@ -2015,7 +2015,7 @@ KMX_DWORD GetXStringImpl(PKMX_WCHAR tstr, PFILE_KEYBOARD fk, PKMX_WCHAR str, KMX
kmcmp::CheckStoreUsage(fk, i, TRUE, FALSE, FALSE);
r = u16tok(NULL, p_sep_com, &context); // I3481
if (!r || !*r || !isuiw(r)) return CERR_InvalidIndex;
if (!r || !*r || !isIntegerWstring(r)) return CERR_InvalidIndex;
}
tstr[mx++] = UC_SENTINEL;
tstr[mx++] = CODE_INDEX;
@ -3363,7 +3363,7 @@ int atoiW(PKMX_WCHAR p)
return i;
}
bool isuiw(PKMX_WCHAR p) {
bool isIntegerWstring(PKMX_WCHAR p) {
if (!p || !*p)
return false;
PKMX_STR q = wstrtostr(p);

20
developer/src/kmcmplib/tests/gtest-compiler-test.cpp
View file

@ -1,4 +1,5 @@
#include <gtest/gtest.h>
#include <climits>
#include "../include/kmcompx.h"
#include "../include/kmcmplibapi.h"
#include "../src/kmx_u16.h"
@ -18,7 +19,7 @@ KMX_DWORD GetXStringImpl(PKMX_WCHAR tstr, PFILE_KEYBOARD fk, PKMX_WCHAR str, KMX
PKMX_WCHAR output, int max, int offset, PKMX_WCHAR *newp, int isUnicode
);
KMX_DWORD GetRHS(PFILE_KEYBOARD fk, PKMX_WCHAR p, PKMX_WCHAR buf, int bufsize, int offset, int IsUnicode);
bool isuiw(PKMX_WCHAR p);
bool isIntegerWstring(PKMX_WCHAR p);
bool hasPreamble(std::u16string result);
extern kmcmp_CompilerMessageProc msgproc;
@ -514,13 +515,16 @@ TEST_F(CompilerTest, GetRHS_test) {
// int atoiW(PKMX_WCHAR p)
// KMX_DWORD kmcmp::CheckUTF16(int n)
TEST_F(CompilerTest, isuiw_test) {
EXPECT_FALSE(isuiw(nullptr));
EXPECT_FALSE(isuiw((PKMX_WCHAR)u""));
EXPECT_FALSE(isuiw((PKMX_WCHAR)u"a"));
EXPECT_FALSE(isuiw((PKMX_WCHAR)u"-1"));
EXPECT_TRUE(isuiw((PKMX_WCHAR)u"1"));
EXPECT_TRUE(isuiw((PKMX_WCHAR)u"42"));
TEST_F(CompilerTest, isIntegerWstring_test) {
EXPECT_FALSE(isIntegerWstring(nullptr));
EXPECT_FALSE(isIntegerWstring((PKMX_WCHAR)u""));
EXPECT_FALSE(isIntegerWstring((PKMX_WCHAR)u"a"));
EXPECT_FALSE(isIntegerWstring((PKMX_WCHAR)u"-1"));
EXPECT_TRUE(isIntegerWstring((PKMX_WCHAR)u"1"));
EXPECT_TRUE(isIntegerWstring((PKMX_WCHAR)u"42"));
//EXPECT_TRUE(isIntegerWstring((PKMX_WCHAR)u"2147483647")); // INT_MAX
//EXPECT_FALSE(isIntegerWstring((PKMX_WCHAR)u"2147483648")); // INT_MAX + 1
//EXPECT_FALSE(isIntegerWstring((PKMX_WCHAR)u"9999999999")); // > INT_MAX
}
// KMX_DWORD kmcmp::UTF32ToUTF16(int n, int *n1, int *n2)