diff options
Diffstat (limited to 'deps/v8/test/cctest/test-regexp.cc')
| -rw-r--r-- | deps/v8/test/cctest/test-regexp.cc | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/deps/v8/test/cctest/test-regexp.cc b/deps/v8/test/cctest/test-regexp.cc index 301aaf2968..950237a105 100644 --- a/deps/v8/test/cctest/test-regexp.cc +++ b/deps/v8/test/cctest/test-regexp.cc @@ -30,9 +30,8 @@ #include <sstream> #include "include/v8.h" -#include "src/v8.h" - #include "src/api-inl.h" +#include "src/assembler-arch.h" #include "src/ast/ast.h" #include "src/char-predicates-inl.h" #include "src/objects-inl.h" @@ -44,49 +43,34 @@ #include "src/splay-tree-inl.h" #include "src/string-stream.h" #include "src/unicode-inl.h" +#include "src/v8.h" #ifdef V8_INTERPRETED_REGEXP #include "src/regexp/interpreter-irregexp.h" #else // V8_INTERPRETED_REGEXP #include "src/macro-assembler.h" #if V8_TARGET_ARCH_ARM -#include "src/arm/assembler-arm.h" // NOLINT -#include "src/arm/macro-assembler-arm.h" #include "src/regexp/arm/regexp-macro-assembler-arm.h" #endif #if V8_TARGET_ARCH_ARM64 -#include "src/arm64/assembler-arm64.h" -#include "src/arm64/macro-assembler-arm64.h" #include "src/regexp/arm64/regexp-macro-assembler-arm64.h" #endif #if V8_TARGET_ARCH_S390 #include "src/regexp/s390/regexp-macro-assembler-s390.h" -#include "src/s390/assembler-s390.h" -#include "src/s390/macro-assembler-s390.h" #endif #if V8_TARGET_ARCH_PPC -#include "src/ppc/assembler-ppc.h" -#include "src/ppc/macro-assembler-ppc.h" #include "src/regexp/ppc/regexp-macro-assembler-ppc.h" #endif #if V8_TARGET_ARCH_MIPS -#include "src/mips/assembler-mips.h" -#include "src/mips/macro-assembler-mips.h" #include "src/regexp/mips/regexp-macro-assembler-mips.h" #endif #if V8_TARGET_ARCH_MIPS64 -#include "src/mips64/assembler-mips64.h" -#include "src/mips64/macro-assembler-mips64.h" #include "src/regexp/mips64/regexp-macro-assembler-mips64.h" #endif #if V8_TARGET_ARCH_X64 #include "src/regexp/x64/regexp-macro-assembler-x64.h" -#include "src/x64/assembler-x64.h" -#include "src/x64/macro-assembler-x64.h" #endif #if V8_TARGET_ARCH_IA32 -#include "src/ia32/assembler-ia32.h" -#include "src/ia32/macro-assembler-ia32.h" #include "src/regexp/ia32/regexp-macro-assembler-ia32.h" #endif #endif // V8_INTERPRETED_REGEXP @@ -531,7 +515,7 @@ static bool NotDigit(uc16 c) { static bool IsWhiteSpaceOrLineTerminator(uc16 c) { // According to ECMA 5.1, 15.10.2.12 the CharacterClassEscape \s includes // WhiteSpace (7.2) and LineTerminator (7.3) values. - return v8::internal::WhiteSpaceOrLineTerminator::Is(c); + return v8::internal::IsWhiteSpaceOrLineTerminator(c); } @@ -792,7 +776,7 @@ class ContextInitializer { v8::Local<v8::Context> env_; }; -static ArchRegExpMacroAssembler::Result Execute(Code* code, String* input, +static ArchRegExpMacroAssembler::Result Execute(Code code, String input, int start_offset, Address input_start, Address input_end, @@ -802,7 +786,6 @@ static ArchRegExpMacroAssembler::Result Execute(Code* code, String* input, reinterpret_cast<byte*>(input_end), captures, 0, CcTest::i_isolate()); } - TEST(MacroAssemblerNativeSuccess) { v8::V8::Initialize(); ContextInitializer initializer; |