diff --git a/hphp/compiler/analysis/emitter.cpp b/hphp/compiler/analysis/emitter.cpp index 67cf55086..c05f4bdd9 100644 --- a/hphp/compiler/analysis/emitter.cpp +++ b/hphp/compiler/analysis/emitter.cpp @@ -88,7 +88,7 @@ #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/variable_serializer.h" #include "hphp/runtime/base/program_functions.h" -#include "hphp/runtime/eval/runtime/file_repository.h" +#include "hphp/runtime/base/file_repository.h" #include "hphp/runtime/ext_hhvm/ext_hhvm.h" #include "hphp/system/lib/systemlib.h" diff --git a/hphp/compiler/parser/parser.cpp b/hphp/compiler/parser/parser.cpp index 77cef43f8..00be9c4b9 100644 --- a/hphp/compiler/parser/parser.cpp +++ b/hphp/compiler/parser/parser.cpp @@ -89,7 +89,7 @@ #include "hphp/util/lock.h" #include "hphp/util/logger.h" -#include "hphp/runtime/eval/runtime/file_repository.h" +#include "hphp/runtime/base/file_repository.h" #ifdef FACEBOOK #include "hphp/facebook/src/compiler/fb_compiler_hooks.h" diff --git a/hphp/hhvm/process_init.cpp b/hphp/hhvm/process_init.cpp index f258990ed..285f4341c 100644 --- a/hphp/hhvm/process_init.cpp +++ b/hphp/hhvm/process_init.cpp @@ -27,7 +27,7 @@ #include "hphp/runtime/vm/jit/targetcache.h" #include "hphp/runtime/vm/jit/fixup.h" #include "hphp/runtime/vm/jit/translator-x64.h" -#include "hphp/runtime/eval/runtime/file_repository.h" +#include "hphp/runtime/base/file_repository.h" #include "hphp/system/lib/systemlib.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/base/builtin_functions.cpp b/hphp/runtime/base/builtin_functions.cpp index 8efc70ab2..be9067467 100644 --- a/hphp/runtime/base/builtin_functions.cpp +++ b/hphp/runtime/base/builtin_functions.cpp @@ -24,7 +24,7 @@ #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/strings.h" -#include "hphp/runtime/eval/runtime/file_repository.h" +#include "hphp/runtime/base/file_repository.h" #include "hphp/runtime/eval/debugger/debugger.h" #include "hphp/runtime/ext/ext_process.h" #include "hphp/runtime/ext/ext_class.h" diff --git a/hphp/runtime/base/execution_context.cpp b/hphp/runtime/base/execution_context.cpp index aaf2671af..236e75739 100644 --- a/hphp/runtime/base/execution_context.cpp +++ b/hphp/runtime/base/execution_context.cpp @@ -37,7 +37,7 @@ #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/type_conversions.h" #include "hphp/runtime/eval/debugger/debugger.h" -#include "hphp/runtime/eval/runtime/file_repository.h" +#include "hphp/runtime/base/file_repository.h" #include "hphp/runtime/ext/ext_string.h" #include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/runtime/vm/jit/translator.h" diff --git a/hphp/runtime/eval/runtime/file_repository.cpp b/hphp/runtime/base/file_repository.cpp similarity index 99% rename from hphp/runtime/eval/runtime/file_repository.cpp rename to hphp/runtime/base/file_repository.cpp index d11872040..8b30cf1b6 100644 --- a/hphp/runtime/eval/runtime/file_repository.cpp +++ b/hphp/runtime/base/file_repository.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/eval/runtime/file_repository.h" +#include "hphp/runtime/base/file_repository.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/zend/zend_string.h" #include "hphp/util/process.h" diff --git a/hphp/runtime/eval/runtime/file_repository.h b/hphp/runtime/base/file_repository.h similarity index 100% rename from hphp/runtime/eval/runtime/file_repository.h rename to hphp/runtime/base/file_repository.h diff --git a/hphp/runtime/base/intercept.cpp b/hphp/runtime/base/intercept.cpp index 6444a10c1..6c3e61fb4 100644 --- a/hphp/runtime/base/intercept.cpp +++ b/hphp/runtime/base/intercept.cpp @@ -26,7 +26,7 @@ #include "hphp/util/parser/parser.h" #include "hphp/util/lock.h" -#include "hphp/runtime/eval/runtime/file_repository.h" +#include "hphp/runtime/base/file_repository.h" #include "hphp/runtime/vm/jit/translator-x64.h" #include "hphp/util/trace.h" diff --git a/hphp/runtime/base/program_functions.cpp b/hphp/runtime/base/program_functions.cpp index e5c394bb8..9d50e5e08 100644 --- a/hphp/runtime/base/program_functions.cpp +++ b/hphp/runtime/base/program_functions.cpp @@ -60,7 +60,7 @@ #include #include "libxml/parser.h" -#include "hphp/runtime/eval/runtime/file_repository.h" +#include "hphp/runtime/base/file_repository.h" #include "hphp/runtime/vm/runtime.h" #include "hphp/runtime/vm/repo.h" diff --git a/hphp/runtime/base/server/admin_request_handler.cpp b/hphp/runtime/base/server/admin_request_handler.cpp index f769be91b..4daa21dd3 100644 --- a/hphp/runtime/base/server/admin_request_handler.cpp +++ b/hphp/runtime/base/server/admin_request_handler.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/base/server/admin_request_handler.h" -#include "hphp/runtime/eval/runtime/file_repository.h" +#include "hphp/runtime/base/file_repository.h" #include "hphp/runtime/base/server/http_server.h" #include "hphp/runtime/base/server/pagelet_server.h" #include "hphp/runtime/base/util/http_client.h" diff --git a/hphp/runtime/ext/ext_fb.cpp b/hphp/runtime/ext/ext_fb.cpp index 2004c479d..d32a01b0c 100644 --- a/hphp/runtime/ext/ext_fb.cpp +++ b/hphp/runtime/ext/ext_fb.cpp @@ -31,7 +31,7 @@ #include "hphp/runtime/vm/backup_gc.h" #include "unicode/uchar.h" #include "unicode/utf8.h" -#include "hphp/runtime/eval/runtime/file_repository.h" +#include "hphp/runtime/base/file_repository.h" #include "hphp/util/parser/parser.h" diff --git a/hphp/runtime/ext/ext_stream.h b/hphp/runtime/ext/ext_stream.h index 11aef120f..cbe9c01a4 100644 --- a/hphp/runtime/ext/ext_stream.h +++ b/hphp/runtime/ext/ext_stream.h @@ -19,7 +19,7 @@ #define incl_HPHP_EXT_STREAM_H_ #include "hphp/runtime/base/base_includes.h" -#include "hphp/runtime/eval/runtime/file_repository.h" +#include "hphp/runtime/base/file_repository.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/vm/bytecode.cpp b/hphp/runtime/vm/bytecode.cpp index da1de2ce5..bd8433b31 100644 --- a/hphp/runtime/vm/bytecode.cpp +++ b/hphp/runtime/vm/bytecode.cpp @@ -21,7 +21,7 @@ #include "hphp/runtime/vm/srckey.h" #include "hphp/runtime/vm/member_operations.h" #include "hphp/runtime/base/code_coverage.h" -#include "hphp/runtime/eval/runtime/file_repository.h" +#include "hphp/runtime/base/file_repository.h" #include "hphp/runtime/base/base_includes.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/runtime_option.h" diff --git a/hphp/runtime/vm/debugger_hook.cpp b/hphp/runtime/vm/debugger_hook.cpp index 2850f5e09..45edabb67 100644 --- a/hphp/runtime/vm/debugger_hook.cpp +++ b/hphp/runtime/vm/debugger_hook.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/eval/debugger/break_point.h" #include "hphp/runtime/eval/debugger/debugger.h" #include "hphp/runtime/eval/debugger/debugger_proxy.h" -#include "hphp/runtime/eval/runtime/file_repository.h" +#include "hphp/runtime/base/file_repository.h" #include "hphp/util/logger.h" #include "hphp/util/util.h" diff --git a/hphp/runtime/vm/func.cpp b/hphp/runtime/vm/func.cpp index d7ef0529d..a347f3348 100644 --- a/hphp/runtime/vm/func.cpp +++ b/hphp/runtime/vm/func.cpp @@ -27,7 +27,7 @@ #include "hphp/runtime/vm/runtime.h" #include "hphp/runtime/vm/repo.h" #include "hphp/runtime/vm/jit/targetcache.h" -#include "hphp/runtime/eval/runtime/file_repository.h" +#include "hphp/runtime/base/file_repository.h" #include "hphp/runtime/vm/jit/translator-x64.h" #include "hphp/runtime/vm/blob_helper.h" #include "hphp/runtime/vm/func_inline.h" diff --git a/hphp/runtime/vm/jit/collector.cpp b/hphp/runtime/vm/jit/collector.cpp index c6c819ac2..25bda186f 100644 --- a/hphp/runtime/vm/jit/collector.cpp +++ b/hphp/runtime/vm/jit/collector.cpp @@ -26,7 +26,7 @@ #include "hphp/util/trace.h" #include "hphp/util/debug.h" -#include "hphp/runtime/eval/runtime/file_repository.h" +#include "hphp/runtime/base/file_repository.h" #include "hphp/system/lib/systemlib.h" #include "hphp/runtime/vm/treadmill.h" #include "hphp/runtime/vm/jit/translator-inline.h" diff --git a/hphp/runtime/vm/jit/translator-x64-helpers.cpp b/hphp/runtime/vm/jit/translator-x64-helpers.cpp index 1b8a1334c..de30bbb3b 100644 --- a/hphp/runtime/vm/jit/translator-x64-helpers.cpp +++ b/hphp/runtime/vm/jit/translator-x64-helpers.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/runtime/vm/jit/translator-x64.h" #include "hphp/runtime/vm/jit/targetcache.h" -#include "hphp/runtime/eval/runtime/file_repository.h" +#include "hphp/runtime/base/file_repository.h" #include "hphp/runtime/vm/event_hook.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/stats.h" diff --git a/hphp/runtime/vm/jit/translator-x64.cpp b/hphp/runtime/vm/jit/translator-x64.cpp index e32bff109..28595f276 100644 --- a/hphp/runtime/vm/jit/translator-x64.cpp +++ b/hphp/runtime/vm/jit/translator-x64.cpp @@ -86,7 +86,7 @@ typedef __sighandler_t *sighandler_t; #include "hphp/runtime/vm/type_profile.h" #include "hphp/runtime/vm/member_operations.h" #include "hphp/runtime/vm/jit/abi-x64.h" -#include "hphp/runtime/eval/runtime/file_repository.h" +#include "hphp/runtime/base/file_repository.h" #include "hphp/runtime/vm/jit/hhbctranslator.h" #include "hphp/runtime/vm/jit/translator-x64-internal.h" diff --git a/hphp/runtime/vm/unit.cpp b/hphp/runtime/vm/unit.cpp index a2b3e3372..bc2d8d411 100644 --- a/hphp/runtime/vm/unit.cpp +++ b/hphp/runtime/vm/unit.cpp @@ -38,7 +38,7 @@ #include "hphp/runtime/vm/verifier/check.h" #include "hphp/runtime/base/strings.h" #include "hphp/runtime/vm/func_inline.h" -#include "hphp/runtime/eval/runtime/file_repository.h" +#include "hphp/runtime/base/file_repository.h" #include "hphp/runtime/base/stats.h" #include "hphp/runtime/vm/treadmill.h"