erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-08 18:05:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix(developer): address review comments, adding comments and renaming variables

Browse source
This commit is contained in:
Marc Durdin 2025-09-12 17:01:21 +02:00
parent c14ca3f409
commit bd3d268bcc
4 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_name_contains_invalid_character-deadkey.kmn vendored
View file

@ -5,6 +5,10 @@ store(&NAME) 'error_name_contains_invalid_character-deadkey'
begin unicode > use(main)
group(main) using keys
c the character between `test` and `test` below is a U+007F DEL, which may not
c be visible in all contexts.
deadkey(testtest) + [K_A] > 'a'

3
developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_name_contains_invalid_character-group.kmn vendored
View file

@ -4,6 +4,9 @@ store(&NAME) 'error_name_contains_invalid_character-group'
begin unicode > use(main)
c the character between `test` and `test` below is a U+007F DEL, which may not
c be visible in all contexts.
group(testtest) using keys
+ [K_A] > 'a'

3
developer/src/kmc-kmn/test/fixtures/invalid-keyboards/error_name_contains_invalid_character-store.kmn vendored
View file

@ -4,6 +4,9 @@ store(&NAME) 'error_name_contains_invalid_character-store'
begin unicode > use(main)
c the character between `test` and `test` below is a U+007F DEL, which may not
c be visible in all contexts.
store(testtest) 'test'
group(main) using keys

14
developer/src/kmcmplib/src/validation.cpp
View file

@ -22,6 +22,8 @@ KMX_BOOL Uni_IsControlCharacter(KMX_WCHAR ch);
/*
Unicode version 16.0; GC=Zs.
List of all space characters in Unicode 16.0, by General Category Zs:
0020;SPACE;Zs;0;WS;;;;;N;;;;;
00A0;NO-BREAK SPACE;Zs;0;CS;<noBreak> 0020;;;;N;NON-BREAKING SPACE;;;;
1680;OGHAM SPACE MARK;Zs;0;WS;;;;;N;;;;;
@ -74,17 +76,17 @@ KMX_BOOL Uni_IsControlCharacter(KMX_WCHAR ch) {
(ch >= 0x007F && ch <= 0x009F);
}
KMX_BOOL Validation::ValidateIdentifier(KMX_WCHAR const *p, size_t maxLength) {
KMX_BOOL Validation::ValidateIdentifier(KMX_WCHAR const *name, size_t maxLength) {
// whitespace already trimmed from start and end
// length of group name > 0
if(*p == 0) {
// length of name > 0
if(*name == 0) {
this->compilerMessage.report(KmnCompilerMessages::ERROR_NameMustBeAtLeastOneCharLong);
return FALSE;
}
// length of group name within bounds, cater for terminating \0
if(u16len(p) >= maxLength) {
// length of name within bounds, cater for terminating \0
if(u16len(name) >= maxLength) {
this->compilerMessage.report(KmnCompilerMessages::ERROR_NameMustBeAtMostNCharsLong, {std::to_string(maxLength - 1)});
return FALSE;
}
@ -93,7 +95,7 @@ KMX_BOOL Validation::ValidateIdentifier(KMX_WCHAR const *p, size_t maxLength) {
// close paren automatically impossible due to earlier phases in parser, but
// including here for completeness.
// TODO: incxstr should be `KMX_WCHAR const *`
for(auto q = p; *q; q = incxstr(const_cast<KMX_WCHAR *>(q))) {
for(auto q = name; *q; q = incxstr(const_cast<KMX_WCHAR *>(q))) {
if(!Uni_IsValidCharacter(q)) {
this->compilerMessage.report(KmnCompilerMessages::ERROR_NameContainsInvalidCharacter);
return FALSE;