luau-lang/luau
1
0
Fork 0
mirror of https://github.com/luau-lang/luau.git synced 2024-12-13 21:40:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

correct comparison function

Browse source
This commit is contained in:
birds3345 2024-07-12 02:38:10 -04:00
parent 931d8d619d
commit 2700bd070c
1 changed files with 15 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
Compiler/src/ConstantFolding.cpp
View file

@ -74,6 +74,17 @@ static void foldUnary(Constant& result, AstExprUnary::Op op, const Constant& arg
} }
} }
static int compareStrings(const char* string1, const char* string2, unsigned int size1, unsigned int size2)
{
unsigned int size = std::min(size1, size2);
int res = memcmp(string1, string2, size);
if (res != 0 || size1 == size2)
return res;
return size1 < size2 ? -1 : 1;
}
static void foldBinary(Constant& result, AstExprBinary::Op op, const Constant& la, const Constant& ra) static void foldBinary(Constant& result, AstExprBinary::Op op, const Constant& la, const Constant& ra)
{ {
switch (op) switch (op)
@ -162,7 +173,7 @@ static void foldBinary(Constant& result, AstExprBinary::Op op, const Constant& l
else if (FFlag::LuauConstantFoldStringComparisons && la.type == Constant::Type_String && ra.type == Constant::Type_String) else if (FFlag::LuauConstantFoldStringComparisons && la.type == Constant::Type_String && ra.type == Constant::Type_String)
{ {
result.type = Constant::Type_Boolean; result.type = Constant::Type_Boolean;
result.valueBoolean = strcmp(la.valueString, ra.valueString) < 0; result.valueBoolean = compareStrings(la.valueString, ra.valueString, la.stringLength, ra.stringLength) < 0;
} }
break; break;
@ -175,7 +186,7 @@ static void foldBinary(Constant& result, AstExprBinary::Op op, const Constant& l
else if (FFlag::LuauConstantFoldStringComparisons && la.type == Constant::Type_String && ra.type == Constant::Type_String) else if (FFlag::LuauConstantFoldStringComparisons && la.type == Constant::Type_String && ra.type == Constant::Type_String)
{ {
result.type = Constant::Type_Boolean; result.type = Constant::Type_Boolean;
result.valueBoolean = strcmp(la.valueString, ra.valueString) <= 0; result.valueBoolean = compareStrings(la.valueString, ra.valueString, la.stringLength, ra.stringLength) <= 0;
} }
break; break;
@ -188,7 +199,7 @@ static void foldBinary(Constant& result, AstExprBinary::Op op, const Constant& l
else if (FFlag::LuauConstantFoldStringComparisons && la.type == Constant::Type_String && ra.type == Constant::Type_String) else if (FFlag::LuauConstantFoldStringComparisons && la.type == Constant::Type_String && ra.type == Constant::Type_String)
{ {
result.type = Constant::Type_Boolean; result.type = Constant::Type_Boolean;
result.valueBoolean = strcmp(la.valueString, ra.valueString) > 0; result.valueBoolean = compareStrings(la.valueString, ra.valueString, la.stringLength, ra.stringLength) > 0;
} }
break; break;
@ -201,7 +212,7 @@ static void foldBinary(Constant& result, AstExprBinary::Op op, const Constant& l
else if (FFlag::LuauConstantFoldStringComparisons && la.type == Constant::Type_String && ra.type == Constant::Type_String) else if (FFlag::LuauConstantFoldStringComparisons && la.type == Constant::Type_String && ra.type == Constant::Type_String)
{ {
result.type = Constant::Type_Boolean; result.type = Constant::Type_Boolean;
result.valueBoolean = strcmp(la.valueString, ra.valueString) >= 0; result.valueBoolean = compareStrings(la.valueString, ra.valueString, la.stringLength, ra.stringLength) >= 0;
} }
break; break;