lcpp
/
lci
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed string interpolation during comparison (as pointed out by @Lucki, thanks)

This commit is contained in:
Justin Meza 2015-07-19 11:22:56 -07:00
parent b0ae8def1b
commit e3388d5fc7
7 changed files with 66 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
interpreter.c
View File

@ -2990,8 +2990,18 @@ ValueObject *interpretEqualityOpExprNode(OpExprNode *expr,
return NULL;
}
}
else
else {
/* If comparing strings, interpolate them first */
ValueObject *old1 = val1;
ValueObject *old2 = val2;
if (val1->type == VT_STRING) {
val1 = castStringExplicit(val1, scope);
val2 = castStringExplicit(val2, scope);
deleteValueObject(old1);
deleteValueObject(old2);
}
ret = BoolOpJumpTable[expr->type - OP_EQ][val1->type][val2->type](val1, val2);
}
deleteValueObject(val1);
deleteValueObject(val2);
return ret;

2
test/1.3-Tests/3-Types/5-String/3-Comparison/CMakeLists.txt Normal file
View File

@ -0,0 +1,2 @@
INCLUDE(AddLolTest)
ADD_LOL_TEST(3-Comparison OUTPUT test.out)

41
test/1.3-Tests/3-Types/5-String/3-Comparison/test.lol Normal file
View File

@ -0,0 +1,41 @@
HAI 1.3
CAN HAS STRING?
I HAS A string ITZ "::hello"
I HAS A char ITZ I IZ STRING'Z AT YR string AN YR 0 MKAY
VISIBLE char AN " - " AN "::"
BOTH SAEM char AN "::", O RLY?
YA RLY
VISIBLE "success"
NO WAI
VISIBLE "fail"
OIC
VISIBLE char AN " - " AN ":(3A)"
BOTH SAEM char AN ":(3A)", O RLY?
YA RLY
VISIBLE "success"
NO WAI
VISIBLE "fail"
OIC
I HAS A char2 ITZ I IZ STRING'Z AT YR string AN YR 1 MKAY
VISIBLE char2 AN " - " AN "h"
BOTH SAEM char2 AN "h", O RLY?
YA RLY
VISIBLE "success"
NO WAI
VISIBLE "fail"
OIC
I HAS A char3 ITZ "::"
VISIBLE char3 AN " - " AN "::"
BOTH SAEM char3 AN "::", O RLY?
YA RLY
VISIBLE "success"
NO WAI
VISIBLE "fail"
OIC
KTHXBYE

8
test/1.3-Tests/3-Types/5-String/3-Comparison/test.out Normal file
View File

@ -0,0 +1,8 @@
: - :
success
: - :
success
h - h
success
: - :
success

2
test/1.3-Tests/3-Types/5-String/3-Comparison/test.readme Normal file
View File

@ -0,0 +1,2 @@
This test checks that strings containing escape sequences are compared
correctly.

1
test/1.3-Tests/3-Types/5-String/CMakeLists.txt
View File

@ -1,2 +1,3 @@
add_subdirectory(1-Escapes)
add_subdirectory(2-Syntax)
add_subdirectory(3-Comparison)

2
unicode.c
View File

@ -43575,7 +43575,7 @@ long convertNormativeNameToCodePoint(const char *name)
{
int index = binarySearch(names, 0, NUM_UNICODE - 1, name);
if (index < 0) {
fprintf(stderr, "Invalid Unicode normative name.\n");
fprintf(stderr, "Invalid Unicode normative name: %s.\n", name);
return -1;
}
else