diff --git a/re2/re2.cc b/re2/re2.cc index 806f055d7ed1e9e5fb59104b032f6e886dc5c5fa..f36f7f21b679c8c42c3d46d3ac3b7fb08cb21d88 100644 --- a/re2/re2.cc +++ b/re2/re2.cc @@ -839,7 +839,7 @@ namespace re2 submatch[i] = StringPiece(text.data() + start, static_cast(len)); } else{ - submatch[i] = StringPiece(text.data() + start, static_cast(len/2)); + submatch[i] = StringPiece(text.data() + start, static_cast(len / 2)); } } diff --git a/re2/regex_internal.h b/re2/regex_internal.h index 3137be9f7092b2d120f862408b8ab71ff9ee86cc..a05c1e6ed856d007d7269c7c7e3e1b9bd23477ef 100644 --- a/re2/regex_internal.h +++ b/re2/regex_internal.h @@ -14,20 +14,20 @@ class Regexp { // Flags for parsing. Can be ORed together. enum ParseFlags { NoParseFlags = 0, - FoldCase = 1<<0, // Fold case during matching (case-insensitive). - Literal = 1<<1, // Treat s as literal string instead of a regexp. - ClassNL = 1<<2, // Allow char classes like [^a-z] and \D and \s + FoldCase = 1 << 0, // Fold case during matching (case-insensitive). + Literal = 1 << 1, // Treat s as literal string instead of a regexp. + ClassNL = 1 << 2, // Allow char classes like [^a-z] and \D and \s // and [[:space:]] to match newline. - DotNL = 1<<3, // Allow . to match newline. + DotNL = 1 << 3, // Allow . to match newline. MatchNL = ClassNL | DotNL, - OneLine = 1<<4, // Treat ^ and $ as only matching at beginning and + OneLine = 1 << 4, // Treat ^ and $ as only matching at beginning and // end of text, not around embedded newlines. // (Perl's default) - Latin1 = 1<<5, // Regexp and text are in Latin1, not UTF-8. - NonGreedy = 1<<6, // Repetition operators are non-greedy by default. - PerlClasses = 1<<7, // Allow Perl character classes like \d. - PerlB = 1<<8, // Allow Perl's \b and \B. - PerlX = 1<<9, // Perl extensions: + Latin1 = 1 << 5, // Regexp and text are in Latin1, not UTF-8. + NonGreedy = 1 << 6, // Repetition operators are non-greedy by default. + PerlClasses = 1 << 7, // Allow Perl character classes like \d. + PerlB = 1 << 8, // Allow Perl's \b and \B. + PerlX = 1 << 9, // Perl extensions: // non-capturing parens - (?: ) // non-greedy operators - *? +? ?? {}? // flag edits - (?i) (?-i) (?i: ) @@ -39,19 +39,19 @@ class Regexp { // \Q and \E to disable/enable metacharacters // (?Pexpr) for named captures // \C to match any single byte - UnicodeGroups = 1<<10, // Allow \p{Han} for Unicode Han group + UnicodeGroups = 1 << 10, // Allow \p{Han} for Unicode Han group // and \P{Han} for its negation. - NeverNL = 1<<11, // Never match NL, even if the regexp mentions + NeverNL = 1 << 11, // Never match NL, even if the regexp mentions // it explicitly. - NeverCapture = 1<<12, // Parse all parens as non-capturing. + NeverCapture = 1 << 12, // Parse all parens as non-capturing. // As close to Perl as we can get. LikePerl = ClassNL | OneLine | PerlClasses | PerlB | PerlX | UnicodeGroups, // Internal use only. - WasDollar = 1<<13, // on kRegexpEndText: was $ in regexp text - AllParseFlags = (1<<14)-1, + WasDollar = 1 << 13, // on kRegexpEndText: was $ in regexp text + AllParseFlags = (1 << 14)-1, }; }; }; \ No newline at end of file diff --git a/re2/set.cc b/re2/set.cc index 920f1469d39e2f826f9a58e6d69cee03bfe7f355..ef9c078688c9b4f77e94cf6e553388de3512c6fa 100644 --- a/re2/set.cc +++ b/re2/set.cc @@ -44,7 +44,7 @@ namespace re2 } - RE2::Set::Set(Set &&other) + RE2::Set::Set(Set && other) : options_(other.options_), anchor_(other.anchor_), compiled_(other.compiled_), diff --git a/re2/testing/re2_test.cc b/re2/testing/re2_test.cc index df4a45152feedba6f292c27a8e33b8908f5033fc..26268de767cf851d98ac641c06056368ee17f8e9 100644 --- a/re2/testing/re2_test.cc +++ b/re2/testing/re2_test.cc @@ -774,8 +774,8 @@ TEST(RE2, NULTerminated) { #ifndef MAP_ANONYMOUS #define MAP_ANONYMOUS MAP_ANON #endif - v = static_cast(mmap(NULL, 2*pagesize, PROT_READ|PROT_WRITE, - MAP_ANONYMOUS|MAP_PRIVATE, -1, 0)); + v = static_cast(mmap(NULL, 2 * pagesize, PROT_READ | PROT_WRITE, + MAP_ANONYMOUS | MAP_PRIVATE, -1, 0)); ASSERT_TRUE(v != reinterpret_cast(-1)); LOG(INFO) << "Memory at " << (void*)v; ASSERT_EQ(munmap(v + pagesize, pagesize), 0) << " error " << errno; @@ -1223,7 +1223,7 @@ TEST(RE2, Recursion) { TEST(RE2, BigCountedRepetition) { // Test that counted repetition works, given tons of memory. RE2::Options opt; - opt.set_max_mem(256<<20); + opt.set_max_mem(256 << 20); RE2 re(".{512}x", opt); ASSERT_TRUE(re.ok()); diff --git a/re2/testing/regexp_benchmark.cc b/re2/testing/regexp_benchmark.cc index e8ba4cfa305b9e987b35f6736fca98ac67c7dda7..00c2ee6563a4d212aedb0ac6fc4ffeb971683ea5 100644 --- a/re2/testing/regexp_benchmark.cc +++ b/re2/testing/regexp_benchmark.cc @@ -167,8 +167,8 @@ std::string RandomText(int64_t nbytes) { static const std::string* const text = []() { std::string* text = new std::string; srand(1); - text->resize(16<<20); - for (int64_t i = 0; i < 16<<20; i++) { + text->resize(16 << 20); + for (int64_t i = 0; i < 16 << 20; i++) { // Generate a one-byte rune that isn't a control character (e.g. '\n'). // Clipping to 0x20 introduces some bias, but we don't need uniformity. int byte = rand() & 0x7F; @@ -178,7 +178,7 @@ std::string RandomText(int64_t nbytes) { } return text; }(); - CHECK_LE(nbytes, 16<<20); + CHECK_LE(nbytes, 16 << 20); return text->substr(0, nbytes); } @@ -439,7 +439,7 @@ void EmptyPartialMatchRE2_text_re2_1KB(benchmark::State& state) { BENCHMARK(EmptyPartialMatchPCRE)->ThreadRange(1, NumCPUs()); #endif BENCHMARK(EmptyPartialMatchRE2)->ThreadRange(1, NumCPUs()); -BENCHMARK_RANGE(EmptyPartialMatchRE2_text_re2_1KB, 2<<6, 2<<9); +BENCHMARK_RANGE(EmptyPartialMatchRE2_text_re2_1KB, 2 << 6, 2 << 9); void SimplePartialMatchPCRE(benchmark::State& state) { PCRE re("abcdefg"); @@ -561,7 +561,7 @@ void ASCIIMatchRE2_text_re2_1KB(benchmark::State& state) { BENCHMARK(ASCIIMatchPCRE)->ThreadRange(1, NumCPUs()); #endif BENCHMARK(ASCIIMatchRE2)->ThreadRange(1, NumCPUs()); -BENCHMARK_RANGE(ASCIIMatchRE2_text_re2_1KB, 2<<6, 2<<9); +BENCHMARK_RANGE(ASCIIMatchRE2_text_re2_1KB, 2 << 6, 2 << 9); void FullMatchPCRE(benchmark::State& state, const char *regexp) { std::string s = RandomText(state.range(0)); @@ -633,36 +633,36 @@ void Rure_Find_RE2_DotStar_text_re2_1KB(benchmark::State& state) { Rure_Find_RE void Rure_Find_RE2_DotStarDollar_text_re2_1KB(benchmark::State& state) { Rure_Find_RE2(state, "(?s).*$"); } void Rure_Find_RE2_DotStarCapture_text_re2_1KB(benchmark::State& state) { Rure_Find_RE2(state, "(?s)((.*)()()($))"); } -// BENCHMARK_RANGE(Rure_Find_RE2_DotStar_text_re2_1KB, 2<<3, 2<<9); -// BENCHMARK_RANGE(Rure_Find_RE2_DotStarDollar_text_re2_1KB, 2<<3, 2<<9); -// BENCHMARK_RANGE(Rure_Find_RE2_DotStarCapture_text_re2_1KB, 2<<3, 2<<9); +// BENCHMARK_RANGE(Rure_Find_RE2_DotStar_text_re2_1KB, 2 << 3, 2 << 9); +// BENCHMARK_RANGE(Rure_Find_RE2_DotStarDollar_text_re2_1KB, 2 << 3, 2 << 9); +// BENCHMARK_RANGE(Rure_Find_RE2_DotStarCapture_text_re2_1KB, 2 << 3, 2 << 9); // 不加起止符 ^ 结束符 $ 的正则表达式，也就是PartialMatch，通过regex对外接口rure_is_match()函数直接测试 void Rure_is_Match_RE2_DotStar_text_re2_1KB(benchmark::State& state) { Rure_is_Match_RE2(state, "(?s).*"); } void Rure_is_Match_RE2_DotStarDollar_text_re2_1KB(benchmark::State& state) { Rure_is_Match_RE2(state, "(?s).*$"); } void Rure_is_Match_RE2_DotStarCapture_text_re2_1KB(benchmark::State& state) { Rure_is_Match_RE2(state, "(?s)((.*)()()($))"); } -BENCHMARK_RANGE(Rure_is_Match_RE2_DotStar_text_re2_1KB, 2<<6, 2<<9); -BENCHMARK_RANGE(Rure_is_Match_RE2_DotStarDollar_text_re2_1KB, 2<<6, 2<<9); -BENCHMARK_RANGE(Rure_is_Match_RE2_DotStarCapture_text_re2_1KB, 2<<6, 2<<9); +BENCHMARK_RANGE(Rure_is_Match_RE2_DotStar_text_re2_1KB, 2 << 6, 2 << 9); +BENCHMARK_RANGE(Rure_is_Match_RE2_DotStarDollar_text_re2_1KB, 2 << 6, 2 << 9); +BENCHMARK_RANGE(Rure_is_Match_RE2_DotStarCapture_text_re2_1KB, 2 << 6, 2 << 9); // 加起止符 ^ 结束符 $ 的正则表达式，也就是FullMatch，通过regex对外接口rure_is_match()函数直接测试 void Rure_is_Match_RE2_Begin_DotStar_End_text_re2_1KB(benchmark::State& state) { Rure_is_Match_RE2(state, "^(?s).*$"); } void Rure_is_Match_RE2_Begin_DotStarDollar_End_text_re2_1KB(benchmark::State& state) { Rure_is_Match_RE2(state, "^(?s).*$$"); } void Rure_is_Match_RE2_Begin_DotStarCapture_End_text_re2_1KB(benchmark::State& state) { Rure_is_Match_RE2(state, "^(?s)((.*)()()($))$"); } -BENCHMARK_RANGE(Rure_is_Match_RE2_Begin_DotStar_End_text_re2_1KB, 2<<6, 2<<9); -BENCHMARK_RANGE(Rure_is_Match_RE2_Begin_DotStarDollar_End_text_re2_1KB, 2<<6, 2<<9); -BENCHMARK_RANGE(Rure_is_Match_RE2_Begin_DotStarCapture_End_text_re2_1KB, 2<<6, 2<<9); +BENCHMARK_RANGE(Rure_is_Match_RE2_Begin_DotStar_End_text_re2_1KB, 2 << 6, 2 << 9); +BENCHMARK_RANGE(Rure_is_Match_RE2_Begin_DotStarDollar_End_text_re2_1KB, 2 << 6, 2 << 9); +BENCHMARK_RANGE(Rure_is_Match_RE2_Begin_DotStarCapture_End_text_re2_1KB, 2 << 6, 2 << 9); // 加起止符 ^ 结束符 $ 的正则表达式，也就是FullMatch，通过原本RE2项目对外接口FullMatch()函数测试 void FullMatch_RE2_DotStar_text_re2_1KB(benchmark::State& state) { FullMatchRE2_text_re2_1KB(state, "(?s).*"); } void FullMatch_RE2_DotStarDollar_text_re2_1KB(benchmark::State& state) { FullMatchRE2_text_re2_1KB(state, "(?s).*$"); } void FullMatch_RE2_DotStarCapture_text_re2_1KB(benchmark::State& state) { FullMatchRE2_text_re2_1KB(state, "(?s)((.*)()()($))"); } -BENCHMARK_RANGE(FullMatch_RE2_DotStar_text_re2_1KB, 2<<6, 2<<9); -BENCHMARK_RANGE(FullMatch_RE2_DotStarDollar_text_re2_1KB, 2<<6, 2<<9); -BENCHMARK_RANGE(FullMatch_RE2_DotStarCapture_text_re2_1KB, 2<<6, 2<<9); +BENCHMARK_RANGE(FullMatch_RE2_DotStar_text_re2_1KB, 2 << 6, 2 << 9); +BENCHMARK_RANGE(FullMatch_RE2_DotStarDollar_text_re2_1KB, 2 << 6, 2 << 9); +BENCHMARK_RANGE(FullMatch_RE2_DotStarCapture_text_re2_1KB, 2 << 6, 2 << 9); void FullMatch_DotStar_CachedPCRE(benchmark::State& state) { FullMatchPCRE(state, "(?s).*"); } void FullMatch_DotStar_CachedRE2(benchmark::State& state) { FullMatchRE2(state, "(?s).*"); } @@ -674,19 +674,19 @@ void FullMatch_DotStarCapture_CachedPCRE(benchmark::State& state) { FullMatchPCR void FullMatch_DotStarCapture_CachedRE2(benchmark::State& state) { FullMatchRE2(state, "(?s)((.*)()()($))"); } #ifdef USEPCRE -BENCHMARK_RANGE(FullMatch_DotStar_CachedPCRE, 8, 2<<20); +BENCHMARK_RANGE(FullMatch_DotStar_CachedPCRE, 8, 2 << 20); #endif -BENCHMARK_RANGE(FullMatch_DotStar_CachedRE2, 2<<6, 2<<9); +BENCHMARK_RANGE(FullMatch_DotStar_CachedRE2, 2 << 6, 2 << 9); #ifdef USEPCRE -BENCHMARK_RANGE(FullMatch_DotStarDollar_CachedPCRE, 8, 2<<20); +BENCHMARK_RANGE(FullMatch_DotStarDollar_CachedPCRE, 8, 2 << 20); #endif -BENCHMARK_RANGE(FullMatch_DotStarDollar_CachedRE2, 2<<6, 2<<9); +BENCHMARK_RANGE(FullMatch_DotStarDollar_CachedRE2, 2 << 6, 2 << 9); #ifdef USEPCRE -BENCHMARK_RANGE(FullMatch_DotStarCapture_CachedPCRE, 8, 2<<20); +BENCHMARK_RANGE(FullMatch_DotStarCapture_CachedPCRE, 8, 2 << 20); #endif -BENCHMARK_RANGE(FullMatch_DotStarCapture_CachedRE2, 2<<6, 2<<9); +BENCHMARK_RANGE(FullMatch_DotStarCapture_CachedRE2, 2 << 6, 2 << 9); } // namespace re2