Issue #1675 - Move regexp to new-regexp to make bz porting simpler.

js/src/moz.build

@@ -123,7 +123,7 @@ if CONFIG['JS_BUNDLED_EDITLINE']:
     DIRS += ['editline']
 
 if CONFIG['JS_NEW_REGEXP']:
-    DIRS += ['regexp']
+    DIRS += ['new-regexp']
 
 if not CONFIG['JS_DISABLE_SHELL']:
     DIRS += ['shell']

js/src/new-regexp/gen-regexp-special-case.cc

@@ -7,7 +7,7 @@
 #include <iostream>
 #include <sstream>
 
-#include "regexp/special-case.h"
+#include "new-regexp/special-case.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/property-sequences.cc

@@ -4,7 +4,7 @@
 
 #ifdef V8_INTL_SUPPORT
 
-#include "regexp/property-sequences.h"
+#include "new-regexp/property-sequences.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/property-sequences.h

@@ -7,7 +7,7 @@
 
 #ifdef V8_INTL_SUPPORT
 
-#include "regexp/regexp-shim.h"
+#include "new-regexp/regexp-shim.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/regexp-ast.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-ast.h"
+#include "new-regexp/regexp-ast.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/regexp-ast.h

@@ -5,7 +5,7 @@
 #ifndef V8_REGEXP_REGEXP_AST_H_
 #define V8_REGEXP_REGEXP_AST_H_
 
-#include "regexp/regexp-shim.h"
+#include "new-regexp/regexp-shim.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/regexp-bytecode-generator-inl.h

@@ -5,9 +5,9 @@
 #ifndef V8_REGEXP_REGEXP_BYTECODE_GENERATOR_INL_H_
 #define V8_REGEXP_REGEXP_BYTECODE_GENERATOR_INL_H_
 
-#include "regexp/regexp-bytecode-generator.h"
+#include "new-regexp/regexp-bytecode-generator.h"
 
-#include "regexp/regexp-bytecodes.h"
+#include "new-regexp/regexp-bytecodes.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/regexp-bytecode-generator.cc

@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-bytecode-generator.h"
+#include "new-regexp/regexp-bytecode-generator.h"
 
-#include "regexp/regexp-bytecode-generator-inl.h"
-#include "regexp/regexp-bytecode-peephole.h"
-#include "regexp/regexp-bytecodes.h"
-#include "regexp/regexp-macro-assembler.h"
+#include "new-regexp/regexp-bytecode-generator-inl.h"
+#include "new-regexp/regexp-bytecode-peephole.h"
+#include "new-regexp/regexp-bytecodes.h"
+#include "new-regexp/regexp-macro-assembler.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/regexp-bytecode-generator.h

@@ -5,7 +5,7 @@
 #ifndef V8_REGEXP_REGEXP_BYTECODE_GENERATOR_H_
 #define V8_REGEXP_REGEXP_BYTECODE_GENERATOR_H_
 
-#include "regexp/regexp-macro-assembler.h"
+#include "new-regexp/regexp-macro-assembler.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/regexp-bytecode-peephole.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-bytecode-peephole.h"
+#include "new-regexp/regexp-bytecode-peephole.h"
 
-#include "regexp/regexp-bytecodes.h"
+#include "new-regexp/regexp-bytecodes.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/regexp-bytecode-peephole.h

@@ -5,7 +5,7 @@
 #ifndef V8_REGEXP_REGEXP_BYTECODE_PEEPHOLE_H_
 #define V8_REGEXP_REGEXP_BYTECODE_PEEPHOLE_H_
 
-#include "regexp/regexp-shim.h"
+#include "new-regexp/regexp-shim.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/regexp-bytecodes.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-bytecodes.h"
+#include "new-regexp/regexp-bytecodes.h"
 
 #include <cctype>
 

js/src/new-regexp/regexp-bytecodes.h

@@ -5,7 +5,7 @@
 #ifndef V8_REGEXP_REGEXP_BYTECODES_H_
 #define V8_REGEXP_REGEXP_BYTECODES_H_
 
-#include "regexp/regexp-shim.h"
+#include "new-regexp/regexp-shim.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/regexp-compiler-tonode.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-compiler.h"
+#include "new-regexp/regexp-compiler.h"
 
-#include "regexp/regexp.h"
+#include "new-regexp/regexp.h"
 #ifdef V8_INTL_SUPPORT
-#include "regexp/special-case.h"
+#include "new-regexp/special-case.h"
 #endif  // V8_INTL_SUPPORT
 
 #ifdef V8_INTL_SUPPORT

js/src/new-regexp/regexp-compiler.cc

