| Index: test/cctest/test-api.cc
|
| diff --git a/test/cctest/test-api.cc b/test/cctest/test-api.cc
|
| index def80fd93abe5c26450d37ae0b170a679a5fc9e3..a6201b5bbc753c981bd6557446b485a302960c62 100644
|
| --- a/test/cctest/test-api.cc
|
| +++ b/test/cctest/test-api.cc
|
| @@ -14452,34 +14452,34 @@ TEST(RegExp) {
|
| v8::Handle<v8::RegExp> re = v8::RegExp::New(v8_str("foo"), v8::RegExp::kNone);
|
| CHECK(re->IsRegExp());
|
| CHECK(re->GetSource()->Equals(v8_str("foo")));
|
| - CHECK_EQ(re->GetFlags(), v8::RegExp::kNone);
|
| + CHECK_EQ(v8::RegExp::kNone, re->GetFlags());
|
|
|
| re = v8::RegExp::New(v8_str("bar"),
|
| static_cast<v8::RegExp::Flags>(v8::RegExp::kIgnoreCase |
|
| v8::RegExp::kGlobal));
|
| CHECK(re->IsRegExp());
|
| CHECK(re->GetSource()->Equals(v8_str("bar")));
|
| - CHECK_EQ(static_cast<int>(re->GetFlags()),
|
| - v8::RegExp::kIgnoreCase | v8::RegExp::kGlobal);
|
| + CHECK_EQ(v8::RegExp::kIgnoreCase | v8::RegExp::kGlobal,
|
| + static_cast<int>(re->GetFlags()));
|
|
|
| re = v8::RegExp::New(v8_str("baz"),
|
| static_cast<v8::RegExp::Flags>(v8::RegExp::kIgnoreCase |
|
| v8::RegExp::kMultiline));
|
| CHECK(re->IsRegExp());
|
| CHECK(re->GetSource()->Equals(v8_str("baz")));
|
| - CHECK_EQ(static_cast<int>(re->GetFlags()),
|
| - v8::RegExp::kIgnoreCase | v8::RegExp::kMultiline);
|
| + CHECK_EQ(v8::RegExp::kIgnoreCase | v8::RegExp::kMultiline,
|
| + static_cast<int>(re->GetFlags()));
|
|
|
| re = CompileRun("/quux/").As<v8::RegExp>();
|
| CHECK(re->IsRegExp());
|
| CHECK(re->GetSource()->Equals(v8_str("quux")));
|
| - CHECK_EQ(re->GetFlags(), v8::RegExp::kNone);
|
| + CHECK_EQ(v8::RegExp::kNone, re->GetFlags());
|
|
|
| re = CompileRun("/quux/gm").As<v8::RegExp>();
|
| CHECK(re->IsRegExp());
|
| CHECK(re->GetSource()->Equals(v8_str("quux")));
|
| - CHECK_EQ(static_cast<int>(re->GetFlags()),
|
| - v8::RegExp::kGlobal | v8::RegExp::kMultiline);
|
| + CHECK_EQ(v8::RegExp::kGlobal | v8::RegExp::kMultiline,
|
| + static_cast<int>(re->GetFlags()));
|
|
|
| // Override the RegExp constructor and check the API constructor
|
| // still works.
|
| @@ -14488,15 +14488,15 @@ TEST(RegExp) {
|
| re = v8::RegExp::New(v8_str("foobar"), v8::RegExp::kNone);
|
| CHECK(re->IsRegExp());
|
| CHECK(re->GetSource()->Equals(v8_str("foobar")));
|
| - CHECK_EQ(re->GetFlags(), v8::RegExp::kNone);
|
| + CHECK_EQ(v8::RegExp::kNone, re->GetFlags());
|
|
|
| re = v8::RegExp::New(v8_str("foobarbaz"),
|
| static_cast<v8::RegExp::Flags>(v8::RegExp::kIgnoreCase |
|
| v8::RegExp::kMultiline));
|
| CHECK(re->IsRegExp());
|
| CHECK(re->GetSource()->Equals(v8_str("foobarbaz")));
|
| - CHECK_EQ(static_cast<int>(re->GetFlags()),
|
| - v8::RegExp::kIgnoreCase | v8::RegExp::kMultiline);
|
| + CHECK_EQ(v8::RegExp::kIgnoreCase | v8::RegExp::kMultiline,
|
| + static_cast<int>(re->GetFlags()));
|
|
|
| context->Global()->Set(v8_str("re"), re);
|
| ExpectTrue("re.test('FoobarbaZ')");
|
|
|