krgamestudios/Toy
1
0
Fork 0
mirror of https://github.com/krgamestudios/Toy.git synced 2026-04-15 23:04:08 +10:00
Code Issues Packages Projects Releases Wiki Activity

Added equality check for arrays and dictionaries - needs testing

Browse Source
This commit is contained in:
Kayne Ruse
2022-08-11 20:13:01 +01:00
parent 00812e7a73
commit 42e55c1db6
1 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
source/literal.c
View File

@@ -254,7 +254,33 @@ bool literalsAreEqual(Literal lhs, Literal rhs) {
} }
return !strncmp(AS_STRING(lhs), AS_STRING(rhs), STRLEN(lhs)); return !strncmp(AS_STRING(lhs), AS_STRING(rhs), STRLEN(lhs));
//TODO: literal array and literal dictionary equality checks case LITERAL_ARRAY:
if (AS_ARRAY(lhs)->count != AS_ARRAY(rhs)->count) {
return false;
}
for (int i = 0; i < AS_ARRAY(lhs)->count; i++) {
if (!literalsAreEqual( AS_ARRAY(lhs)->literals[i], AS_ARRAY(rhs)->literals[i] )) {
return false;
}
}
return true;
case LITERAL_DICTIONARY:
//relatively slow, especially when nested
for (int i = 0; i < AS_DICTIONARY(lhs)->capacity; i++) {
if (!IS_NULL(AS_DICTIONARY(lhs)->entries[i].key)) { //only compare non-null keys
//check it exists in rhs
if (!existsLiteralDictionary(AS_DICTIONARY(rhs), AS_DICTIONARY(lhs)->entries[i].key)) {
return false;
}
//compare the values
if (!literalsAreEqual(AS_DICTIONARY(lhs)->entries[i].value, getLiteralDictionary(AS_DICTIONARY(rhs), AS_DICTIONARY(lhs)->entries[i].key) )) {
return false;
}
}
}
return true;
case LITERAL_IDENTIFIER: case LITERAL_IDENTIFIER:
if (HASH_I(lhs) != HASH_I(rhs) && STRLEN_I(lhs) != STRLEN_I(rhs)) { if (HASH_I(lhs) != HASH_I(rhs) && STRLEN_I(lhs) != STRLEN_I(rhs)) {
@@ -296,7 +322,7 @@ int hashLiteral(Literal lit) {
case LITERAL_DICTIONARY: { case LITERAL_DICTIONARY: {
unsigned int res = 0; unsigned int res = 0;
for (int i = 0; i < AS_DICTIONARY(lit)->count; i++) { for (int i = 0; i < AS_DICTIONARY(lit)->capacity; i++) {
if (!IS_NULL(AS_DICTIONARY(lit)->entries[i].key)) { //only hash non-null keys if (!IS_NULL(AS_DICTIONARY(lit)->entries[i].key)) { //only hash non-null keys
res += hashLiteral(AS_DICTIONARY(lit)->entries[i].key); res += hashLiteral(AS_DICTIONARY(lit)->entries[i].key);
res += hashLiteral(AS_DICTIONARY(lit)->entries[i].value); res += hashLiteral(AS_DICTIONARY(lit)->entries[i].value);