@@ -2,11 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-compiler.h"
+#include "new-regexp/regexp-compiler.h"
 
-#include "regexp/regexp-macro-assembler-arch.h"
+#include "new-regexp/regexp-macro-assembler-arch.h"
 #ifdef V8_INTL_SUPPORT
-#include "regexp/special-case.h"
+#include "new-regexp/special-case.h"
 #endif  // V8_INTL_SUPPORT
 
 #ifdef V8_INTL_SUPPORT

js/src/new-regexp/regexp-compiler.h

@@ -7,7 +7,7 @@
 
 #include <bitset>
 
-#include "regexp/regexp-nodes.h"
+#include "new-regexp/regexp-nodes.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/regexp-dotprinter.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-dotprinter.h"
+#include "new-regexp/regexp-dotprinter.h"
 
-#include "regexp/regexp-compiler.h"
+#include "new-regexp/regexp-compiler.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/regexp-dotprinter.h

@@ -5,7 +5,7 @@
 #ifndef V8_REGEXP_REGEXP_DOTPRINTER_H_
 #define V8_REGEXP_REGEXP_DOTPRINTER_H_
 
-#include "regexp/regexp-shim.h"
+#include "new-regexp/regexp-shim.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/regexp-error.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-error.h"
+#include "new-regexp/regexp-error.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/regexp-interpreter.cc

@@ -4,12 +4,12 @@
 
 // A simple interpreter for the Irregexp byte code.
 
-#include "regexp/regexp-interpreter.h"
+#include "new-regexp/regexp-interpreter.h"
 
-#include "regexp/regexp-bytecodes.h"
-#include "regexp/regexp-macro-assembler.h"
-#include "regexp/regexp-stack.h"  // For kMaximumStackSize.
-#include "regexp/regexp.h"
+#include "new-regexp/regexp-bytecodes.h"
+#include "new-regexp/regexp-macro-assembler.h"
+#include "new-regexp/regexp-stack.h"  // For kMaximumStackSize.
+#include "new-regexp/regexp.h"
 
 #ifdef V8_INTL_SUPPORT
 #include "unicode/uchar.h"

js/src/new-regexp/regexp-interpreter.h

@@ -7,7 +7,7 @@
 #ifndef V8_REGEXP_REGEXP_INTERPRETER_H_
 #define V8_REGEXP_REGEXP_INTERPRETER_H_
 
-#include "regexp/regexp.h"
+#include "new-regexp/regexp.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/regexp-macro-assembler-arch.h

@@ -16,7 +16,7 @@
 #define RegexpMacroAssemblerArch_h
 
 #include "jit/MacroAssembler.h"
