Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Formally re-port this logic from MRI str_casecmp #7953

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Formally re-port this logic from MRI str_casecmp #7953

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
82 changes: 45 additions & 37 deletions core/src/main/java/org/jruby/util/StringSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2484,50 +2484,58 @@ private static int trCode(int c, int[]trans, IntHash<Integer> hash, boolean cfla
}
}

public static int multiByteCasecmp(Encoding enc, ByteList value, ByteList otherValue) {
byte[]bytes = value.getUnsafeBytes();
int p = value.getBegin();
int end = p + value.getRealSize();

byte[]obytes = otherValue.getUnsafeBytes();
int op = otherValue.getBegin();
int oend = op + otherValue.getRealSize();

while (p < end && op < oend) {
final int c, oc;
if (enc.isAsciiCompatible()) {
c = bytes[p] & 0xff;
oc = obytes[op] & 0xff;
} else {
c = preciseCodePoint(enc, bytes, p, end);
oc = preciseCodePoint(enc, obytes, op, oend);
}
// MRI: multibyte portion of str_casecmp
public static int multiByteCasecmp(Encoding enc, ByteList value1, ByteList value2) {
byte[] bytes = value1.getUnsafeBytes();
int p1 = value1.getBegin();
int size1 = value1.getRealSize();
int end1 = p1 + size1;

final int cl, ocl;
if (Encoding.isAscii(c) && Encoding.isAscii(oc)) {
int dc = AsciiTables.ToUpperCaseTable[c];
int odc = AsciiTables.ToUpperCaseTable[oc];
if (dc != odc) return dc < odc ? -1 : 1;
byte[] bytes2 = value2.getUnsafeBytes();
int p2 = value2.getBegin();
int size2 = value2.getRealSize();
int end2 = p2 + size2;

if (enc.isAsciiCompatible()) {
cl = ocl = 1;
} else {
cl = preciseLength(enc, bytes, p, end);
ocl = preciseLength(enc, obytes, op, oend);
int[] lenAry = {0};


while (p1 < end1 && p2 < end2) {
final int c1, c2;
int l1, l2;

c1 = EncodingUtils.encAscget(bytes, p1, end1, lenAry, enc);
l1 = lenAry[0];
c2 = EncodingUtils.encAscget(bytes2, p2, end2, lenAry, enc);
l2 = lenAry[0];

if (0 <= c1 && 0 <= c2) {
int dc = AsciiTables.ToLowerCaseTable[c1];
int odc = AsciiTables.ToLowerCaseTable[c2];

if (dc != odc) {
return dc < odc ? -1 : 1;
}
} else {
cl = length(enc, bytes, p, end);
ocl = length(enc, obytes, op, oend);
int ret = caseCmp(bytes, p, obytes, op, cl < ocl ? cl : ocl);
if (ret != 0) return ret < 0 ? -1 : 1;
if (cl != ocl) return cl < ocl ? -1 : 1;
l1 = length(enc, bytes, p1, end1);
l2 = length(enc, bytes2, p2, end2);

int len = Math.min(l1, l2);
int ret = ByteList.memcmp(bytes, p1, bytes2, p2, len);

if (ret != 0) {
return ret < 0 ? -1 : 1;
}

if (l1 != l2) {
return l1 < l2 ? -1 : 1;
}
}

p += cl;
op += ocl;
p1 += l1;
p2 += l2;
}
if (end - p == oend - op) return 0;
return end - p > oend - op ? 1 : -1;
if (size1 == size2) return 0;
return size1 > size2 ? 1 : -1;
}

public static boolean singleByteSqueeze(ByteList value, boolean squeeze[]) {
Expand Down