mirror of
https://github.com/VectorCamp/vectorscan.git
synced 2025-11-15 17:02:14 +03:00
cStyleCasts
This commit is contained in:
@@ -45,9 +45,9 @@ TEST(Truffle, CompileDot) {
|
||||
|
||||
chars.setall();
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
|
||||
CharReach out = truffle2cr((u8 *)&mask1, (u8 *)&mask2);
|
||||
CharReach out = truffle2cr(reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
|
||||
ASSERT_EQ(out, chars);
|
||||
|
||||
@@ -64,8 +64,8 @@ TEST(Truffle, CompileChars) {
|
||||
mask2 = zeroes128();
|
||||
chars.clear();
|
||||
chars.set((u8)c);
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
CharReach out = truffle2cr((u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
CharReach out = truffle2cr(reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
ASSERT_EQ(out, chars);
|
||||
}
|
||||
|
||||
@@ -74,8 +74,8 @@ TEST(Truffle, CompileChars) {
|
||||
mask1 = zeroes128();
|
||||
mask2 = zeroes128();
|
||||
chars.set((u8)c);
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
CharReach out = truffle2cr((u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
CharReach out = truffle2cr(reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
ASSERT_EQ(out, chars);
|
||||
}
|
||||
|
||||
@@ -84,8 +84,8 @@ TEST(Truffle, CompileChars) {
|
||||
mask1 = zeroes128();
|
||||
mask2 = zeroes128();
|
||||
chars.clear((u8)c);
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
CharReach out = truffle2cr((u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
CharReach out = truffle2cr(reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
ASSERT_EQ(out, chars);
|
||||
}
|
||||
|
||||
@@ -100,12 +100,12 @@ TEST(Truffle, ExecNoMatch1) {
|
||||
|
||||
chars.set('a');
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
|
||||
char t1[] = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb\xff";
|
||||
|
||||
for (size_t i = 0; i < 16; i++) {
|
||||
const u8 *rv = truffleExec(mask1, mask2, (u8 *)t1 + i, (u8 *)t1 + strlen(t1));
|
||||
const u8 *rv = truffleExec(mask1, mask2, reinterpret_cast<u8 *>(t1) + i, reinterpret_cast<u8 *>(t1) + strlen(t1));
|
||||
|
||||
ASSERT_EQ((size_t)t1 + strlen(t1), (size_t)rv);
|
||||
}
|
||||
@@ -119,12 +119,12 @@ TEST(Truffle, ExecNoMatch2) {
|
||||
chars.set('a');
|
||||
chars.set('B');
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
|
||||
char t1[] = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
|
||||
|
||||
for (size_t i = 0; i < 16; i++) {
|
||||
const u8 *rv = truffleExec(mask1, mask2, (u8 *)t1 + i, (u8 *)t1 + strlen(t1));
|
||||
const u8 *rv = truffleExec(mask1, mask2, reinterpret_cast<u8 *>(t1) + i, reinterpret_cast<u8 *>(t1) + strlen(t1));
|
||||
|
||||
ASSERT_EQ((size_t)t1 + strlen(t1), (size_t)rv);
|
||||
}
|
||||
@@ -137,12 +137,12 @@ TEST(Truffle, ExecNoMatch3) {
|
||||
|
||||
chars.set('V'); /* V = 0x56, e = 0x65 */
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
|
||||
char t1[] = "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
|
||||
|
||||
for (size_t i = 0; i < 16; i++) {
|
||||
const u8 *rv = truffleExec(mask1, mask2, (u8 *)t1 + i, (u8 *)t1 + strlen(t1));
|
||||
const u8 *rv = truffleExec(mask1, mask2, reinterpret_cast<u8 *>(t1) + i, reinterpret_cast<u8 *>(t1) + strlen(t1));
|
||||
|
||||
ASSERT_EQ((size_t)t1 + strlen(t1), (size_t)rv);
|
||||
}
|
||||
@@ -154,11 +154,11 @@ TEST(Truffle, ExecMiniMatch0) {
|
||||
CharReach chars;
|
||||
chars.set('a');
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&lo, (u8 *)&hi);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&lo), reinterpret_cast<u8 *>(&hi));
|
||||
|
||||
char t1[] = "a";
|
||||
|
||||
const u8 *rv = truffleExec(lo, hi, (u8 *)t1, (u8 *)t1 + strlen(t1));
|
||||
const u8 *rv = truffleExec(lo, hi, reinterpret_cast<u8 *>(t1), reinterpret_cast<u8 *>(t1) + strlen(t1));
|
||||
|
||||
ASSERT_EQ((size_t)t1, (size_t)rv);
|
||||
}
|
||||
@@ -169,11 +169,11 @@ TEST(Truffle, ExecMiniMatch1) {
|
||||
CharReach chars;
|
||||
chars.set('a');
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&lo, (u8 *)&hi);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&lo), reinterpret_cast<u8 *>(&hi));
|
||||
|
||||
char t1[] = "bbbbbbbabbb";
|
||||
|
||||
const u8 *rv = truffleExec(lo, hi, (u8 *)t1, (u8 *)t1 + strlen(t1));
|
||||
const u8 *rv = truffleExec(lo, hi, reinterpret_cast<u8 *>(t1), reinterpret_cast<u8 *>(t1) + strlen(t1));
|
||||
|
||||
ASSERT_EQ((size_t)t1 + 7, (size_t)rv);
|
||||
}
|
||||
@@ -184,11 +184,11 @@ TEST(Truffle, ExecMiniMatch2) {
|
||||
CharReach chars;
|
||||
chars.set(0);
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&lo, (u8 *)&hi);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&lo), reinterpret_cast<u8 *>(&hi));
|
||||
|
||||
char t1[] = "bbbbbbb\0bbb";
|
||||
|
||||
const u8 *rv = truffleExec(lo, hi, (u8 *)t1, (u8 *)t1 + 11);
|
||||
const u8 *rv = truffleExec(lo, hi, reinterpret_cast<u8 *>(t1), reinterpret_cast<u8 *>(t1) + 11);
|
||||
|
||||
ASSERT_EQ((size_t)t1 + 7, (size_t)rv);
|
||||
}
|
||||
@@ -199,11 +199,11 @@ TEST(Truffle, ExecMiniMatch3) {
|
||||
CharReach chars;
|
||||
chars.set('a');
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&lo, (u8 *)&hi);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&lo), reinterpret_cast<u8 *>(&hi));
|
||||
|
||||
char t1[] = "\0\0\0\0\0\0\0a\0\0\0";
|
||||
|
||||
const u8 *rv = truffleExec(lo, hi, (u8 *)t1, (u8 *)t1 + 11);
|
||||
const u8 *rv = truffleExec(lo, hi, reinterpret_cast<u8 *>(t1), reinterpret_cast<u8 *>(t1) + 11);
|
||||
|
||||
ASSERT_EQ((size_t)t1 + 7, (size_t)rv);
|
||||
}
|
||||
@@ -214,14 +214,14 @@ TEST(Truffle, ExecMatchBig) {
|
||||
CharReach chars;
|
||||
chars.set('a');
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&lo, (u8 *)&hi);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&lo), reinterpret_cast<u8 *>(&hi));
|
||||
|
||||
std::array<u8, 400> t1;
|
||||
t1.fill('b');
|
||||
t1[120] = 'a';
|
||||
|
||||
for (size_t i = 0; i < 16; i++) {
|
||||
const u8 *rv = truffleExec(lo, hi, (u8 *)t1.data() + i, (u8 *)t1.data() + 399);
|
||||
const u8 *rv = truffleExec(lo, hi, reinterpret_cast<u8 *>(t1.data()) + i, reinterpret_cast<u8 *>(t1.data()) + 399);
|
||||
|
||||
ASSERT_LE(((size_t)t1.data() + 120) & ~0xf, (size_t)rv);
|
||||
}
|
||||
@@ -234,13 +234,13 @@ TEST(Truffle, ExecMatch1) {
|
||||
|
||||
chars.set('a');
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
|
||||
/* 0123456789012345678901234567890 */
|
||||
char t1[] = "bbbbbbbbbbbbbbbbbabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbabbbbbbbbbbbb";
|
||||
|
||||
for (size_t i = 0; i < 16; i++) {
|
||||
const u8 *rv = truffleExec(mask1, mask2, (u8 *)t1 + i, (u8 *)t1 + strlen(t1));
|
||||
const u8 *rv = truffleExec(mask1, mask2, reinterpret_cast<u8 *>(t1) + i, reinterpret_cast<u8 *>(t1) + strlen(t1));
|
||||
|
||||
ASSERT_EQ((size_t)t1 + 17, (size_t)rv);
|
||||
}
|
||||
@@ -253,13 +253,13 @@ TEST(Truffle, ExecMatch2) {
|
||||
|
||||
chars.set('a');
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
|
||||
/* 0123456789012345678901234567890 */
|
||||
char t1[] = "bbbbbbbbbbbbbbbbbaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbabbbbbbbbbbbb";
|
||||
|
||||
for (size_t i = 0; i < 16; i++) {
|
||||
const u8 *rv = truffleExec(mask1, mask2, (u8 *)t1 + i, (u8 *)t1 + strlen(t1));
|
||||
const u8 *rv = truffleExec(mask1, mask2, reinterpret_cast<u8 *>(t1) + i, reinterpret_cast<u8 *>(t1) + strlen(t1));
|
||||
|
||||
ASSERT_EQ((size_t)t1 + 17, (size_t)rv);
|
||||
}
|
||||
@@ -273,13 +273,13 @@ TEST(Truffle, ExecMatch3) {
|
||||
chars.set('a');
|
||||
chars.set('B');
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
|
||||
/* 0123456789012345678901234567890 */
|
||||
char t1[] = "bbbbbbbbbbbbbbbbbBaaaaaaaaaaaaaaabbbbbbbbbbbbbbbabbbbbbbbbbbb";
|
||||
|
||||
for (size_t i = 0; i < 16; i++) {
|
||||
const u8 *rv = truffleExec(mask1, mask2, (u8 *)t1 + i, (u8 *)t1 + strlen(t1));
|
||||
const u8 *rv = truffleExec(mask1, mask2, reinterpret_cast<u8 *>(t1) + i, reinterpret_cast<u8 *>(t1) + strlen(t1));
|
||||
|
||||
ASSERT_EQ((size_t)t1 + 17, (size_t)rv);
|
||||
}
|
||||
@@ -295,7 +295,7 @@ TEST(Truffle, ExecMatch4) {
|
||||
chars.set('A');
|
||||
chars.set('c');
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
|
||||
/* 0123456789012345678901234567890 */
|
||||
char t1[] = "bbbbbbbbbbbbbbbbbAaaaaaaaaaaaaaaabbbbbbbbbbbbbbbabbbbbbbbbbbb";
|
||||
@@ -304,19 +304,19 @@ TEST(Truffle, ExecMatch4) {
|
||||
char t4[] = "bbbbbbbbbbbbbbbbbaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbabbbbbbbbbbbb";
|
||||
|
||||
for (size_t i = 0; i < 16; i++) {
|
||||
const u8 *rv = truffleExec(mask1, mask2, (u8 *)t1 + i, (u8 *)t1 + strlen(t1));
|
||||
const u8 *rv = truffleExec(mask1, mask2, reinterpret_cast<u8 *>(t1) + i, reinterpret_cast<u8 *>(t1) + strlen(t1));
|
||||
|
||||
ASSERT_EQ((size_t)t1 + 17, (size_t)rv);
|
||||
|
||||
rv = truffleExec(mask1, mask2, (u8 *)t2 + i, (u8 *)t2 + strlen(t1));
|
||||
rv = truffleExec(mask1, mask2, reinterpret_cast<u8 *>(t2) + i, reinterpret_cast<u8 *>(t2) + strlen(t1));
|
||||
|
||||
ASSERT_EQ((size_t)t2 + 17, (size_t)rv);
|
||||
|
||||
rv = truffleExec(mask1, mask2, (u8 *)t3 + i, (u8 *)t3 + strlen(t3));
|
||||
rv = truffleExec(mask1, mask2, reinterpret_cast<u8 *>(t3) + i, reinterpret_cast<u8 *>(t3) + strlen(t3));
|
||||
|
||||
ASSERT_EQ((size_t)t3 + 17, (size_t)rv);
|
||||
|
||||
rv = truffleExec(mask1, mask2, (u8 *)t4 + i, (u8 *)t4 + strlen(t4));
|
||||
rv = truffleExec(mask1, mask2, reinterpret_cast<u8 *>(t4) + i, reinterpret_cast<u8 *>(t4) + strlen(t4));
|
||||
|
||||
ASSERT_EQ((size_t)t4 + 17, (size_t)rv);
|
||||
}
|
||||
@@ -329,13 +329,13 @@ TEST(Truffle, ExecMatch5) {
|
||||
|
||||
chars.set('a');
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
|
||||
char t1[] = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
|
||||
|
||||
for (size_t i = 0; i < 31; i++) {
|
||||
t1[48 - i] = 'a';
|
||||
const u8 *rv = truffleExec(mask1, mask2, (u8 *)t1, (u8 *)t1 + strlen(t1));
|
||||
const u8 *rv = truffleExec(mask1, mask2, reinterpret_cast<u8 *>(t1), reinterpret_cast<u8 *>(t1) + strlen(t1));
|
||||
|
||||
ASSERT_EQ((size_t)&t1[48 - i], (size_t)rv);
|
||||
}
|
||||
@@ -349,14 +349,14 @@ TEST(Truffle, ExecMatch6) {
|
||||
// [0-Z] - includes some graph chars
|
||||
chars.setRange('0', 'Z');
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
|
||||
std::array<u8, 128> t1;
|
||||
t1.fill('*'); // it's full of stars!
|
||||
|
||||
for (u8 c = '0'; c <= 'Z'; c++) {
|
||||
t1[17] = c;
|
||||
const u8 *rv = truffleExec(mask1, mask2, (u8 *)t1.data(), (u8 *)t1.data() + 128);
|
||||
const u8 *rv = truffleExec(mask1, mask2, reinterpret_cast<u8 *>(t1.data()), reinterpret_cast<u8 *>(t1.data()) + 128);
|
||||
|
||||
ASSERT_EQ((size_t)t1.data() + 17, (size_t)rv);
|
||||
}
|
||||
@@ -370,14 +370,14 @@ TEST(Truffle, ExecMatch7) {
|
||||
// hi bits
|
||||
chars.setRange(127, 255);
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
|
||||
std::array<u8, 128> t1;
|
||||
t1.fill('*'); // it's full of stars!
|
||||
|
||||
for (unsigned int c = 127; c <= 255; c++) {
|
||||
t1[40] = (u8)c;
|
||||
const u8 *rv = truffleExec(mask1, mask2, (u8 *)t1.data(), (u8 *)t1.data() + 128);
|
||||
const u8 *rv = truffleExec(mask1, mask2, reinterpret_cast<u8 *>(t1.data()), reinterpret_cast<u8 *>(t1.data()) + 128);
|
||||
|
||||
ASSERT_EQ((size_t)t1.data() + 40, (size_t)rv);
|
||||
}
|
||||
@@ -389,15 +389,15 @@ TEST(ReverseTruffle, ExecNoMatch1) {
|
||||
CharReach chars;
|
||||
chars.set('a');
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
|
||||
char t[] = " bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
|
||||
char *t1 = t + 1;
|
||||
size_t len = strlen(t1);
|
||||
|
||||
for (size_t i = 0; i < 16; i++) {
|
||||
const u8 *rv = rtruffleExec(mask1, mask2, (u8 *)t1, (u8 *)t1 + len - i);
|
||||
ASSERT_EQ((const u8 *)t, rv);
|
||||
const u8 *rv = rtruffleExec(mask1, mask2, reinterpret_cast<u8 *>(t1), reinterpret_cast<u8 *>(t1) + len - i);
|
||||
ASSERT_EQ(reinterpret_cast<const u8 *>(t), rv);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -409,15 +409,15 @@ TEST(ReverseTruffle, ExecNoMatch2) {
|
||||
chars.set('a');
|
||||
chars.set('B');
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
|
||||
char t[] = " bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
|
||||
char *t1 = t + 1;
|
||||
size_t len = strlen(t1);
|
||||
|
||||
for (size_t i = 0; i < 16; i++) {
|
||||
const u8 *rv = rtruffleExec(mask1, mask2, (u8 *)t1, (u8 *)t1 + len - i);
|
||||
ASSERT_EQ((const u8 *)t, rv);
|
||||
const u8 *rv = rtruffleExec(mask1, mask2, reinterpret_cast<u8 *>(t1), reinterpret_cast<u8 *>(t1) + len - i);
|
||||
ASSERT_EQ(reinterpret_cast<const u8 *>(t), rv);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -427,15 +427,15 @@ TEST(ReverseTruffle, ExecNoMatch3) {
|
||||
CharReach chars;
|
||||
chars.set('V'); /* V = 0x56, e = 0x65 */
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
|
||||
char t[] = "eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
|
||||
char *t1 = t + 1;
|
||||
size_t len = strlen(t1);
|
||||
|
||||
for (size_t i = 0; i < 16; i++) {
|
||||
const u8 *rv = rtruffleExec(mask1, mask2, (u8 *)t1, (u8 *)t1 + len - i);
|
||||
ASSERT_EQ((const u8 *)t, rv);
|
||||
const u8 *rv = rtruffleExec(mask1, mask2, reinterpret_cast<u8 *>(t1), reinterpret_cast<u8 *>(t1) + len - i);
|
||||
ASSERT_EQ(reinterpret_cast<const u8 *>(t), rv);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -445,11 +445,11 @@ TEST(ReverseTruffle, ExecMiniMatch0) {
|
||||
CharReach chars;
|
||||
chars.set('a');
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&lo, (u8 *)&hi);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&lo), reinterpret_cast<u8 *>(&hi));
|
||||
|
||||
char t1[] = "a";
|
||||
|
||||
const u8 *rv = rtruffleExec(lo, hi, (u8 *)t1, (u8 *)t1 + strlen(t1));
|
||||
const u8 *rv = rtruffleExec(lo, hi, reinterpret_cast<u8 *>(t1), reinterpret_cast<u8 *>(t1) + strlen(t1));
|
||||
|
||||
ASSERT_EQ((size_t)t1, (size_t)rv);
|
||||
}
|
||||
@@ -460,16 +460,16 @@ TEST(ReverseTruffle, ExecMiniMatch1) {
|
||||
CharReach chars;
|
||||
chars.set('a');
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
|
||||
/* 0123456789012345678901234567890 */
|
||||
char t1[] = "bbbbbbbabbbb";
|
||||
size_t len = strlen(t1);
|
||||
|
||||
const u8 *rv = rtruffleExec(mask1, mask2, (u8 *)t1, (u8 *)t1 + len);
|
||||
ASSERT_NE((const u8 *)t1 - 1, rv); // not found
|
||||
const u8 *rv = rtruffleExec(mask1, mask2, reinterpret_cast<u8 *>(t1), reinterpret_cast<u8 *>(t1) + len);
|
||||
ASSERT_NE(reinterpret_cast<const u8 *>(t1) - 1, rv); // not found
|
||||
EXPECT_EQ('a', (char)*rv);
|
||||
ASSERT_EQ((const u8 *)t1 + 7, rv);
|
||||
ASSERT_EQ(reinterpret_cast<const u8 *>(t1) + 7, rv);
|
||||
}
|
||||
|
||||
TEST(ReverseTruffle, ExecMiniMatch2) {
|
||||
@@ -478,16 +478,16 @@ TEST(ReverseTruffle, ExecMiniMatch2) {
|
||||
CharReach chars;
|
||||
chars.set('a');
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
|
||||
/* 0123456789012345678901234567890 */
|
||||
char t1[] = "babbbbbabbbb";
|
||||
size_t len = strlen(t1);
|
||||
|
||||
const u8 *rv = rtruffleExec(mask1, mask2, (u8 *)t1, (u8 *)t1 + len);
|
||||
ASSERT_NE((const u8 *)t1 - 1, rv); // not found
|
||||
const u8 *rv = rtruffleExec(mask1, mask2, reinterpret_cast<u8 *>(t1), reinterpret_cast<u8 *>(t1) + len);
|
||||
ASSERT_NE(reinterpret_cast<const u8 *>(t1) - 1, rv); // not found
|
||||
EXPECT_EQ('a', (char)*rv);
|
||||
ASSERT_EQ((const u8 *)t1 + 7, rv);
|
||||
ASSERT_EQ(reinterpret_cast<const u8 *>(t1) + 7, rv);
|
||||
}
|
||||
|
||||
|
||||
@@ -497,17 +497,17 @@ TEST(ReverseTruffle, ExecMatch1) {
|
||||
CharReach chars;
|
||||
chars.set('a');
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
|
||||
/* 0123456789012345678901234567890 */
|
||||
char t1[] = "bbbbbbabbbbbbbbbbabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
|
||||
size_t len = strlen(t1);
|
||||
|
||||
for (size_t i = 0; i < 16; i++) {
|
||||
const u8 *rv = rtruffleExec(mask1, mask2, (u8 *)t1, (u8 *)t1 + len - i);
|
||||
ASSERT_NE((const u8 *)t1 - 1, rv); // not found
|
||||
const u8 *rv = rtruffleExec(mask1, mask2, reinterpret_cast<u8 *>(t1), reinterpret_cast<u8 *>(t1) + len - i);
|
||||
ASSERT_NE(reinterpret_cast<const u8 *>(t1) - 1, rv); // not found
|
||||
EXPECT_EQ('a', (char)*rv);
|
||||
ASSERT_EQ((const u8 *)t1 + 17, rv);
|
||||
ASSERT_EQ(reinterpret_cast<const u8 *>(t1) + 17, rv);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -517,17 +517,17 @@ TEST(ReverseTruffle, ExecMatch2) {
|
||||
CharReach chars;
|
||||
chars.set('a');
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
|
||||
/* 0123456789012345678901234567890 */
|
||||
char t1[] = "bbbbabbbbbbbbbbbbaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbb";
|
||||
size_t len = strlen(t1);
|
||||
|
||||
for (size_t i = 0; i < 16; i++) {
|
||||
const u8 *rv = rtruffleExec(mask1, mask2, (u8 *)t1, (u8 *)t1 + len - i);
|
||||
ASSERT_NE((const u8 *)t1 - 1, rv); // not found
|
||||
const u8 *rv = rtruffleExec(mask1, mask2, reinterpret_cast<u8 *>(t1), reinterpret_cast<u8 *>(t1) + len - i);
|
||||
ASSERT_NE(reinterpret_cast<const u8 *>(t1) - 1, rv); // not found
|
||||
EXPECT_EQ('a', (char)*rv);
|
||||
ASSERT_EQ((const u8 *)t1 + 32, rv);
|
||||
ASSERT_EQ(reinterpret_cast<const u8 *>(t1) + 32, rv);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -538,27 +538,27 @@ TEST(ReverseTruffle, ExecMatch3) {
|
||||
chars.set('a');
|
||||
chars.set('B');
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
|
||||
/* 0123456789012345678901234567890 */
|
||||
char t1[] = "bbbbbbbbbbbbbbbbbaaaaaaaaaaaaaaaBbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
|
||||
size_t len = strlen(t1);
|
||||
|
||||
for (size_t i = 0; i < 16; i++) {
|
||||
const u8 *rv = rtruffleExec(mask1, mask2, (u8 *)t1, (u8 *)t1 + len - i);
|
||||
ASSERT_NE((const u8 *)t1 - 1, rv); // not found
|
||||
const u8 *rv = rtruffleExec(mask1, mask2, reinterpret_cast<u8 *>(t1), reinterpret_cast<u8 *>(t1) + len - i);
|
||||
ASSERT_NE(reinterpret_cast<const u8 *>(t1) - 1, rv); // not found
|
||||
EXPECT_EQ('B', (char)*rv);
|
||||
ASSERT_EQ((const u8 *)t1 + 32, rv);
|
||||
ASSERT_EQ(reinterpret_cast<const u8 *>(t1) + 32, rv);
|
||||
}
|
||||
|
||||
// check that we match the 'a' bytes as well.
|
||||
ASSERT_EQ('B', t1[32]);
|
||||
t1[32] = 'b';
|
||||
for (size_t i = 0; i < 16; i++) {
|
||||
const u8 *rv = rtruffleExec(mask1, mask2, (u8 *)t1, (u8 *)t1 + len - i);
|
||||
ASSERT_NE((const u8 *)t1 - 1, rv); // not found
|
||||
const u8 *rv = rtruffleExec(mask1, mask2, reinterpret_cast<u8 *>(t1), reinterpret_cast<u8 *>(t1) + len - i);
|
||||
ASSERT_NE(reinterpret_cast<const u8 *>(t1) - 1, rv); // not found
|
||||
EXPECT_EQ('a', (char)*rv);
|
||||
ASSERT_EQ((const u8 *)t1 + 31, rv);
|
||||
ASSERT_EQ(reinterpret_cast<const u8 *>(t1) + 31, rv);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -571,7 +571,7 @@ TEST(ReverseTruffle, ExecMatch4) {
|
||||
chars.set('A');
|
||||
chars.set('c');
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
|
||||
/* 0123456789012345678901234567890 */
|
||||
char t1[] = "bbbbbbbbbbbbbbbbbaaaaaaaaaaaaaaaAbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
|
||||
@@ -581,21 +581,21 @@ TEST(ReverseTruffle, ExecMatch4) {
|
||||
size_t len = strlen(t1);
|
||||
|
||||
for (size_t i = 0; i < 16; i++) {
|
||||
const u8 *rv = rtruffleExec(mask1, mask2, (u8 *)t1, (u8 *)t1 + len - i);
|
||||
const u8 *rv = rtruffleExec(mask1, mask2, reinterpret_cast<u8 *>(t1), reinterpret_cast<u8 *>(t1) + len - i);
|
||||
EXPECT_EQ('A', (char)*rv);
|
||||
ASSERT_EQ((const u8 *)t1 + 32, rv);
|
||||
ASSERT_EQ(reinterpret_cast<const u8 *>(t1) + 32, rv);
|
||||
|
||||
rv = rtruffleExec(mask1, mask2, (u8 *)t2, (u8 *)t2 + len - i);
|
||||
rv = rtruffleExec(mask1, mask2, reinterpret_cast<u8 *>(t2), reinterpret_cast<u8 *>(t2) + len - i);
|
||||
EXPECT_EQ('C', (char)*rv);
|
||||
ASSERT_EQ((const u8 *)t2 + 32, rv);
|
||||
ASSERT_EQ(reinterpret_cast<const u8 *>(t2) + 32, rv);
|
||||
|
||||
rv = rtruffleExec(mask1, mask2, (u8 *)t3, (u8 *)t3 + len - i);
|
||||
rv = rtruffleExec(mask1, mask2, reinterpret_cast<u8 *>(t3), reinterpret_cast<u8 *>(t3) + len - i);
|
||||
EXPECT_EQ('c', (char)*rv);
|
||||
ASSERT_EQ((const u8 *)t3 + 32, rv);
|
||||
ASSERT_EQ(reinterpret_cast<const u8 *>(t3) + 32, rv);
|
||||
|
||||
rv = rtruffleExec(mask1, mask2, (u8 *)t4, (u8 *)t4 + len - i);
|
||||
rv = rtruffleExec(mask1, mask2, reinterpret_cast<u8 *>(t4), reinterpret_cast<u8 *>(t4) + len - i);
|
||||
EXPECT_EQ('a', (char)*rv);
|
||||
ASSERT_EQ((const u8 *)t4 + 32, rv);
|
||||
ASSERT_EQ(reinterpret_cast<const u8 *>(t4) + 32, rv);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -605,15 +605,15 @@ TEST(ReverseTruffle, ExecMatch5) {
|
||||
CharReach chars;
|
||||
chars.set('a');
|
||||
|
||||
truffleBuildMasks(chars, (u8 *)&mask1, (u8 *)&mask2);
|
||||
truffleBuildMasks(chars, reinterpret_cast<u8 *>(&mask1), reinterpret_cast<u8 *>(&mask2));
|
||||
|
||||
char t1[] = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
|
||||
size_t len = strlen(t1);
|
||||
|
||||
for (size_t i = 0; i < len; i++) {
|
||||
t1[i] = 'a';
|
||||
const u8 *rv = rtruffleExec(mask1, mask2, (u8 *)t1, (u8 *)t1 + len);
|
||||
const u8 *rv = rtruffleExec(mask1, mask2, reinterpret_cast<u8 *>(t1), reinterpret_cast<u8 *>(t1) + len);
|
||||
|
||||
ASSERT_EQ((const u8 *)t1 + i, rv);
|
||||
ASSERT_EQ(reinterpret_cast<const u8 *>(t1) + i, rv);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user