-#include "regexp/regexp-macro-assembler.h"
+#include "new-regexp/regexp-macro-assembler.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/regexp-macro-assembler-tracer.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-macro-assembler-tracer.h"
+#include "new-regexp/regexp-macro-assembler-tracer.h"
 
 
 namespace v8 {

js/src/new-regexp/regexp-macro-assembler-tracer.h

@@ -5,7 +5,7 @@
 #ifndef V8_REGEXP_REGEXP_MACRO_ASSEMBLER_TRACER_H_
 #define V8_REGEXP_REGEXP_MACRO_ASSEMBLER_TRACER_H_
 
-#include "regexp/regexp-macro-assembler.h"
+#include "new-regexp/regexp-macro-assembler.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/regexp-macro-assembler.cc

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-macro-assembler.h"
+#include "new-regexp/regexp-macro-assembler.h"
 
-#include "regexp/regexp-stack.h"
+#include "new-regexp/regexp-stack.h"
 
 #ifdef V8_INTL_SUPPORT
 #include "unicode/uchar.h"

js/src/new-regexp/regexp-macro-assembler.h

@@ -5,9 +5,9 @@
 #ifndef V8_REGEXP_REGEXP_MACRO_ASSEMBLER_H_
 #define V8_REGEXP_REGEXP_MACRO_ASSEMBLER_H_
 
-#include "regexp/regexp-ast.h"
-#include "regexp/regexp-shim.h"
-#include "regexp/regexp.h"
+#include "new-regexp/regexp-ast.h"
+#include "new-regexp/regexp-shim.h"
+#include "new-regexp/regexp.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/regexp-native-macro-assembler.cc

@@ -10,8 +10,8 @@
 
 #include "jit/Linker.h"
 #include "gc/Zone.h"
-#include "regexp/regexp-macro-assembler-arch.h"
-#include "regexp/regexp-stack.h"
+#include "new-regexp/regexp-macro-assembler-arch.h"
+#include "new-regexp/regexp-stack.h"
 #include "vm/MatchPairs.h"
 
 #include "jit/MacroAssembler-inl.h"

js/src/new-regexp/regexp-nodes.h

@@ -5,7 +5,7 @@
 #ifndef V8_REGEXP_REGEXP_NODES_H_
 #define V8_REGEXP_REGEXP_NODES_H_
 
-#include "regexp/regexp-macro-assembler.h"
+#include "new-regexp/regexp-macro-assembler.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/regexp-parser.cc

@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-parser.h"
+#include "new-regexp/regexp-parser.h"
 
 #include <vector>
 
-#include "regexp/property-sequences.h"
-#include "regexp/regexp-macro-assembler.h"
-#include "regexp/regexp.h"
+#include "new-regexp/property-sequences.h"
+#include "new-regexp/regexp-macro-assembler.h"
+#include "new-regexp/regexp.h"
 
 #ifdef V8_INTL_SUPPORT
 #include "unicode/uniset.h"

js/src/new-regexp/regexp-parser.h

@@ -5,8 +5,8 @@
 #ifndef V8_REGEXP_REGEXP_PARSER_H_
 #define V8_REGEXP_REGEXP_PARSER_H_
 
-#include "regexp/regexp-ast.h"
-#include "regexp/regexp-error.h"
+#include "new-regexp/regexp-ast.h"
+#include "new-regexp/regexp-error.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/regexp-shim.cc

@@ -10,8 +10,8 @@
 
 #include <iostream>
 
-#include "regexp/regexp-shim.h"
-#include "regexp/regexp-stack.h"
+#include "new-regexp/regexp-shim.h"
+#include "new-regexp/regexp-stack.h"
 
 #include "mozilla/Sprintf.h" // for SprintfLiteral
 

js/src/new-regexp/regexp-shim.h

@@ -25,10 +25,10 @@
 #include "jit/Label.h"
 #include "jit/shared/Assembler-shared.h"
 #include "js/Value.h"
-#include "regexp/RegExpTypes.h"
-#include "regexp/util/flags.h"
-#include "regexp/util/vector.h"
-#include "regexp/util/zone.h"
+#include "new-regexp/RegExpTypes.h"
+#include "new-regexp/util/flags.h"
+#include "new-regexp/util/vector.h"
+#include "new-regexp/util/zone.h"
 #include "vm/NativeObject.h"
 
 // Forward declaration of classes

js/src/new-regexp/regexp-stack.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "regexp/regexp-stack.h"
+#include "new-regexp/regexp-stack.h"
 
 
 namespace v8 {

js/src/new-regexp/regexp-stack.h

@@ -5,7 +5,7 @@
 #ifndef V8_REGEXP_REGEXP_STACK_H_
 #define V8_REGEXP_REGEXP_STACK_H_
 
-#include "regexp/regexp-shim.h"
+#include "new-regexp/regexp-shim.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/regexp.h

@@ -5,8 +5,8 @@
 #ifndef V8_REGEXP_REGEXP_H_
 #define V8_REGEXP_REGEXP_H_
 
-#include "regexp/regexp-error.h"
-#include "regexp/regexp-shim.h"
+#include "new-regexp/regexp-error.h"
+#include "new-regexp/regexp-shim.h"
 
 namespace v8 {
 namespace internal {

js/src/new-regexp/special-case.cc

@@ -11,7 +11,7 @@
 // Semantics: Canonicalize) step 3.
 
 #ifdef V8_INTL_SUPPORT
-#include "regexp/special-case.h"
+#include "new-regexp/special-case.h"
 
 #include "unicode/uniset.h"
 namespace v8 {

js/src/new-regexp/special-case.h

@@ -6,7 +6,7 @@
 #define V8_REGEXP_SPECIAL_CASE_H_
 
 #ifdef V8_INTL_SUPPORT
-#include "regexp/regexp-shim.h"
+#include "new-regexp/regexp-shim.h"
 
 #include "unicode/uchar.h"
 #include "unicode/uniset.h"

js/src/new-regexp/util/unicode.cc

@@ -5,7 +5,7 @@
 // This file is a subset of:
 //  https://github.com/v8/v8/blob/master/src/strings/unicode.cc
 
-#include "regexp/regexp-shim.h"
+#include "new-regexp/regexp-shim.h"
 
 #ifdef V8_INTL_SUPPORT
 #include "unicode/uchar.h"

js/src/new-regexp/util/zone.h

@@ -13,7 +13,7 @@
 
 #include "ds/LifoAlloc.h"
 #include "ds/Sort.h"
-#include "regexp/util/vector.h"
+#include "new-regexp/util/vector.h"
 
 namespace v8 {
 namespace internal {