marrub
/
LithOS3
1
0
Fork 0
Code Releases Activity

stdlib: Fix Lth_Hash_* not masking characters, breaking unicode.

master
Marrub 2016-10-21 17:55:00 -04:00
parent f69a1e8412
commit 0592eca67f
3 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lithos_c/inc/Lth_stdlib.h
View File

@ -43,6 +43,6 @@ void Lth_PrintString(char const *s);
// Hash
size_t Lth_Hash_char(char const *s);
size_t Lth_Hash_str(__str s);
size_t Lth_Hash_str(char __str_ars const *s);
#endif//lithos3__Lth_stdlib_h

2
lithos_c/src/manifest.c
View File

@ -183,7 +183,7 @@ static void ManifestGetInitializer(ManifestState *repr, size_t key)
break;
case Lth_TOK_Identi:
__with(char const *str = Lth_TokenStreamBump(repr->stream)->str;)
if(strcmp(str, "true") == 0) GenValueGetter(Integ, integ, 1);
if(strcmp(str, "true") == 0) GenValueGetter(Integ, integ, 1);
else if(strcmp(str, "false") == 0) GenValueGetter(Integ, integ, 0);
default:
ManifestError(repr, "expected initializer");

31
lithos_c/src/stdlib.c
View File

@ -17,6 +17,16 @@
#include <string.h>
#include <stdlib.h>
#define GenStrHash() \
if(s == NULL) return 0; \
\
size_t ret = 0; \
\
while(*s) \
ret = ret * 101 + ((unsigned char)(*s++) & 0xff); \
\
return ret
// Extern Functions ----------------------------------------------------------|
@ -132,30 +142,15 @@ void Lth_PrintString(char const *s)
//
size_t Lth_Hash_char(char const *s)
{
if(s == NULL) return 0;
size_t ret = 0;
while(*s)
ret = ret * 101 + (unsigned char)(*s++);
return ret;
GenStrHash();
}
//
// Lth_Hash_str
//
size_t Lth_Hash_str(__str s)
size_t Lth_Hash_str(char __str_ars const *s)
{
if(s == NULL) return 0;
size_t ret = 0;
size_t len = ACS_StrLen(s);
for(size_t i = 0; i < len; i++)
ret = ret * 101 + (unsigned char)(s[i]);
return ret;
GenStrHash();
}
// EOF