diff --git a/hphp/compiler/analysis/emitter.cpp b/hphp/compiler/analysis/emitter.cpp index 931cfa59c..901b9b7db 100644 --- a/hphp/compiler/analysis/emitter.cpp +++ b/hphp/compiler/analysis/emitter.cpp @@ -91,7 +91,7 @@ #include "hphp/runtime/base/file_repository.h" #include "hphp/runtime/ext_hhvm/ext_hhvm.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" #include "folly/ScopeGuard.h" diff --git a/hphp/compiler/builtin_symbols.cpp b/hphp/compiler/builtin_symbols.cpp index e9ca5905d..5908e706a 100644 --- a/hphp/compiler/builtin_symbols.cpp +++ b/hphp/compiler/builtin_symbols.cpp @@ -321,7 +321,7 @@ bool BuiltinSymbols::Load(AnalysisResultPtr ar) { if (g_context.isNull()) init_thread_locals(); ClassInfo::Load(); - // load extension functions first, so system/classes may call them + // load extension functions first, so system/php may call them ImportExtFunctions(ar, s_functions, ClassInfo::GetSystem()); AnalysisResultPtr ar2 = AnalysisResultPtr(new AnalysisResult()); s_variables = VariableTablePtr(new VariableTable(*ar2.get())); @@ -360,7 +360,7 @@ bool BuiltinSymbols::Load(AnalysisResultPtr ar) { s_constants->setDynamic(ar, "SID", true); s_constants->setDynamic(ar, "PHP_SAPI", true); - // parse all PHP files under system/classes + // parse all PHP files under system/php s_systemAr = ar = AnalysisResultPtr(new AnalysisResult()); ar->loadBuiltins(); string slib = get_systemlib(); diff --git a/hphp/compiler/compiler.cpp b/hphp/compiler/compiler.cpp index 4e3a8b15f..936c7d9bb 100644 --- a/hphp/compiler/compiler.cpp +++ b/hphp/compiler/compiler.cpp @@ -39,7 +39,7 @@ #include "hphp/runtime/base/externals.h" #include "hphp/runtime/base/thread_init_fini.h" #include "hphp/runtime/vm/repo.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" #include "hphp/util/repo_schema.h" #include "hphp/hhvm/process_init.h" diff --git a/hphp/hhvm/process_init.cpp b/hphp/hhvm/process_init.cpp index d3d2948e7..0311e78a1 100644 --- a/hphp/hhvm/process_init.cpp +++ b/hphp/hhvm/process_init.cpp @@ -28,7 +28,7 @@ #include "hphp/runtime/vm/jit/fixup.h" #include "hphp/runtime/vm/jit/translator-x64.h" #include "hphp/runtime/base/file_repository.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" #include "hphp/util/logger.h" #include // For dirname(3). diff --git a/hphp/runtime/base/builtin_functions.cpp b/hphp/runtime/base/builtin_functions.cpp index 5bcbcc921..a17f3c4ce 100644 --- a/hphp/runtime/base/builtin_functions.cpp +++ b/hphp/runtime/base/builtin_functions.cpp @@ -39,7 +39,7 @@ #include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/runtime/vm/unit.h" #include "hphp/runtime/vm/event_hook.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" #include diff --git a/hphp/runtime/base/object_data.h b/hphp/runtime/base/object_data.h index abc7b58fc..406ddd678 100644 --- a/hphp/runtime/base/object_data.h +++ b/hphp/runtime/base/object_data.h @@ -22,7 +22,7 @@ #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/macros.h" #include "hphp/runtime/base/runtime_error.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" #include #include diff --git a/hphp/runtime/base/resource_data.cpp b/hphp/runtime/base/resource_data.cpp index f16a41b7c..0466a830b 100644 --- a/hphp/runtime/base/resource_data.cpp +++ b/hphp/runtime/base/resource_data.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/variable_serializer.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/server/xbox_server.cpp b/hphp/runtime/base/server/xbox_server.cpp index 4ac632166..49751e104 100644 --- a/hphp/runtime/base/server/xbox_server.cpp +++ b/hphp/runtime/base/server/xbox_server.cpp @@ -24,7 +24,7 @@ #include "hphp/util/job_queue.h" #include "hphp/util/lock.h" #include "hphp/util/logger.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/tv_helpers.cpp b/hphp/runtime/base/tv_helpers.cpp index 736082ef9..2b7c66ac1 100644 --- a/hphp/runtime/base/tv_helpers.cpp +++ b/hphp/runtime/base/tv_helpers.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/type_conversions.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/type_object.cpp b/hphp/runtime/base/type_object.cpp index 16a26111a..5e05541c8 100644 --- a/hphp/runtime/base/type_object.cpp +++ b/hphp/runtime/base/type_object.cpp @@ -22,7 +22,7 @@ #include "hphp/runtime/base/strings.h" #include "hphp/runtime/ext/ext_collections.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { diff --git a/hphp/runtime/base/type_variant.cpp b/hphp/runtime/base/type_variant.cpp index 008774baf..d5853de84 100644 --- a/hphp/runtime/base/type_variant.cpp +++ b/hphp/runtime/base/type_variant.cpp @@ -28,7 +28,7 @@ #include "hphp/runtime/vm/jit/translator-x64.h" #include "hphp/runtime/vm/runtime.h" #include "hphp/runtime/vm/instance.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" #include "hphp/runtime/ext/ext_collections.h" #include "hphp/util/util.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/ext/JSON_parser.cpp b/hphp/runtime/ext/JSON_parser.cpp index 18a18cbcb..f793c0f3c 100644 --- a/hphp/runtime/ext/JSON_parser.cpp +++ b/hphp/runtime/ext/JSON_parser.cpp @@ -34,7 +34,7 @@ SOFTWARE. #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/zend/utf8_decode.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" #define MAX_LENGTH_OF_LONG 20 static const char long_min_digits[] = "9223372036854775808"; diff --git a/hphp/runtime/ext/asio/asio_context.cpp b/hphp/runtime/ext/asio/asio_context.cpp index 8e93bb50e..0fc47a08e 100644 --- a/hphp/runtime/ext/asio/asio_context.cpp +++ b/hphp/runtime/ext/asio/asio_context.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/ext/ext_asio.h" #include "hphp/runtime/ext/asio/asio_session.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/asio/asio_session.cpp b/hphp/runtime/ext/asio/asio_session.cpp index 7441d0871..5ea6267cd 100644 --- a/hphp/runtime/ext/asio/asio_session.cpp +++ b/hphp/runtime/ext/asio/asio_session.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/ext/asio/asio_session.h" #include "hphp/runtime/ext/ext_asio.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/asio/blockable_wait_handle.cpp b/hphp/runtime/ext/asio/blockable_wait_handle.cpp index d0b67b973..19ba0d751 100644 --- a/hphp/runtime/ext/asio/blockable_wait_handle.cpp +++ b/hphp/runtime/ext/asio/blockable_wait_handle.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/base/memory/smart_containers.h" #include "hphp/runtime/ext/ext_asio.h" #include "hphp/runtime/ext/asio/asio_context.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/asio/continuation_wait_handle.cpp b/hphp/runtime/ext/asio/continuation_wait_handle.cpp index 3e8de6d51..c09f8ebd6 100644 --- a/hphp/runtime/ext/asio/continuation_wait_handle.cpp +++ b/hphp/runtime/ext/asio/continuation_wait_handle.cpp @@ -20,7 +20,7 @@ #include "hphp/runtime/ext/ext_continuation.h" #include "hphp/runtime/ext/asio/asio_context.h" #include "hphp/runtime/ext/asio/asio_session.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/asio/external_thread_event_wait_handle.cpp b/hphp/runtime/ext/asio/external_thread_event_wait_handle.cpp index 97425f303..d476a4373 100644 --- a/hphp/runtime/ext/asio/external_thread_event_wait_handle.cpp +++ b/hphp/runtime/ext/asio/external_thread_event_wait_handle.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/ext/ext_asio.h" #include "hphp/runtime/ext/asio/asio_external_thread_event.h" #include "hphp/runtime/ext/asio/asio_session.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/asio/gen_array_wait_handle.cpp b/hphp/runtime/ext/asio/gen_array_wait_handle.cpp index d34851919..747203ab4 100644 --- a/hphp/runtime/ext/asio/gen_array_wait_handle.cpp +++ b/hphp/runtime/ext/asio/gen_array_wait_handle.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/ext/ext_closure.h" #include "hphp/runtime/ext/asio/asio_context.h" #include "hphp/runtime/ext/asio/asio_session.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/asio/gen_vector_wait_handle.cpp b/hphp/runtime/ext/asio/gen_vector_wait_handle.cpp index d41708b79..7ddaf0421 100644 --- a/hphp/runtime/ext/asio/gen_vector_wait_handle.cpp +++ b/hphp/runtime/ext/asio/gen_vector_wait_handle.cpp @@ -20,7 +20,7 @@ #include "hphp/runtime/ext/ext_closure.h" #include "hphp/runtime/ext/asio/asio_context.h" #include "hphp/runtime/ext/asio/asio_session.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/asio/reschedule_wait_handle.cpp b/hphp/runtime/ext/asio/reschedule_wait_handle.cpp index 364cd6840..7a2e7ece1 100644 --- a/hphp/runtime/ext/asio/reschedule_wait_handle.cpp +++ b/hphp/runtime/ext/asio/reschedule_wait_handle.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/ext/ext_asio.h" #include "hphp/runtime/ext/asio/asio_context.h" #include "hphp/runtime/ext/asio/asio_session.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/asio/set_result_to_ref_wait_handle.cpp b/hphp/runtime/ext/asio/set_result_to_ref_wait_handle.cpp index f9a35f0bc..e0714c587 100644 --- a/hphp/runtime/ext/asio/set_result_to_ref_wait_handle.cpp +++ b/hphp/runtime/ext/asio/set_result_to_ref_wait_handle.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/ext/ext_closure.h" #include "hphp/runtime/ext/asio/asio_context.h" #include "hphp/runtime/ext/asio/asio_session.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/asio/static_exception_wait_handle.cpp b/hphp/runtime/ext/asio/static_exception_wait_handle.cpp index d2acd382e..050ea582e 100644 --- a/hphp/runtime/ext/asio/static_exception_wait_handle.cpp +++ b/hphp/runtime/ext/asio/static_exception_wait_handle.cpp @@ -16,7 +16,7 @@ */ #include "hphp/runtime/ext/ext_asio.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/asio/static_result_wait_handle.cpp b/hphp/runtime/ext/asio/static_result_wait_handle.cpp index 2ff77a284..92d1e4747 100644 --- a/hphp/runtime/ext/asio/static_result_wait_handle.cpp +++ b/hphp/runtime/ext/asio/static_result_wait_handle.cpp @@ -16,7 +16,7 @@ */ #include "hphp/runtime/ext/ext_asio.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/asio/waitable_wait_handle.cpp b/hphp/runtime/ext/asio/waitable_wait_handle.cpp index 6e7b2f309..e3845ab4d 100644 --- a/hphp/runtime/ext/asio/waitable_wait_handle.cpp +++ b/hphp/runtime/ext/asio/waitable_wait_handle.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/ext/ext_asio.h" #include "hphp/runtime/ext/asio/asio_context.h" #include "hphp/runtime/ext/asio/asio_session.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/ext_asio.cpp b/hphp/runtime/ext/ext_asio.cpp index 17020a236..95ea2baf4 100644 --- a/hphp/runtime/ext/ext_asio.cpp +++ b/hphp/runtime/ext/ext_asio.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/ext/ext_closure.h" #include "hphp/runtime/ext/asio/asio_context.h" #include "hphp/runtime/ext/asio/asio_session.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/ext_collections.cpp b/hphp/runtime/ext/ext_collections.cpp index 417bf7fdf..7e25d4427 100644 --- a/hphp/runtime/ext/ext_collections.cpp +++ b/hphp/runtime/ext/ext_collections.cpp @@ -22,7 +22,7 @@ #include "hphp/runtime/ext/ext_math.h" #include "hphp/runtime/ext/ext_intl.h" #include "hphp/runtime/vm/jit/translator-inline.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/ext_collections.h b/hphp/runtime/ext/ext_collections.h index b2732fd5f..2cd693855 100644 --- a/hphp/runtime/ext/ext_collections.h +++ b/hphp/runtime/ext/ext_collections.h @@ -19,7 +19,7 @@ #define incl_HPHP_EXT_COLLECTION_H_ #include "hphp/runtime/base/base_includes.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/ext_continuation.h b/hphp/runtime/ext/ext_continuation.h index bdc1e5c49..c3dedcd2d 100644 --- a/hphp/runtime/ext/ext_continuation.h +++ b/hphp/runtime/ext/ext_continuation.h @@ -20,7 +20,7 @@ #include "hphp/runtime/base/base_includes.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/ext_datetime.cpp b/hphp/runtime/ext/ext_datetime.cpp index b8e324b27..8360204e7 100644 --- a/hphp/runtime/ext/ext_datetime.cpp +++ b/hphp/runtime/ext/ext_datetime.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/ext/ext_datetime.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { IMPLEMENT_DEFAULT_EXTENSION(date); diff --git a/hphp/runtime/ext/ext_debugger.cpp b/hphp/runtime/ext/ext_debugger.cpp index 1bfc6bfe2..54ceff458 100644 --- a/hphp/runtime/ext/ext_debugger.cpp +++ b/hphp/runtime/ext/ext_debugger.cpp @@ -24,7 +24,7 @@ #include "hphp/runtime/vm/unwind.h" #include "tbb/concurrent_hash_map.h" #include "hphp/util/logger.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/ext_domdocument.cpp b/hphp/runtime/ext/ext_domdocument.cpp index d2fee038f..abe43697e 100644 --- a/hphp/runtime/ext/ext_domdocument.cpp +++ b/hphp/runtime/ext/ext_domdocument.cpp @@ -23,7 +23,7 @@ #include "hphp/runtime/ext/ext_simplexml.h" #include "hphp/runtime/vm/jit/translator-inline.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" #define DOM_XMLNS_NAMESPACE \ (const xmlChar *) "http://www.w3.org/2000/xmlns/" diff --git a/hphp/runtime/ext/ext_file.cpp b/hphp/runtime/ext/ext_file.cpp index a49950da5..6c533b1ee 100644 --- a/hphp/runtime/ext/ext_file.cpp +++ b/hphp/runtime/ext/ext_file.cpp @@ -29,7 +29,7 @@ #include "hphp/runtime/base/server/static_content_cache.h" #include "hphp/runtime/base/zend/zend_scanf.h" #include "hphp/runtime/base/file/pipe.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" #include "hphp/util/logger.h" #include "hphp/util/util.h" #include "hphp/util/process.h" diff --git a/hphp/runtime/ext/ext_icu_ucsdet.cpp b/hphp/runtime/ext/ext_icu_ucsdet.cpp index a60eb708b..a0a3b70f8 100644 --- a/hphp/runtime/ext/ext_icu_ucsdet.cpp +++ b/hphp/runtime/ext/ext_icu_ucsdet.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/ext/ext_icu_ucsdet.h" #include "unicode/unistr.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/ext_icu_uspoof.cpp b/hphp/runtime/ext/ext_icu_uspoof.cpp index 57eb8f44d..30594ca89 100644 --- a/hphp/runtime/ext/ext_icu_uspoof.cpp +++ b/hphp/runtime/ext/ext_icu_uspoof.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/ext/ext_icu_uspoof.h" #include "hphp/runtime/base/util/exceptions.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { IMPLEMENT_DEFAULT_EXTENSION(icu_uspoof); diff --git a/hphp/runtime/ext/ext_imagesprite.cpp b/hphp/runtime/ext/ext_imagesprite.cpp index 46b825a0d..244730c30 100644 --- a/hphp/runtime/ext/ext_imagesprite.cpp +++ b/hphp/runtime/ext/ext_imagesprite.cpp @@ -25,7 +25,7 @@ #include #include -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/ext_imap.cpp b/hphp/runtime/ext/ext_imap.cpp index 83712e9a8..37e5ea355 100644 --- a/hphp/runtime/ext/ext_imap.cpp +++ b/hphp/runtime/ext/ext_imap.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/base/zend/zend_string.h" #include "hphp/util/logger.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" #include /* includes mail.h and rfc822.h */ #define namespace namespace_ diff --git a/hphp/runtime/ext/ext_intl.cpp b/hphp/runtime/ext/ext_intl.cpp index ecbf25529..05334c2a1 100644 --- a/hphp/runtime/ext/ext_intl.cpp +++ b/hphp/runtime/ext/ext_intl.cpp @@ -29,7 +29,7 @@ #include "unicode/utypes.h" #include "unicode/unorm.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" #ifdef UIDNA_INFO_INITIALIZER #define HAVE_46_API 1 /* has UTS#46 API (introduced in ICU 4.6) */ diff --git a/hphp/runtime/ext/ext_memcache.cpp b/hphp/runtime/ext/ext_memcache.cpp index ecde66086..db7ebb964 100644 --- a/hphp/runtime/ext/ext_memcache.cpp +++ b/hphp/runtime/ext/ext_memcache.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/base/util/request_local.h" #include "hphp/runtime/base/ini_setting.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" #define MMC_SERIALIZED 1 #define MMC_COMPRESSED 2 diff --git a/hphp/runtime/ext/ext_memcached.cpp b/hphp/runtime/ext/ext_memcached.cpp index 761b6d18a..3a960af66 100644 --- a/hphp/runtime/ext/ext_memcached.cpp +++ b/hphp/runtime/ext/ext_memcached.cpp @@ -21,7 +21,7 @@ #include "hphp/runtime/ext/ext_json.h" #include -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/ext_mysql.cpp b/hphp/runtime/ext/ext_mysql.cpp index 2cd782597..6ad5bdda4 100644 --- a/hphp/runtime/ext/ext_mysql.cpp +++ b/hphp/runtime/ext/ext_mysql.cpp @@ -31,7 +31,7 @@ #include "netinet/in.h" #include -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/ext_pdo.cpp b/hphp/runtime/ext/ext_pdo.cpp index e5f4fc91f..6209a11f5 100644 --- a/hphp/runtime/ext/ext_pdo.cpp +++ b/hphp/runtime/ext/ext_pdo.cpp @@ -27,7 +27,7 @@ #include "hphp/runtime/base/util/request_local.h" #include "hphp/runtime/base/macros.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" #define PDO_HANDLE_DBH_ERR(dbh) \ if (strcmp(dbh->error_code, PDO_ERR_NONE)) { \ diff --git a/hphp/runtime/ext/ext_reflection.cpp b/hphp/runtime/ext/ext_reflection.cpp index 3f8e076cc..7a24a7fad 100644 --- a/hphp/runtime/ext/ext_reflection.cpp +++ b/hphp/runtime/ext/ext_reflection.cpp @@ -25,7 +25,7 @@ #include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/util/parser/parser.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { diff --git a/hphp/runtime/ext/ext_simplexml.cpp b/hphp/runtime/ext/ext_simplexml.cpp index 2cd90bb08..4f047c387 100644 --- a/hphp/runtime/ext/ext_simplexml.cpp +++ b/hphp/runtime/ext/ext_simplexml.cpp @@ -21,7 +21,7 @@ #include "hphp/runtime/ext/ext_domdocument.h" #include "hphp/runtime/base/class_info.h" #include "hphp/runtime/base/util/request_local.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" #ifndef LIBXML2_NEW_BUFFER # define xmlOutputBufferGetSize(buf) ((buf)->buffer->use) diff --git a/hphp/runtime/ext/ext_soap.cpp b/hphp/runtime/ext/ext_soap.cpp index cab532992..68d8d7931 100644 --- a/hphp/runtime/ext/ext_soap.cpp +++ b/hphp/runtime/ext/ext_soap.cpp @@ -30,7 +30,7 @@ #include "hphp/runtime/ext/ext_output.h" #include "hphp/runtime/ext/ext_stream.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { diff --git a/hphp/runtime/ext/ext_spl.cpp b/hphp/runtime/ext/ext_spl.cpp index 4e8fd9724..124b2ade0 100644 --- a/hphp/runtime/ext/ext_spl.cpp +++ b/hphp/runtime/ext/ext_spl.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/ext/ext_math.h" #include "hphp/runtime/ext/ext_class.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/ext_sqlite3.cpp b/hphp/runtime/ext/ext_sqlite3.cpp index a22d28520..47f60472c 100644 --- a/hphp/runtime/ext/ext_sqlite3.cpp +++ b/hphp/runtime/ext/ext_sqlite3.cpp @@ -20,7 +20,7 @@ #include "hphp/runtime/ext/ext_function.h" #include "hphp/runtime/base/util/exceptions.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { IMPLEMENT_DEFAULT_EXTENSION(sqlite3); diff --git a/hphp/runtime/ext/ext_xmlreader.cpp b/hphp/runtime/ext/ext_xmlreader.cpp index 4eb92ebdb..ec2c3f25d 100644 --- a/hphp/runtime/ext/ext_xmlreader.cpp +++ b/hphp/runtime/ext/ext_xmlreader.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/ext/ext_xmlreader.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { IMPLEMENT_DEFAULT_EXTENSION(xmlreader); diff --git a/hphp/runtime/ext/ext_xmlwriter.cpp b/hphp/runtime/ext/ext_xmlwriter.cpp index f88c290bd..a916eb628 100644 --- a/hphp/runtime/ext/ext_xmlwriter.cpp +++ b/hphp/runtime/ext/ext_xmlwriter.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/ext/ext_xmlwriter.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { IMPLEMENT_DEFAULT_EXTENSION(xmlwriter); diff --git a/hphp/runtime/ext/soap/packet.cpp b/hphp/runtime/ext/soap/packet.cpp index c723e15ca..77a99a10a 100644 --- a/hphp/runtime/ext/soap/packet.cpp +++ b/hphp/runtime/ext/soap/packet.cpp @@ -18,7 +18,7 @@ #include "hphp/runtime/ext/ext_soap.h" #include "hphp/runtime/ext/soap/packet.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext_hhvm/CMakeLists.txt b/hphp/runtime/ext_hhvm/CMakeLists.txt index ebc1f3eda..6daa6ffa9 100644 --- a/hphp/runtime/ext_hhvm/CMakeLists.txt +++ b/hphp/runtime/ext_hhvm/CMakeLists.txt @@ -47,7 +47,7 @@ foreach (header ${CXX_HEADERS}) file(APPEND ${INFOTABS_HEADER} "#include \"${header}\"\n") endforeach() -auto_sources(HPHP_IDLS "*.idl.json" "RECURSE" "${HPHP_HOME}/hphp/idl") +auto_sources(HPHP_IDLS "*.idl.json" "RECURSE" "${HPHP_HOME}/hphp/system/idl") add_custom_command(OUTPUT ${INFOTABS_SOURCE} DEPENDS ${CXX_HEADERS} gen-infotabs COMMAND "${HPHP_HOME}/hphp/tools/gen-ext-hhvm/gen-infotabs" diff --git a/hphp/runtime/vm/as.cpp b/hphp/runtime/vm/as.cpp index a05a37708..c32f03825 100644 --- a/hphp/runtime/vm/as.cpp +++ b/hphp/runtime/vm/as.cpp @@ -92,7 +92,7 @@ #include "hphp/runtime/vm/unit.h" #include "hphp/runtime/vm/hhbc.h" #include "hphp/runtime/base/builtin_functions.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" TRACE_SET_MOD(hhas); diff --git a/hphp/runtime/vm/bytecode.cpp b/hphp/runtime/vm/bytecode.cpp index 96fe030dc..8e4156432 100644 --- a/hphp/runtime/vm/bytecode.cpp +++ b/hphp/runtime/vm/bytecode.cpp @@ -60,7 +60,7 @@ #include "hphp/runtime/base/server/source_root_info.h" #include "hphp/runtime/base/util/extended_logger.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" #include "hphp/runtime/ext/ext_collections.h" #include "hphp/runtime/vm/name_value_table_wrapper.h" diff --git a/hphp/runtime/vm/class.cpp b/hphp/runtime/vm/class.cpp index 96547edf8..9dc4d6d9d 100644 --- a/hphp/runtime/vm/class.cpp +++ b/hphp/runtime/vm/class.cpp @@ -30,7 +30,7 @@ #include "hphp/runtime/vm/name_value_table.h" #include "hphp/runtime/vm/name_value_table_wrapper.h" #include "hphp/runtime/vm/request_arena.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" #include "hphp/util/logger.h" #include "hphp/util/parser/parser.h" diff --git a/hphp/runtime/vm/func.cpp b/hphp/runtime/vm/func.cpp index b90bd297f..8ee3fd264 100644 --- a/hphp/runtime/vm/func.cpp +++ b/hphp/runtime/vm/func.cpp @@ -31,7 +31,7 @@ #include "hphp/runtime/vm/jit/translator-x64.h" #include "hphp/runtime/vm/blob_helper.h" #include "hphp/runtime/vm/func_inline.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" #include "hphp/runtime/vm/bytecode.h" namespace HPHP { diff --git a/hphp/runtime/vm/funcdict.cpp b/hphp/runtime/vm/funcdict.cpp index 58a7f3b0d..3c3d4ec11 100644 --- a/hphp/runtime/vm/funcdict.cpp +++ b/hphp/runtime/vm/funcdict.cpp @@ -25,7 +25,7 @@ #include "hphp/runtime/vm/jit/targetcache.h" #include "hphp/runtime/vm/unit.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { diff --git a/hphp/runtime/vm/instance.cpp b/hphp/runtime/vm/instance.cpp index 6cc97fc1a..779f804c9 100644 --- a/hphp/runtime/vm/instance.cpp +++ b/hphp/runtime/vm/instance.cpp @@ -24,7 +24,7 @@ #include "hphp/runtime/vm/object_allocator_sizes.h" #include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/runtime/ext/ext_collections.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace HPHP { diff --git a/hphp/runtime/vm/jit/collector.cpp b/hphp/runtime/vm/jit/collector.cpp index 4990b2019..9ff58957d 100644 --- a/hphp/runtime/vm/jit/collector.cpp +++ b/hphp/runtime/vm/jit/collector.cpp @@ -27,7 +27,7 @@ #include "hphp/util/trace.h" #include "hphp/util/debug.h" #include "hphp/runtime/base/file_repository.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" #include "hphp/runtime/vm/treadmill.h" #include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/runtime/vm/jit/translator-x64.h" diff --git a/hphp/runtime/vm/jit/test/type.cpp b/hphp/runtime/vm/jit/test/type.cpp index a8e8dd0e6..85c0e16c9 100644 --- a/hphp/runtime/vm/jit/test/type.cpp +++ b/hphp/runtime/vm/jit/test/type.cpp @@ -19,7 +19,7 @@ #include "hphp/util/base.h" #include "hphp/runtime/vm/jit/ir.h" // for specialized object tests to get some real VM::Class -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" namespace std { namespace tr1 { template<> struct hash { diff --git a/hphp/runtime/vm/member_operations.h b/hphp/runtime/vm/member_operations.h index e5e6b09ac..23c41310c 100644 --- a/hphp/runtime/vm/member_operations.h +++ b/hphp/runtime/vm/member_operations.h @@ -19,7 +19,7 @@ #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/strings.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/vm/core_types.h" #include "hphp/runtime/vm/runtime.h" diff --git a/hphp/system/CMakeLists.txt b/hphp/system/CMakeLists.txt index 03626cfef..55958e44d 100644 --- a/hphp/system/CMakeLists.txt +++ b/hphp/system/CMakeLists.txt @@ -1,17 +1,15 @@ -auto_sources(IDL_SRCS "*.idl.json" "RECURSE" "${HPHP_HOME}/hphp/idl") -string(REPLACE ";" " " IDL_SRCS_STR "${IDL_SRCS}") - -set(CONSTDEF "${CMAKE_CURRENT_SOURCE_DIR}/globals/constdef.json") +auto_sources(IDL_SRCS "*.idl.json" "RECURSE" "${HPHP_HOME}/hphp/system/idl") add_custom_command(OUTPUT "class_map.cpp" "constants.h" - DEPENDS ${CONSTDEF} ${IDL_SRCS} gen-class-map - COMMAND "${HPHP_HOME}/hphp/tools/gen-ext-hhvm/gen-class-map.sh" - ARGS "${CMAKE_CURRENT_SOURCE_DIR}/class_map.cpp" + DEPENDS ${IDL_SRCS} gen-class-map + COMMAND "${HPHP_HOME}/hphp/tools/gen-ext-hhvm/gen-class-map" + ARGS "--system" + "${CMAKE_CURRENT_SOURCE_DIR}/class_map.cpp" "${CMAKE_CURRENT_SOURCE_DIR}/constants.h" - ${CONSTDEF} ${IDL_SRCS_STR} + ${IDL_SRCS} COMMENT "Generating class_map.cpp and constants.h") -set(CXX_SOURCES "class_map.cpp" "lib/systemlib.cpp") +set(CXX_SOURCES "class_map.cpp" "systemlib.cpp") add_library(hphp_system STATIC ${CXX_SOURCES}) @@ -19,7 +17,7 @@ add_library(hphp_system STATIC ${CXX_SOURCES}) add_dependencies(hphp_runtime_static hphp_system) add_dependencies(hphp_analysis hphp_system) -FILE(STRINGS "classes.txt" SYSTEMLIB_CLASSES) +FILE(STRINGS "php.txt" SYSTEMLIB_CLASSES) set(SYSTEMLIB_SRCS) set(SYSTEMLIB_SRCS_STR) foreach(cls ${SYSTEMLIB_CLASSES}) @@ -31,7 +29,7 @@ foreach(cls ${SYSTEMLIB_CLASSES}) endforeach() add_custom_target(systemlib - DEPENDS "classes.txt" ${SYSTEMLIB_SRCS} + DEPENDS "php.txt" ${SYSTEMLIB_SRCS} COMMAND "INSTALL_DIR=${HPHP_HOME}/bin" "FBCODE_DIR=${HPHP_HOME}" "${HPHP_HOME}/hphp/runtime/ext_hhvm/make_systemlib.sh" diff --git a/hphp/system/classes.txt b/hphp/system/classes.txt deleted file mode 100644 index 8e7bc85d9..000000000 --- a/hphp/system/classes.txt +++ /dev/null @@ -1,55 +0,0 @@ -# Files to include in systemlib.php - -# Order matters here. Put parent classes in this list before child classes -hphp/system/classes/lang/Traversable.php -hphp/system/classes/lang/Iterator.php -hphp/system/classes/lang/IteratorAggregate.php -hphp/system/classes/lang/KeyedIterator.php -hphp/system/classes/lang/KeyedIterable.php -hphp/system/classes/lang/Exception.php -hphp/system/classes/spl/exceptions/exceptions.php -hphp/system/classes/spl/interfaces/Countable.php -hphp/system/classes/spl/interfaces/RecursiveIterator.php - -hphp/system/classes/spl/datastructures/SplHeap.php - -hphp/system/classes/spl/file_handling/SplFileInfo.php -hphp/system/classes/spl/interfaces/SeekableIterator.php -hphp/system/classes/spl/iterators/DirectoryIterator.php -hphp/system/classes/spl/iterators/FilesystemIterator.php -hphp/system/classes/spl/iterators/RecursiveDirectoryIterator.php -hphp/system/classes/spl/file_handling/SplFileObject.php - -hphp/system/classes/spl/interfaces/OuterIterator.php -hphp/system/classes/spl/iterators/IteratorIterator.php -hphp/system/classes/spl/iterators/FilterIterator.php -hphp/system/classes/spl/iterators/RecursiveFilterIterator.php - -# If you have no inheritance relationship, go here in alphabetical order -hphp/system/classes/DebuggerCommand.php -hphp/system/classes/XhprofFrame.php -hphp/system/classes/array_filter.hhas -hphp/system/classes/array_map.hhas -hphp/system/classes/asio/Awaitable.php -hphp/system/classes/asio/InvalidOperationException.php -hphp/system/classes/collections/collections.php -hphp/system/classes/dom/DOMException.php -hphp/system/classes/file_system/Directory.php -hphp/system/classes/json/JsonSerializable.php -hphp/system/classes/lang/ArrayAccess.php -hphp/system/classes/lang/ErrorException.php -hphp/system/classes/lang/Serializeable.php -hphp/system/classes/lang/stdClass.php -hphp/system/classes/pdo/PDOException.php -hphp/system/classes/reflection/reflection.php -hphp/system/classes/soap/SoapFault.php -hphp/system/classes/spl/datastructures/SplObjectStorage.php -hphp/system/classes/spl/datastructures/SplPriorityQueue.php -hphp/system/classes/spl/iterators/AppendIterator.php -hphp/system/classes/spl/iterators/ArrayIterator.php -hphp/system/classes/spl/iterators/RecursiveIteratorIterator.php -hphp/system/classes/spl/miscellaneous/ArrayObject.php - -hphp/system/classes_hhvm/pinitSentinel.php -hphp/system/classes_hhvm/resource.php - diff --git a/hphp/system/globals/Makefile b/hphp/system/globals/Makefile deleted file mode 100644 index f49f8ab76..000000000 --- a/hphp/system/globals/Makefile +++ /dev/null @@ -1,3 +0,0 @@ - -all: - php ../../../bin/gen_constants.php php53.constants.php > constants.php diff --git a/hphp/idl/apache.idl.json b/hphp/system/idl/apache.idl.json similarity index 100% rename from hphp/idl/apache.idl.json rename to hphp/system/idl/apache.idl.json diff --git a/hphp/idl/apc.idl.json b/hphp/system/idl/apc.idl.json similarity index 100% rename from hphp/idl/apc.idl.json rename to hphp/system/idl/apc.idl.json diff --git a/hphp/idl/apd.idl.json b/hphp/system/idl/apd.idl.json similarity index 100% rename from hphp/idl/apd.idl.json rename to hphp/system/idl/apd.idl.json diff --git a/hphp/idl/array.idl.json b/hphp/system/idl/array.idl.json similarity index 100% rename from hphp/idl/array.idl.json rename to hphp/system/idl/array.idl.json diff --git a/hphp/idl/asio.idl.json b/hphp/system/idl/asio.idl.json similarity index 100% rename from hphp/idl/asio.idl.json rename to hphp/system/idl/asio.idl.json diff --git a/hphp/idl/base.php b/hphp/system/idl/base.php similarity index 100% rename from hphp/idl/base.php rename to hphp/system/idl/base.php diff --git a/hphp/idl/bcmath.idl.json b/hphp/system/idl/bcmath.idl.json similarity index 100% rename from hphp/idl/bcmath.idl.json rename to hphp/system/idl/bcmath.idl.json diff --git a/hphp/idl/bzip2.idl.json b/hphp/system/idl/bzip2.idl.json similarity index 100% rename from hphp/idl/bzip2.idl.json rename to hphp/system/idl/bzip2.idl.json diff --git a/hphp/idl/class.idl.json b/hphp/system/idl/class.idl.json similarity index 100% rename from hphp/idl/class.idl.json rename to hphp/system/idl/class.idl.json diff --git a/hphp/idl/closure.idl.json b/hphp/system/idl/closure.idl.json similarity index 100% rename from hphp/idl/closure.idl.json rename to hphp/system/idl/closure.idl.json diff --git a/hphp/idl/collections.idl.json b/hphp/system/idl/collections.idl.json similarity index 100% rename from hphp/idl/collections.idl.json rename to hphp/system/idl/collections.idl.json diff --git a/hphp/system/globals/constdef.json b/hphp/system/idl/constants.idl.json similarity index 99% rename from hphp/system/globals/constdef.json rename to hphp/system/idl/constants.idl.json index 643443cb1..f37209fde 100644 --- a/hphp/system/globals/constdef.json +++ b/hphp/system/idl/constants.idl.json @@ -1785,7 +1785,7 @@ }, { "name": "HPHP_VERSION", - "value": "2.1.0-dev" + "value": "1.0.0" }, { "name": "HTML_ENTITIES", diff --git a/hphp/idl/continuation.idl.json b/hphp/system/idl/continuation.idl.json similarity index 100% rename from hphp/idl/continuation.idl.json rename to hphp/system/idl/continuation.idl.json diff --git a/hphp/idl/ctype.idl.json b/hphp/system/idl/ctype.idl.json similarity index 100% rename from hphp/idl/ctype.idl.json rename to hphp/system/idl/ctype.idl.json diff --git a/hphp/idl/curl.idl.json b/hphp/system/idl/curl.idl.json similarity index 100% rename from hphp/idl/curl.idl.json rename to hphp/system/idl/curl.idl.json diff --git a/hphp/idl/datetime.idl.json b/hphp/system/idl/datetime.idl.json similarity index 100% rename from hphp/idl/datetime.idl.json rename to hphp/system/idl/datetime.idl.json diff --git a/hphp/idl/debugger.idl.json b/hphp/system/idl/debugger.idl.json similarity index 100% rename from hphp/idl/debugger.idl.json rename to hphp/system/idl/debugger.idl.json diff --git a/hphp/idl/domdocument.idl.json b/hphp/system/idl/domdocument.idl.json similarity index 100% rename from hphp/idl/domdocument.idl.json rename to hphp/system/idl/domdocument.idl.json diff --git a/hphp/idl/error.idl.json b/hphp/system/idl/error.idl.json similarity index 100% rename from hphp/idl/error.idl.json rename to hphp/system/idl/error.idl.json diff --git a/hphp/idl/fb.idl.json b/hphp/system/idl/fb.idl.json similarity index 100% rename from hphp/idl/fb.idl.json rename to hphp/system/idl/fb.idl.json diff --git a/hphp/idl/file.idl.json b/hphp/system/idl/file.idl.json similarity index 100% rename from hphp/idl/file.idl.json rename to hphp/system/idl/file.idl.json diff --git a/hphp/idl/function.idl.json b/hphp/system/idl/function.idl.json similarity index 100% rename from hphp/idl/function.idl.json rename to hphp/system/idl/function.idl.json diff --git a/hphp/idl/hash.idl.json b/hphp/system/idl/hash.idl.json similarity index 100% rename from hphp/idl/hash.idl.json rename to hphp/system/idl/hash.idl.json diff --git a/hphp/idl/iconv.idl.json b/hphp/system/idl/iconv.idl.json similarity index 100% rename from hphp/idl/iconv.idl.json rename to hphp/system/idl/iconv.idl.json diff --git a/hphp/idl/icu.idl.json b/hphp/system/idl/icu.idl.json similarity index 100% rename from hphp/idl/icu.idl.json rename to hphp/system/idl/icu.idl.json diff --git a/hphp/idl/icu_ucnv.idl.json b/hphp/system/idl/icu_ucnv.idl.json similarity index 100% rename from hphp/idl/icu_ucnv.idl.json rename to hphp/system/idl/icu_ucnv.idl.json diff --git a/hphp/idl/icu_ucsdet.idl.json b/hphp/system/idl/icu_ucsdet.idl.json similarity index 100% rename from hphp/idl/icu_ucsdet.idl.json rename to hphp/system/idl/icu_ucsdet.idl.json diff --git a/hphp/idl/icu_uspoof.idl.json b/hphp/system/idl/icu_uspoof.idl.json similarity index 100% rename from hphp/idl/icu_uspoof.idl.json rename to hphp/system/idl/icu_uspoof.idl.json diff --git a/hphp/idl/idl.php b/hphp/system/idl/idl.php similarity index 100% rename from hphp/idl/idl.php rename to hphp/system/idl/idl.php diff --git a/hphp/idl/idl_list.php b/hphp/system/idl/idl_list.php similarity index 92% rename from hphp/idl/idl_list.php rename to hphp/system/idl/idl_list.php index e505a3651..57e9aa160 100644 --- a/hphp/idl/idl_list.php +++ b/hphp/system/idl/idl_list.php @@ -46,9 +46,14 @@ foreach ($files as $file) { $name = $matches[2]; $ucname = $prefix ? camelCase($name) : ucfirst($name); + if ($name === 'constants') { + // Ignore 'cosntants.idl.json' + continue; + } + switch ($format) { case 'test_ext': - $path = $prefix ? "hphp/$prefix" : "hphp/test/"; + $path = $prefix ? "hphp/$prefix" : "hphp/test/ext/"; fwrite($f, "#include \"${path}test_ext_$name.h\"\n"); break; case 'test_suites': diff --git a/hphp/idl/image.idl.json b/hphp/system/idl/image.idl.json similarity index 100% rename from hphp/idl/image.idl.json rename to hphp/system/idl/image.idl.json diff --git a/hphp/idl/imagesprite.idl.json b/hphp/system/idl/imagesprite.idl.json similarity index 100% rename from hphp/idl/imagesprite.idl.json rename to hphp/system/idl/imagesprite.idl.json diff --git a/hphp/idl/imap.idl.json b/hphp/system/idl/imap.idl.json similarity index 100% rename from hphp/idl/imap.idl.json rename to hphp/system/idl/imap.idl.json diff --git a/hphp/idl/intl.idl.json b/hphp/system/idl/intl.idl.json similarity index 100% rename from hphp/idl/intl.idl.json rename to hphp/system/idl/intl.idl.json diff --git a/hphp/idl/ipc.idl.json b/hphp/system/idl/ipc.idl.json similarity index 100% rename from hphp/idl/ipc.idl.json rename to hphp/system/idl/ipc.idl.json diff --git a/hphp/idl/json.idl.json b/hphp/system/idl/json.idl.json similarity index 100% rename from hphp/idl/json.idl.json rename to hphp/system/idl/json.idl.json diff --git a/hphp/idl/ldap.idl.json b/hphp/system/idl/ldap.idl.json similarity index 100% rename from hphp/idl/ldap.idl.json rename to hphp/system/idl/ldap.idl.json diff --git a/hphp/idl/magick.idl.json b/hphp/system/idl/magick.idl.json similarity index 100% rename from hphp/idl/magick.idl.json rename to hphp/system/idl/magick.idl.json diff --git a/hphp/idl/mailparse.idl.json b/hphp/system/idl/mailparse.idl.json similarity index 100% rename from hphp/idl/mailparse.idl.json rename to hphp/system/idl/mailparse.idl.json diff --git a/hphp/idl/math.idl.json b/hphp/system/idl/math.idl.json similarity index 100% rename from hphp/idl/math.idl.json rename to hphp/system/idl/math.idl.json diff --git a/hphp/idl/mb.idl.json b/hphp/system/idl/mb.idl.json similarity index 100% rename from hphp/idl/mb.idl.json rename to hphp/system/idl/mb.idl.json diff --git a/hphp/idl/mcrypt.idl.json b/hphp/system/idl/mcrypt.idl.json similarity index 100% rename from hphp/idl/mcrypt.idl.json rename to hphp/system/idl/mcrypt.idl.json diff --git a/hphp/idl/memcache.idl.json b/hphp/system/idl/memcache.idl.json similarity index 100% rename from hphp/idl/memcache.idl.json rename to hphp/system/idl/memcache.idl.json diff --git a/hphp/idl/memcached.idl.json b/hphp/system/idl/memcached.idl.json similarity index 100% rename from hphp/idl/memcached.idl.json rename to hphp/system/idl/memcached.idl.json diff --git a/hphp/idl/misc.idl.json b/hphp/system/idl/misc.idl.json similarity index 100% rename from hphp/idl/misc.idl.json rename to hphp/system/idl/misc.idl.json diff --git a/hphp/idl/mysql.idl.json b/hphp/system/idl/mysql.idl.json similarity index 100% rename from hphp/idl/mysql.idl.json rename to hphp/system/idl/mysql.idl.json diff --git a/hphp/idl/network.idl.json b/hphp/system/idl/network.idl.json similarity index 100% rename from hphp/idl/network.idl.json rename to hphp/system/idl/network.idl.json diff --git a/hphp/idl/newext.php b/hphp/system/idl/newext.php similarity index 100% rename from hphp/idl/newext.php rename to hphp/system/idl/newext.php diff --git a/hphp/idl/openssl.idl.json b/hphp/system/idl/openssl.idl.json similarity index 100% rename from hphp/idl/openssl.idl.json rename to hphp/system/idl/openssl.idl.json diff --git a/hphp/idl/options.idl.json b/hphp/system/idl/options.idl.json similarity index 100% rename from hphp/idl/options.idl.json rename to hphp/system/idl/options.idl.json diff --git a/hphp/idl/output.idl.json b/hphp/system/idl/output.idl.json similarity index 100% rename from hphp/idl/output.idl.json rename to hphp/system/idl/output.idl.json diff --git a/hphp/idl/pdo.idl.json b/hphp/system/idl/pdo.idl.json similarity index 100% rename from hphp/idl/pdo.idl.json rename to hphp/system/idl/pdo.idl.json diff --git a/hphp/idl/posix.idl.json b/hphp/system/idl/posix.idl.json similarity index 100% rename from hphp/idl/posix.idl.json rename to hphp/system/idl/posix.idl.json diff --git a/hphp/idl/preg.idl.json b/hphp/system/idl/preg.idl.json similarity index 100% rename from hphp/idl/preg.idl.json rename to hphp/system/idl/preg.idl.json diff --git a/hphp/idl/process.idl.json b/hphp/system/idl/process.idl.json similarity index 100% rename from hphp/idl/process.idl.json rename to hphp/system/idl/process.idl.json diff --git a/hphp/idl/reflection.idl.json b/hphp/system/idl/reflection.idl.json similarity index 100% rename from hphp/idl/reflection.idl.json rename to hphp/system/idl/reflection.idl.json diff --git a/hphp/idl/schema.php b/hphp/system/idl/schema.php similarity index 100% rename from hphp/idl/schema.php rename to hphp/system/idl/schema.php diff --git a/hphp/idl/server.idl.json b/hphp/system/idl/server.idl.json similarity index 100% rename from hphp/idl/server.idl.json rename to hphp/system/idl/server.idl.json diff --git a/hphp/idl/session.idl.json b/hphp/system/idl/session.idl.json similarity index 100% rename from hphp/idl/session.idl.json rename to hphp/system/idl/session.idl.json diff --git a/hphp/idl/simplexml.idl.json b/hphp/system/idl/simplexml.idl.json similarity index 100% rename from hphp/idl/simplexml.idl.json rename to hphp/system/idl/simplexml.idl.json diff --git a/hphp/idl/soap.idl.json b/hphp/system/idl/soap.idl.json similarity index 100% rename from hphp/idl/soap.idl.json rename to hphp/system/idl/soap.idl.json diff --git a/hphp/idl/socket.idl.json b/hphp/system/idl/socket.idl.json similarity index 100% rename from hphp/idl/socket.idl.json rename to hphp/system/idl/socket.idl.json diff --git a/hphp/idl/spl.idl.json b/hphp/system/idl/spl.idl.json similarity index 100% rename from hphp/idl/spl.idl.json rename to hphp/system/idl/spl.idl.json diff --git a/hphp/idl/sqlite3.idl.json b/hphp/system/idl/sqlite3.idl.json similarity index 100% rename from hphp/idl/sqlite3.idl.json rename to hphp/system/idl/sqlite3.idl.json diff --git a/hphp/idl/stream.idl.json b/hphp/system/idl/stream.idl.json similarity index 100% rename from hphp/idl/stream.idl.json rename to hphp/system/idl/stream.idl.json diff --git a/hphp/idl/string.idl.json b/hphp/system/idl/string.idl.json similarity index 100% rename from hphp/idl/string.idl.json rename to hphp/system/idl/string.idl.json diff --git a/hphp/idl/sysdoc.php b/hphp/system/idl/sysdoc.php similarity index 100% rename from hphp/idl/sysdoc.php rename to hphp/system/idl/sysdoc.php diff --git a/hphp/idl/thread.idl.json b/hphp/system/idl/thread.idl.json similarity index 100% rename from hphp/idl/thread.idl.json rename to hphp/system/idl/thread.idl.json diff --git a/hphp/idl/thrift.idl.json b/hphp/system/idl/thrift.idl.json similarity index 100% rename from hphp/idl/thrift.idl.json rename to hphp/system/idl/thrift.idl.json diff --git a/hphp/idl/url.idl.json b/hphp/system/idl/url.idl.json similarity index 100% rename from hphp/idl/url.idl.json rename to hphp/system/idl/url.idl.json diff --git a/hphp/idl/variable.idl.json b/hphp/system/idl/variable.idl.json similarity index 100% rename from hphp/idl/variable.idl.json rename to hphp/system/idl/variable.idl.json diff --git a/hphp/idl/xml.idl.json b/hphp/system/idl/xml.idl.json similarity index 100% rename from hphp/idl/xml.idl.json rename to hphp/system/idl/xml.idl.json diff --git a/hphp/idl/xmlreader.idl.json b/hphp/system/idl/xmlreader.idl.json similarity index 100% rename from hphp/idl/xmlreader.idl.json rename to hphp/system/idl/xmlreader.idl.json diff --git a/hphp/idl/xmlwriter.idl.json b/hphp/system/idl/xmlwriter.idl.json similarity index 100% rename from hphp/idl/xmlwriter.idl.json rename to hphp/system/idl/xmlwriter.idl.json diff --git a/hphp/idl/zlib.idl.json b/hphp/system/idl/zlib.idl.json similarity index 100% rename from hphp/idl/zlib.idl.json rename to hphp/system/idl/zlib.idl.json diff --git a/hphp/system/php.txt b/hphp/system/php.txt new file mode 100644 index 000000000..54747df5e --- /dev/null +++ b/hphp/system/php.txt @@ -0,0 +1,55 @@ +# Files to include in systemlib.php + +# Order matters here. Put parent classes in this list before child classes +hphp/system/php/lang/stdClass.php +hphp/system/php/lang/pinitSentinel.php +hphp/system/php/lang/resource.php + +hphp/system/php/lang/Traversable.php +hphp/system/php/lang/Iterator.php +hphp/system/php/lang/IteratorAggregate.php +hphp/system/php/lang/KeyedIterator.php +hphp/system/php/lang/KeyedIterable.php +hphp/system/php/lang/Exception.php +hphp/system/php/spl/exceptions/exceptions.php +hphp/system/php/spl/interfaces/Countable.php +hphp/system/php/spl/interfaces/RecursiveIterator.php + +hphp/system/php/spl/datastructures/SplHeap.php + +hphp/system/php/spl/file_handling/SplFileInfo.php +hphp/system/php/spl/interfaces/SeekableIterator.php +hphp/system/php/spl/iterators/DirectoryIterator.php +hphp/system/php/spl/iterators/FilesystemIterator.php +hphp/system/php/spl/iterators/RecursiveDirectoryIterator.php +hphp/system/php/spl/file_handling/SplFileObject.php + +hphp/system/php/spl/interfaces/OuterIterator.php +hphp/system/php/spl/iterators/IteratorIterator.php +hphp/system/php/spl/iterators/FilterIterator.php +hphp/system/php/spl/iterators/RecursiveFilterIterator.php + +# If you have no inheritance relationship, go here in alphabetical order +hphp/system/php/DebuggerCommand.php +hphp/system/php/XhprofFrame.php +hphp/system/php/array_filter.hhas +hphp/system/php/array_map.hhas +hphp/system/php/asio/Awaitable.php +hphp/system/php/asio/InvalidOperationException.php +hphp/system/php/collections/collections.php +hphp/system/php/dom/DOMException.php +hphp/system/php/file_system/Directory.php +hphp/system/php/json/JsonSerializable.php +hphp/system/php/lang/ArrayAccess.php +hphp/system/php/lang/ErrorException.php +hphp/system/php/lang/Serializeable.php +hphp/system/php/pdo/PDOException.php +hphp/system/php/reflection/reflection.php +hphp/system/php/soap/SoapFault.php +hphp/system/php/spl/datastructures/SplObjectStorage.php +hphp/system/php/spl/datastructures/SplPriorityQueue.php +hphp/system/php/spl/iterators/AppendIterator.php +hphp/system/php/spl/iterators/ArrayIterator.php +hphp/system/php/spl/iterators/RecursiveIteratorIterator.php +hphp/system/php/spl/miscellaneous/ArrayObject.php + diff --git a/hphp/system/classes/DebuggerCommand.php b/hphp/system/php/DebuggerCommand.php similarity index 100% rename from hphp/system/classes/DebuggerCommand.php rename to hphp/system/php/DebuggerCommand.php diff --git a/hphp/system/classes/XhprofFrame.php b/hphp/system/php/XhprofFrame.php similarity index 100% rename from hphp/system/classes/XhprofFrame.php rename to hphp/system/php/XhprofFrame.php diff --git a/hphp/system/classes/array_filter.hhas b/hphp/system/php/array_filter.hhas similarity index 100% rename from hphp/system/classes/array_filter.hhas rename to hphp/system/php/array_filter.hhas diff --git a/hphp/system/classes/array_map.hhas b/hphp/system/php/array_map.hhas similarity index 100% rename from hphp/system/classes/array_map.hhas rename to hphp/system/php/array_map.hhas diff --git a/hphp/system/classes/asio/Awaitable.php b/hphp/system/php/asio/Awaitable.php similarity index 100% rename from hphp/system/classes/asio/Awaitable.php rename to hphp/system/php/asio/Awaitable.php diff --git a/hphp/system/classes/asio/InvalidOperationException.php b/hphp/system/php/asio/InvalidOperationException.php similarity index 100% rename from hphp/system/classes/asio/InvalidOperationException.php rename to hphp/system/php/asio/InvalidOperationException.php diff --git a/hphp/system/classes/collections/collections.php b/hphp/system/php/collections/collections.php similarity index 100% rename from hphp/system/classes/collections/collections.php rename to hphp/system/php/collections/collections.php diff --git a/hphp/system/classes/dom/DOMException.php b/hphp/system/php/dom/DOMException.php similarity index 100% rename from hphp/system/classes/dom/DOMException.php rename to hphp/system/php/dom/DOMException.php diff --git a/hphp/system/classes/file_system/Directory.php b/hphp/system/php/file_system/Directory.php similarity index 100% rename from hphp/system/classes/file_system/Directory.php rename to hphp/system/php/file_system/Directory.php diff --git a/hphp/system/classes/json/JsonSerializable.php b/hphp/system/php/json/JsonSerializable.php similarity index 100% rename from hphp/system/classes/json/JsonSerializable.php rename to hphp/system/php/json/JsonSerializable.php diff --git a/hphp/system/classes/lang/ArrayAccess.php b/hphp/system/php/lang/ArrayAccess.php similarity index 100% rename from hphp/system/classes/lang/ArrayAccess.php rename to hphp/system/php/lang/ArrayAccess.php diff --git a/hphp/system/classes/lang/ErrorException.php b/hphp/system/php/lang/ErrorException.php similarity index 100% rename from hphp/system/classes/lang/ErrorException.php rename to hphp/system/php/lang/ErrorException.php diff --git a/hphp/system/classes/lang/Exception.php b/hphp/system/php/lang/Exception.php similarity index 100% rename from hphp/system/classes/lang/Exception.php rename to hphp/system/php/lang/Exception.php diff --git a/hphp/system/classes/lang/Iterator.php b/hphp/system/php/lang/Iterator.php similarity index 100% rename from hphp/system/classes/lang/Iterator.php rename to hphp/system/php/lang/Iterator.php diff --git a/hphp/system/classes/lang/IteratorAggregate.php b/hphp/system/php/lang/IteratorAggregate.php similarity index 100% rename from hphp/system/classes/lang/IteratorAggregate.php rename to hphp/system/php/lang/IteratorAggregate.php diff --git a/hphp/system/classes/lang/KeyedIterable.php b/hphp/system/php/lang/KeyedIterable.php similarity index 100% rename from hphp/system/classes/lang/KeyedIterable.php rename to hphp/system/php/lang/KeyedIterable.php diff --git a/hphp/system/classes/lang/KeyedIterator.php b/hphp/system/php/lang/KeyedIterator.php similarity index 100% rename from hphp/system/classes/lang/KeyedIterator.php rename to hphp/system/php/lang/KeyedIterator.php diff --git a/hphp/system/classes/lang/Serializeable.php b/hphp/system/php/lang/Serializeable.php similarity index 100% rename from hphp/system/classes/lang/Serializeable.php rename to hphp/system/php/lang/Serializeable.php diff --git a/hphp/system/classes/lang/Traversable.php b/hphp/system/php/lang/Traversable.php similarity index 100% rename from hphp/system/classes/lang/Traversable.php rename to hphp/system/php/lang/Traversable.php diff --git a/hphp/system/classes_hhvm/pinitSentinel.php b/hphp/system/php/lang/pinitSentinel.php similarity index 100% rename from hphp/system/classes_hhvm/pinitSentinel.php rename to hphp/system/php/lang/pinitSentinel.php diff --git a/hphp/system/classes_hhvm/resource.php b/hphp/system/php/lang/resource.php similarity index 100% rename from hphp/system/classes_hhvm/resource.php rename to hphp/system/php/lang/resource.php diff --git a/hphp/system/classes/lang/stdClass.php b/hphp/system/php/lang/stdClass.php similarity index 100% rename from hphp/system/classes/lang/stdClass.php rename to hphp/system/php/lang/stdClass.php diff --git a/hphp/system/classes/pdo/PDOException.php b/hphp/system/php/pdo/PDOException.php similarity index 100% rename from hphp/system/classes/pdo/PDOException.php rename to hphp/system/php/pdo/PDOException.php diff --git a/hphp/system/classes/reflection/reflection.php b/hphp/system/php/reflection/reflection.php similarity index 100% rename from hphp/system/classes/reflection/reflection.php rename to hphp/system/php/reflection/reflection.php diff --git a/hphp/system/classes/soap/SoapFault.php b/hphp/system/php/soap/SoapFault.php similarity index 100% rename from hphp/system/classes/soap/SoapFault.php rename to hphp/system/php/soap/SoapFault.php diff --git a/hphp/system/classes/spl/datastructures/SplHeap.php b/hphp/system/php/spl/datastructures/SplHeap.php similarity index 100% rename from hphp/system/classes/spl/datastructures/SplHeap.php rename to hphp/system/php/spl/datastructures/SplHeap.php diff --git a/hphp/system/classes/spl/datastructures/SplObjectStorage.php b/hphp/system/php/spl/datastructures/SplObjectStorage.php similarity index 100% rename from hphp/system/classes/spl/datastructures/SplObjectStorage.php rename to hphp/system/php/spl/datastructures/SplObjectStorage.php diff --git a/hphp/system/classes/spl/datastructures/SplPriorityQueue.php b/hphp/system/php/spl/datastructures/SplPriorityQueue.php similarity index 100% rename from hphp/system/classes/spl/datastructures/SplPriorityQueue.php rename to hphp/system/php/spl/datastructures/SplPriorityQueue.php diff --git a/hphp/system/classes/spl/exceptions/exceptions.php b/hphp/system/php/spl/exceptions/exceptions.php similarity index 100% rename from hphp/system/classes/spl/exceptions/exceptions.php rename to hphp/system/php/spl/exceptions/exceptions.php diff --git a/hphp/system/classes/spl/file_handling/SplFileInfo.php b/hphp/system/php/spl/file_handling/SplFileInfo.php similarity index 100% rename from hphp/system/classes/spl/file_handling/SplFileInfo.php rename to hphp/system/php/spl/file_handling/SplFileInfo.php diff --git a/hphp/system/classes/spl/file_handling/SplFileObject.php b/hphp/system/php/spl/file_handling/SplFileObject.php similarity index 100% rename from hphp/system/classes/spl/file_handling/SplFileObject.php rename to hphp/system/php/spl/file_handling/SplFileObject.php diff --git a/hphp/system/classes/spl/interfaces/Countable.php b/hphp/system/php/spl/interfaces/Countable.php similarity index 100% rename from hphp/system/classes/spl/interfaces/Countable.php rename to hphp/system/php/spl/interfaces/Countable.php diff --git a/hphp/system/classes/spl/interfaces/OuterIterator.php b/hphp/system/php/spl/interfaces/OuterIterator.php similarity index 100% rename from hphp/system/classes/spl/interfaces/OuterIterator.php rename to hphp/system/php/spl/interfaces/OuterIterator.php diff --git a/hphp/system/classes/spl/interfaces/RecursiveIterator.php b/hphp/system/php/spl/interfaces/RecursiveIterator.php similarity index 100% rename from hphp/system/classes/spl/interfaces/RecursiveIterator.php rename to hphp/system/php/spl/interfaces/RecursiveIterator.php diff --git a/hphp/system/classes/spl/interfaces/SeekableIterator.php b/hphp/system/php/spl/interfaces/SeekableIterator.php similarity index 100% rename from hphp/system/classes/spl/interfaces/SeekableIterator.php rename to hphp/system/php/spl/interfaces/SeekableIterator.php diff --git a/hphp/system/classes/spl/iterators/AppendIterator.php b/hphp/system/php/spl/iterators/AppendIterator.php similarity index 100% rename from hphp/system/classes/spl/iterators/AppendIterator.php rename to hphp/system/php/spl/iterators/AppendIterator.php diff --git a/hphp/system/classes/spl/iterators/ArrayIterator.php b/hphp/system/php/spl/iterators/ArrayIterator.php similarity index 100% rename from hphp/system/classes/spl/iterators/ArrayIterator.php rename to hphp/system/php/spl/iterators/ArrayIterator.php diff --git a/hphp/system/classes/spl/iterators/DirectoryIterator.php b/hphp/system/php/spl/iterators/DirectoryIterator.php similarity index 100% rename from hphp/system/classes/spl/iterators/DirectoryIterator.php rename to hphp/system/php/spl/iterators/DirectoryIterator.php diff --git a/hphp/system/classes/spl/iterators/FilesystemIterator.php b/hphp/system/php/spl/iterators/FilesystemIterator.php similarity index 100% rename from hphp/system/classes/spl/iterators/FilesystemIterator.php rename to hphp/system/php/spl/iterators/FilesystemIterator.php diff --git a/hphp/system/classes/spl/iterators/FilterIterator.php b/hphp/system/php/spl/iterators/FilterIterator.php similarity index 100% rename from hphp/system/classes/spl/iterators/FilterIterator.php rename to hphp/system/php/spl/iterators/FilterIterator.php diff --git a/hphp/system/classes/spl/iterators/IteratorIterator.php b/hphp/system/php/spl/iterators/IteratorIterator.php similarity index 100% rename from hphp/system/classes/spl/iterators/IteratorIterator.php rename to hphp/system/php/spl/iterators/IteratorIterator.php diff --git a/hphp/system/classes/spl/iterators/RecursiveDirectoryIterator.php b/hphp/system/php/spl/iterators/RecursiveDirectoryIterator.php similarity index 100% rename from hphp/system/classes/spl/iterators/RecursiveDirectoryIterator.php rename to hphp/system/php/spl/iterators/RecursiveDirectoryIterator.php diff --git a/hphp/system/classes/spl/iterators/RecursiveFilterIterator.php b/hphp/system/php/spl/iterators/RecursiveFilterIterator.php similarity index 100% rename from hphp/system/classes/spl/iterators/RecursiveFilterIterator.php rename to hphp/system/php/spl/iterators/RecursiveFilterIterator.php diff --git a/hphp/system/classes/spl/iterators/RecursiveIteratorIterator.php b/hphp/system/php/spl/iterators/RecursiveIteratorIterator.php similarity index 100% rename from hphp/system/classes/spl/iterators/RecursiveIteratorIterator.php rename to hphp/system/php/spl/iterators/RecursiveIteratorIterator.php diff --git a/hphp/system/classes/spl/miscellaneous/ArrayObject.php b/hphp/system/php/spl/miscellaneous/ArrayObject.php similarity index 100% rename from hphp/system/classes/spl/miscellaneous/ArrayObject.php rename to hphp/system/php/spl/miscellaneous/ArrayObject.php diff --git a/hphp/system/lib/systemlib.cpp b/hphp/system/systemlib.cpp similarity index 99% rename from hphp/system/lib/systemlib.cpp rename to hphp/system/systemlib.cpp index 0f103813b..a2ff3e58c 100644 --- a/hphp/system/lib/systemlib.cpp +++ b/hphp/system/systemlib.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" #include "hphp/runtime/base/hphp_system.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/vm/unit.h" diff --git a/hphp/system/lib/systemlib.h b/hphp/system/systemlib.h similarity index 100% rename from hphp/system/lib/systemlib.h rename to hphp/system/systemlib.h diff --git a/hphp/test/ext/test_cpp_base.cpp b/hphp/test/ext/test_cpp_base.cpp index 4674d1ade..363ddfbc4 100644 --- a/hphp/test/ext/test_cpp_base.cpp +++ b/hphp/test/ext/test_cpp_base.cpp @@ -27,7 +27,7 @@ #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/server/ip_block_map.h" #include "hphp/test/ext/test_mysql_info.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/ext/test_ext_json.cpp b/hphp/test/ext/test_ext_json.cpp index 91181fd05..3939ca6eb 100644 --- a/hphp/test/ext/test_ext_json.cpp +++ b/hphp/test/ext/test_ext_json.cpp @@ -16,7 +16,7 @@ #include "hphp/test/ext/test_ext_json.h" #include "hphp/runtime/ext/ext_json.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/ext/test_ext_url.cpp b/hphp/test/ext/test_ext_url.cpp index bc526322a..96583dad3 100644 --- a/hphp/test/ext/test_ext_url.cpp +++ b/hphp/test/ext/test_ext_url.cpp @@ -16,7 +16,7 @@ #include "hphp/test/ext/test_ext_url.h" #include "hphp/runtime/ext/ext_url.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/test/ext/test_ext_variable.cpp b/hphp/test/ext/test_ext_variable.cpp index 757a59e57..22aebadbb 100644 --- a/hphp/test/ext/test_ext_variable.cpp +++ b/hphp/test/ext/test_ext_variable.cpp @@ -17,7 +17,7 @@ #include "hphp/test/ext/test_ext_variable.h" #include "hphp/runtime/ext/ext_variable.h" #include "hphp/runtime/ext/ext_string.h" -#include "hphp/system/lib/systemlib.h" +#include "hphp/system/systemlib.h" /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/tools/gen-ext-hhvm/gen-class-map.cpp b/hphp/tools/gen-ext-hhvm/gen-class-map.cpp index c434833a4..2df2ddc26 100644 --- a/hphp/tools/gen-ext-hhvm/gen-class-map.cpp +++ b/hphp/tools/gen-ext-hhvm/gen-class-map.cpp @@ -149,8 +149,8 @@ static void declareConstants(std::ostream &out, } } -static int outputConstants(const char *outputfn, - const fbvector& consts) { +static void outputConstants(const char *outputfn, + const fbvector& consts) { std::ofstream out(outputfn); out << "// @" "generated by gen-class-map.cpp\n" @@ -162,8 +162,6 @@ static int outputConstants(const char *outputfn, declareConstants(out, consts, true); out << "} // namespace HPHP\n" << "#endif // _H_SYSTEM_CONSTANTS\n"; - - return 0; } ///////////////////////////////////////////////////////////////////////////// @@ -316,10 +314,10 @@ static void writeClass(std::ostream& out, const PhpClass& cls) { out << " NULL,\n"; // no attributes } -static int outputClassMap(const char *outputfn, const char *classmap_name, - const fbvector& classes, - const fbvector& funcs, - const fbvector& consts) { +static void outputClassMap(const char *outputfn, const char *classmap_name, + const fbvector& classes, + const fbvector& funcs, + const fbvector& consts) { std::ofstream out(outputfn); out << "// @" "generated by gen-class-map.cpp\n" @@ -347,17 +345,32 @@ static int outputClassMap(const char *outputfn, const char *classmap_name, << " NULL,\n" // End of classmap << "};\n" << "} // namespace HPHP\n"; +} - return 0; +void print_usage(const char* program_name) { + std::cout << "Usage:\n\n" + << " " << program_name << "\n" + << " --system\n" + << " \n" + << " \n" + << " <*.idl.json>...\n\n" + << " " << program_name << "\n" + << " \n" + << " \n" + << " <*.idl.json>...\n\n"; } ///////////////////////////////////////////////////////////////////////////// int main(int argc, const char* argv[]) { - if (argc < 4) { - std::cout << "Usage: " << argv[0] - << " [constants | classmap(:g_class_map)] " - << " <*.idl.json>...\n"; + if (argc < 3) { + print_usage(argv[0]); + return 0; + } + + bool system = !strcmp(argv[1], "--system"); + if (system && argc < 4) { + print_usage(argv[0]); return 0; } @@ -365,7 +378,7 @@ int main(int argc, const char* argv[]) { fbvector classes; fbvector consts; - for (auto i = 3; i < argc; ++i) { + for (int i = (system ? 4 : 3); i < argc; ++i) { try { parseIDL(argv[i], funcs, classes, consts); } catch (const std::exception& exc) { @@ -374,21 +387,12 @@ int main(int argc, const char* argv[]) { } } - // System-wide class map e.g.: hphp/system/class_map.cpp - if (!strcmp(argv[1], "classmap")) { - return outputClassMap(argv[2], "g_class_map", - classes, funcs, consts); - } - - // Extension-local class map - if (!strncmp(argv[1], "classmap:", sizeof("classmap:") - 1)) { - return outputClassMap(argv[2], argv[1] + (sizeof("classmap:") - 1), - classes, funcs, consts); - } - - // Externs for system constants from constdef.json - if (!strcmp(argv[1], "constants")) { - return outputConstants(argv[2], consts); + const char* path = argv[2]; + const char* name = (system ? "g_class_map" : argv[1]); + outputClassMap(path, name, classes, funcs, consts); + if (system) { + path = argv[3]; + outputConstants(path, consts); } return 0; diff --git a/hphp/tools/gen-ext-hhvm/gen-class-map.sh b/hphp/tools/gen-ext-hhvm/gen-class-map.sh deleted file mode 100755 index 44d1ff429..000000000 --- a/hphp/tools/gen-ext-hhvm/gen-class-map.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -# $1 class_map cpp file to build -# $2 constants.h file to build -# $3 globals/constdef.json -# $4- Additional IDL files to parse for class_map - -CLASSMAP=$1 -CONSTANTS=$2 -CONSTDEF=$3 -shift; shift; shift; - -$HPHP_HOME/hphp/tools/gen-ext-hhvm/gen-class-map \ - constants $CONSTANTS $CONSTDEF - -$HPHP_HOME/hphp/tools/gen-ext-hhvm/gen-class-map \ - classmap $CLASSMAP $CONSTDEF $@ - diff --git a/hphp/tools/gen-ext-hhvm/gen-ext-hhvm.sh b/hphp/tools/gen-ext-hhvm/gen-ext-hhvm.sh index c01e77b6b..f5a1631e4 100755 --- a/hphp/tools/gen-ext-hhvm/gen-ext-hhvm.sh +++ b/hphp/tools/gen-ext-hhvm/gen-ext-hhvm.sh @@ -7,5 +7,5 @@ readelf -s -W $2 | grep 'FUNC.*GLOBAL' | \ sed -e 's/^.*DEFAULT[0-9 ]*//' | \ $HPHP_HOME/hphp/tools/gen-ext-hhvm/gen-ext-hhvm \ - $1 $4 $3 $HPHP_HOME/hphp/idl/*.idl.json + $1 $4 $3 $HPHP_HOME/hphp/system/idl/*.idl.json diff --git a/hphp/util/parser/parser.h b/hphp/util/parser/parser.h index bd4456260..8f1beb468 100644 --- a/hphp/util/parser/parser.h +++ b/hphp/util/parser/parser.h @@ -37,7 +37,6 @@ m_xhpAttributes.reset(); \ } \ -// NOTE: system/classes/closure.php may have reference to these strings: #define CONTINUATION_OBJECT_NAME "__cont__" #define TYPED_CONTINUATION_OBJECT_NAME "__typedCont__" #define FOREACH_VAR_PREFIX "__foreach__"