Commit da3a8769 by Abseil Team Committed by Gennadiy Rozental

Export of internal Abseil changes

--
b2b94b9f533e4f9ae2a2df9de56ccb3b18f31d0d by Gennadiy Rozental <rogeeff@google.com>:

Internal change

PiperOrigin-RevId: 314366138

--
7a5ac6be82741aec5b327d7b67efd14d69deed6a by Gennadiy Rozental <rogeeff@google.com>:

Introduce Abseil prefixed dynamic annotation macros.

PiperOrigin-RevId: 314228914

--
33e7c605cb1be9bd48bd3590b1eedccd68d3bd1b by Gennadiy Rozental <rogeeff@google.com>:

Fixing missing includes and remove unnecessary ones.

PiperOrigin-RevId: 314217909

--
6a3c5c26bfa13317bf0a880f13d0e4be0b971b76 by Gennadiy Rozental <rogeeff@google.com>:

Import of CCTZ from GitHub.

PiperOrigin-RevId: 314209576

--
f7795aa68020af4a6b4905531ba951e04b88966a by Abseil Team <absl-team@google.com>:

absl::FormatTime() and absl::ParseTime() format specifiers:
- %EZ now accepts 'z' in addition to 'Z' as a synonym for +00:00.
- %ET is introduced, producing 'T' on output, and accepting 'T'
  or 't' on input.  This is for the RFC3339 date-time separator.

PiperOrigin-RevId: 313945137

--
87c437ce3aab3f59a7546e44a28cd1c8aaa152c3 by Laramie Leavitt <lar@google.com>:

Rollback

PiperOrigin-RevId: 313868206

--
8049b74349486a0026932b86d29c380b195e1cba by Laramie Leavitt <lar@google.com>:

Remove the MockingBitGenBase base class in favor of type-erasure in BitGenRef.

In Abseil random, mocking was split across two different classes,
MockingBitGenBase and MockingBitGen. This split existed because Google Mock is a
test-only library that we don't link into production, so MockingBitGenBase
provided a low-overhead scaffold used to lookup mocks when in test code, but
which is unused in production code.

That has been replaced by type-erasure which looks for a method named
CallImpl with the correct signature.

Weaken the coupling between MockingBitGen, DistributionCaller, and MockOverloadSet.

Rename CallImpl to InvokeMock()

Previously, the implementation of DistributionCaller was also split across different files using explicit instantiation of the DistributionCaller struct and some details in the Mocking classes. Now Distribution caller uses the presence of the InvokeMock() method to choose whether to use the mockable call path or the default call path.

PiperOrigin-RevId: 313848695

--
1741d80e08050e1939605f70ca6ff64809785c85 by Gennadiy Rozental <rogeeff@google.com>:

Introduce public interface to access reflection handle corresponding the flag.

This interface will be the only official way to access flag reflection information from the flag object. The other internal methods will eventually disappear.

PiperOrigin-RevId: 313734006

--
c375bead457de29d9c29595d16c66d3e5125b585 by Abseil Team <absl-team@google.com>:

Improve documentation of absl::c_partial_sort_copy.

This function takes no middle parameter, instead using the size of the result
container to determine the size of the partial sort.

PiperOrigin-RevId: 313656062

--
bbc759d43656b1b996ad558f23c852a9f14129d2 by Gennadiy Rozental <rogeeff@google.com>:

Eliminate dynamic annotation symbols in the library.

PiperOrigin-RevId: 313650817
GitOrigin-RevId: b2b94b9f533e4f9ae2a2df9de56ccb3b18f31d0d
Change-Id: Ic7a11bbcb723f3ff6a7e2f214bff0a92c6f8ab4d
parent 8faf2046
...@@ -15,6 +15,7 @@ set(ABSL_INTERNAL_DLL_FILES ...@@ -15,6 +15,7 @@ set(ABSL_INTERNAL_DLL_FILES
"base/internal/cycleclock.cc" "base/internal/cycleclock.cc"
"base/internal/cycleclock.h" "base/internal/cycleclock.h"
"base/internal/direct_mmap.h" "base/internal/direct_mmap.h"
"base/internal/dynamic_annotations.h"
"base/internal/endian.h" "base/internal/endian.h"
"base/internal/errno_saver.h" "base/internal/errno_saver.h"
"base/internal/exponential_biased.cc" "base/internal/exponential_biased.cc"
......
...@@ -174,5 +174,5 @@ if(ABSL_ENABLE_INSTALL) ...@@ -174,5 +174,5 @@ if(ABSL_ENABLE_INSTALL)
PATTERN "*.h" PATTERN "*.h"
PATTERN "copts" EXCLUDE PATTERN "copts" EXCLUDE
PATTERN "testdata" EXCLUDE PATTERN "testdata" EXCLUDE
) )
endif() # ABSL_ENABLE_INSTALL endif() # ABSL_ENABLE_INSTALL
...@@ -943,9 +943,10 @@ void c_partial_sort( ...@@ -943,9 +943,10 @@ void c_partial_sort(
// c_partial_sort_copy() // c_partial_sort_copy()
// //
// Container-based version of the <algorithm> `std::partial_sort_copy()` // Container-based version of the <algorithm> `std::partial_sort_copy()`
// function to sort elements within a container such that elements before // function to sort the elements in the given range `result` within the larger
// `middle` are sorted in ascending order, and return the result within an // `sequence` in ascending order (and using `result` as the output parameter).
// iterator. // At most min(result.last - result.first, sequence.last - sequence.first)
// elements from the sequence will be stored in the result.
template <typename C, typename RandomAccessContainer> template <typename C, typename RandomAccessContainer>
container_algorithm_internal::ContainerIter<RandomAccessContainer> container_algorithm_internal::ContainerIter<RandomAccessContainer>
c_partial_sort_copy(const C& sequence, RandomAccessContainer& result) { c_partial_sort_copy(const C& sequence, RandomAccessContainer& result) {
......
...@@ -115,10 +115,18 @@ cc_library( ...@@ -115,10 +115,18 @@ cc_library(
cc_library( cc_library(
name = "dynamic_annotations", name = "dynamic_annotations",
srcs = ["dynamic_annotations.cc"], srcs = [
hdrs = ["dynamic_annotations.h"], "dynamic_annotations.cc",
"internal/dynamic_annotations.h",
],
hdrs = [
"dynamic_annotations.h",
],
copts = ABSL_DEFAULT_COPTS, copts = ABSL_DEFAULT_COPTS,
linkopts = ABSL_DEFAULT_LINKOPTS, linkopts = ABSL_DEFAULT_LINKOPTS,
deps = [
":config",
],
) )
cc_library( cc_library(
......
...@@ -106,8 +106,11 @@ absl_cc_library( ...@@ -106,8 +106,11 @@ absl_cc_library(
"dynamic_annotations.h" "dynamic_annotations.h"
SRCS SRCS
"dynamic_annotations.cc" "dynamic_annotations.cc"
"internal/dynamic_annotations.h"
COPTS COPTS
${ABSL_DEFAULT_COPTS} ${ABSL_DEFAULT_COPTS}
DEPS
absl::config
PUBLIC PUBLIC
) )
......
...@@ -17,72 +17,17 @@ ...@@ -17,72 +17,17 @@
#include "absl/base/dynamic_annotations.h" #include "absl/base/dynamic_annotations.h"
#ifndef __has_feature // Compiler-based ThreadSanitizer defines
#define __has_feature(x) 0 // DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL = 1
#endif // and provides its own definitions of the functions.
/* Compiler-based ThreadSanitizer defines
DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL = 1
and provides its own definitions of the functions. */
#ifndef DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL #ifndef DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL
# define DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL 0 # define DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL 0
#endif #endif
/* Each function is empty and called (via a macro) only in debug mode.
The arguments are captured by dynamic tools at runtime. */
#if DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL == 0 && !defined(__native_client__) #if DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL == 0 && !defined(__native_client__)
#if __has_feature(memory_sanitizer)
#include <sanitizer/msan_interface.h>
#endif
#ifdef __cplusplus
extern "C" { extern "C" {
#endif
void AnnotateRWLockCreate(const char *, int,
const volatile void *){}
void AnnotateRWLockDestroy(const char *, int,
const volatile void *){}
void AnnotateRWLockAcquired(const char *, int,
const volatile void *, long){}
void AnnotateRWLockReleased(const char *, int,
const volatile void *, long){}
void AnnotateBenignRace(const char *, int,
const volatile void *,
const char *){}
void AnnotateBenignRaceSized(const char *, int,
const volatile void *,
size_t,
const char *) {}
void AnnotateThreadName(const char *, int,
const char *){}
void AnnotateIgnoreReadsBegin(const char *, int){}
void AnnotateIgnoreReadsEnd(const char *, int){}
void AnnotateIgnoreWritesBegin(const char *, int){}
void AnnotateIgnoreWritesEnd(const char *, int){}
void AnnotateEnableRaceDetection(const char *, int, int){}
void AnnotateMemoryIsInitialized(const char *, int,
const volatile void *mem, size_t size) {
#if __has_feature(memory_sanitizer)
__msan_unpoison(mem, size);
#else
(void)mem;
(void)size;
#endif
}
void AnnotateMemoryIsUninitialized(const char *, int,
const volatile void *mem, size_t size) {
#if __has_feature(memory_sanitizer)
__msan_allocated_memory(mem, size);
#else
(void)mem;
(void)size;
#endif
}
static int GetRunningOnValgrind(void) { static int GetRunningOnValgrind(void) {
#ifdef RUNNING_ON_VALGRIND #ifdef RUNNING_ON_VALGRIND
...@@ -95,21 +40,21 @@ static int GetRunningOnValgrind(void) { ...@@ -95,21 +40,21 @@ static int GetRunningOnValgrind(void) {
return 0; return 0;
} }
/* See the comments in dynamic_annotations.h */ // See the comments in dynamic_annotations.h
int RunningOnValgrind(void) { int RunningOnValgrind(void) {
static volatile int running_on_valgrind = -1; static volatile int running_on_valgrind = -1;
int local_running_on_valgrind = running_on_valgrind; int local_running_on_valgrind = running_on_valgrind;
/* C doesn't have thread-safe initialization of statics, and we // C doesn't have thread-safe initialization of statics, and we
don't want to depend on pthread_once here, so hack it. */ // don't want to depend on pthread_once here, so hack it.
ANNOTATE_BENIGN_RACE(&running_on_valgrind, "safe hack"); ANNOTATE_BENIGN_RACE(&running_on_valgrind, "safe hack");
if (local_running_on_valgrind == -1) if (local_running_on_valgrind == -1)
running_on_valgrind = local_running_on_valgrind = GetRunningOnValgrind(); running_on_valgrind = local_running_on_valgrind = GetRunningOnValgrind();
return local_running_on_valgrind; return local_running_on_valgrind;
} }
/* See the comments in dynamic_annotations.h */ // See the comments in dynamic_annotations.h
double ValgrindSlowdown(void) { double ValgrindSlowdown(void) {
/* Same initialization hack as in RunningOnValgrind(). */ // Same initialization hack as in RunningOnValgrind().
static volatile double slowdown = 0.0; static volatile double slowdown = 0.0;
double local_slowdown = slowdown; double local_slowdown = slowdown;
ANNOTATE_BENIGN_RACE(&slowdown, "safe hack"); ANNOTATE_BENIGN_RACE(&slowdown, "safe hack");
...@@ -123,7 +68,5 @@ double ValgrindSlowdown(void) { ...@@ -123,7 +68,5 @@ double ValgrindSlowdown(void) {
return local_slowdown; return local_slowdown;
} }
#ifdef __cplusplus
} // extern "C" } // extern "C"
#endif #endif // DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL == 0
#endif /* DYNAMIC_ANNOTATIONS_EXTERNAL_IMPL == 0 */
...@@ -114,9 +114,7 @@ cc_library( ...@@ -114,9 +114,7 @@ cc_library(
visibility = ["//visibility:private"], visibility = ["//visibility:private"],
deps = [ deps = [
"//absl/base:config", "//absl/base:config",
"//absl/base:core_headers",
"//absl/base:fast_type_id", "//absl/base:fast_type_id",
"//absl/strings",
], ],
) )
...@@ -132,6 +130,9 @@ cc_library( ...@@ -132,6 +130,9 @@ cc_library(
linkopts = ABSL_DEFAULT_LINKOPTS, linkopts = ABSL_DEFAULT_LINKOPTS,
deps = [ deps = [
":commandlineflag_internal", ":commandlineflag_internal",
"//absl/base:config",
"//absl/base:fast_type_id",
"//absl/strings",
"//absl/types:optional", "//absl/types:optional",
], ],
) )
...@@ -149,7 +150,12 @@ cc_library( ...@@ -149,7 +150,12 @@ cc_library(
visibility = [ visibility = [
"//absl/flags:__pkg__", "//absl/flags:__pkg__",
], ],
deps = [":commandlineflag"], deps = [
":commandlineflag",
":commandlineflag_internal",
"//absl/base:config",
"//absl/strings",
],
) )
cc_library( cc_library(
...@@ -193,6 +199,7 @@ cc_library( ...@@ -193,6 +199,7 @@ cc_library(
visibility = ["//absl/base:__subpackages__"], visibility = ["//absl/base:__subpackages__"],
deps = [ deps = [
":commandlineflag", ":commandlineflag",
":commandlineflag_internal",
":config", ":config",
":marshalling", ":marshalling",
":registry", ":registry",
...@@ -203,6 +210,7 @@ cc_library( ...@@ -203,6 +210,7 @@ cc_library(
"//absl/meta:type_traits", "//absl/meta:type_traits",
"//absl/strings", "//absl/strings",
"//absl/synchronization", "//absl/synchronization",
"//absl/utility",
], ],
) )
...@@ -220,7 +228,6 @@ cc_library( ...@@ -220,7 +228,6 @@ cc_library(
deps = [ deps = [
":config", ":config",
":flag_internal", ":flag_internal",
":marshalling",
":registry", ":registry",
"//absl/base", "//absl/base",
"//absl/base:config", "//absl/base:config",
...@@ -287,6 +294,7 @@ cc_library( ...@@ -287,6 +294,7 @@ cc_library(
linkopts = ABSL_DEFAULT_LINKOPTS, linkopts = ABSL_DEFAULT_LINKOPTS,
deps = [ deps = [
":commandlineflag", ":commandlineflag",
":commandlineflag_internal",
":config", ":config",
":flag", ":flag",
":flag_internal", ":flag_internal",
...@@ -315,6 +323,7 @@ cc_test( ...@@ -315,6 +323,7 @@ cc_test(
linkopts = ABSL_DEFAULT_LINKOPTS, linkopts = ABSL_DEFAULT_LINKOPTS,
deps = [ deps = [
":commandlineflag", ":commandlineflag",
":commandlineflag_internal",
":config", ":config",
":flag", ":flag",
":private_handle_accessor", ":private_handle_accessor",
...@@ -352,6 +361,7 @@ cc_test( ...@@ -352,6 +361,7 @@ cc_test(
":config", ":config",
":flag", ":flag",
":flag_internal", ":flag_internal",
":marshalling",
":registry", ":registry",
"//absl/base:core_headers", "//absl/base:core_headers",
"//absl/base:malloc_internal", "//absl/base:malloc_internal",
...@@ -372,6 +382,8 @@ cc_binary( ...@@ -372,6 +382,8 @@ cc_binary(
visibility = ["//visibility:private"], visibility = ["//visibility:private"],
deps = [ deps = [
":flag", ":flag",
":marshalling",
"//absl/strings",
"//absl/time", "//absl/time",
"//absl/types:optional", "//absl/types:optional",
"@com_github_google_benchmark//:benchmark_main", "@com_github_google_benchmark//:benchmark_main",
...@@ -450,8 +462,8 @@ cc_test( ...@@ -450,8 +462,8 @@ cc_test(
copts = ABSL_TEST_COPTS, copts = ABSL_TEST_COPTS,
linkopts = ABSL_DEFAULT_LINKOPTS, linkopts = ABSL_DEFAULT_LINKOPTS,
deps = [ deps = [
":commandlineflag_internal",
":flag", ":flag",
":marshalling",
":registry", ":registry",
"//absl/memory", "//absl/memory",
"@com_google_googletest//:gtest_main", "@com_google_googletest//:gtest_main",
...@@ -492,7 +504,6 @@ cc_test( ...@@ -492,7 +504,6 @@ cc_test(
":registry", ":registry",
":usage", ":usage",
":usage_internal", ":usage_internal",
"//absl/memory",
"//absl/strings", "//absl/strings",
"@com_google_googletest//:gtest", "@com_google_googletest//:gtest",
], ],
......
...@@ -103,9 +103,7 @@ absl_cc_library( ...@@ -103,9 +103,7 @@ absl_cc_library(
${ABSL_DEFAULT_LINKOPTS} ${ABSL_DEFAULT_LINKOPTS}
DEPS DEPS
absl::config absl::config
absl::core_headers
absl::fast_type_id absl::fast_type_id
absl::strings
) )
absl_cc_library( absl_cc_library(
...@@ -120,8 +118,11 @@ absl_cc_library( ...@@ -120,8 +118,11 @@ absl_cc_library(
LINKOPTS LINKOPTS
${ABSL_DEFAULT_LINKOPTS} ${ABSL_DEFAULT_LINKOPTS}
DEPS DEPS
absl::config
absl::fast_type_id
absl::flags_commandlineflag_internal absl::flags_commandlineflag_internal
absl::optional absl::optional
absl::strings
) )
# Internal-only target, do not depend on directly. # Internal-only target, do not depend on directly.
...@@ -137,7 +138,10 @@ absl_cc_library( ...@@ -137,7 +138,10 @@ absl_cc_library(
LINKOPTS LINKOPTS
${ABSL_DEFAULT_LINKOPTS} ${ABSL_DEFAULT_LINKOPTS}
DEPS DEPS
absl::config
absl::flags_commandlineflag absl::flags_commandlineflag
absl::flags_commandlineflag_internal
absl::strings
) )
# Internal-only target, do not depend on directly. # Internal-only target, do not depend on directly.
...@@ -180,11 +184,13 @@ absl_cc_library( ...@@ -180,11 +184,13 @@ absl_cc_library(
DEPS DEPS
absl::base absl::base
absl::config absl::config
absl::flags_commandlineflag_internal
absl::flags_config absl::flags_config
absl::flags_marshalling absl::flags_marshalling
absl::flags_registry absl::flags_registry
absl::synchronization absl::synchronization
absl::meta absl::meta
absl::utility
PUBLIC PUBLIC
) )
...@@ -205,7 +211,6 @@ absl_cc_library( ...@@ -205,7 +211,6 @@ absl_cc_library(
absl::flags_commandlineflag absl::flags_commandlineflag
absl::flags_config absl::flags_config
absl::flags_internal absl::flags_internal
absl::flags_marshalling
absl::flags_registry absl::flags_registry
absl::base absl::base
absl::core_headers absl::core_headers
...@@ -275,6 +280,7 @@ absl_cc_library( ...@@ -275,6 +280,7 @@ absl_cc_library(
absl::flags_config absl::flags_config
absl::flags absl::flags
absl::flags_commandlineflag absl::flags_commandlineflag
absl::flags_commandlineflag_internal
absl::flags_internal absl::flags_internal
absl::flags_private_handle_accessor absl::flags_private_handle_accessor
absl::flags_program_name absl::flags_program_name
...@@ -297,6 +303,7 @@ absl_cc_test( ...@@ -297,6 +303,7 @@ absl_cc_test(
DEPS DEPS
absl::flags absl::flags
absl::flags_commandlineflag absl::flags_commandlineflag
absl::flags_commandlineflag_internal
absl::flags_config absl::flags_config
absl::flags_private_handle_accessor absl::flags_private_handle_accessor
absl::flags_registry absl::flags_registry
...@@ -330,6 +337,7 @@ absl_cc_test( ...@@ -330,6 +337,7 @@ absl_cc_test(
absl::flags absl::flags
absl::flags_config absl::flags_config
absl::flags_internal absl::flags_internal
absl::flags_marshalling
absl::flags_registry absl::flags_registry
absl::strings absl::strings
absl::time absl::time
...@@ -399,8 +407,8 @@ absl_cc_test( ...@@ -399,8 +407,8 @@ absl_cc_test(
COPTS COPTS
${ABSL_TEST_COPTS} ${ABSL_TEST_COPTS}
DEPS DEPS
absl::flags_commandlineflag_internal
absl::flags absl::flags
absl::flags_marshalling
absl::flags_registry absl::flags_registry
absl::memory absl::memory
absl::strings absl::strings
...@@ -437,7 +445,6 @@ absl_cc_test( ...@@ -437,7 +445,6 @@ absl_cc_test(
absl::flags_parse absl::flags_parse
absl::flags_registry absl::flags_registry
absl::flags_usage absl::flags_usage
absl::memory
absl::strings absl::strings
gtest gtest
) )
...@@ -15,6 +15,12 @@ ...@@ -15,6 +15,12 @@
#include "absl/flags/commandlineflag.h" #include "absl/flags/commandlineflag.h"
#include <string>
#include "absl/base/config.h"
#include "absl/flags/internal/commandlineflag.h"
#include "absl/strings/string_view.h"
namespace absl { namespace absl {
ABSL_NAMESPACE_BEGIN ABSL_NAMESPACE_BEGIN
......
...@@ -26,7 +26,13 @@ ...@@ -26,7 +26,13 @@
#ifndef ABSL_FLAGS_COMMANDLINEFLAG_H_ #ifndef ABSL_FLAGS_COMMANDLINEFLAG_H_
#define ABSL_FLAGS_COMMANDLINEFLAG_H_ #define ABSL_FLAGS_COMMANDLINEFLAG_H_
#include <memory>
#include <string>
#include "absl/base/config.h"
#include "absl/base/internal/fast_type_id.h"
#include "absl/flags/internal/commandlineflag.h" #include "absl/flags/internal/commandlineflag.h"
#include "absl/strings/string_view.h"
#include "absl/types/optional.h" #include "absl/types/optional.h"
namespace absl { namespace absl {
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "absl/flags/flag.h" #include "absl/flags/flag.h"
#include "absl/flags/internal/commandlineflag.h"
#include "absl/flags/internal/private_handle_accessor.h" #include "absl/flags/internal/private_handle_accessor.h"
#include "absl/flags/internal/registry.h" #include "absl/flags/internal/registry.h"
#include "absl/flags/usage_config.h" #include "absl/flags/usage_config.h"
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#define ABSL_FLAGS_DECLARE_H_ #define ABSL_FLAGS_DECLARE_H_
#include "absl/base/config.h" #include "absl/base/config.h"
#include "absl/strings/string_view.h"
namespace absl { namespace absl {
ABSL_NAMESPACE_BEGIN ABSL_NAMESPACE_BEGIN
......
...@@ -33,13 +33,11 @@ ...@@ -33,13 +33,11 @@
#include <type_traits> #include <type_traits>
#include "absl/base/attributes.h" #include "absl/base/attributes.h"
#include "absl/base/casts.h"
#include "absl/base/config.h" #include "absl/base/config.h"
#include "absl/base/optimization.h"
#include "absl/flags/config.h" #include "absl/flags/config.h"
#include "absl/flags/declare.h"
#include "absl/flags/internal/flag.h" #include "absl/flags/internal/flag.h"
#include "absl/flags/internal/registry.h" #include "absl/flags/internal/registry.h"
#include "absl/flags/marshalling.h"
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
namespace absl { namespace absl {
...@@ -150,6 +148,8 @@ class Flag { ...@@ -150,6 +148,8 @@ class Flag {
void Set(const T& v) { GetImpl().Set(v); } void Set(const T& v) { GetImpl().Set(v); }
void InvokeCallback() { GetImpl().InvokeCallback(); } void InvokeCallback() { GetImpl().InvokeCallback(); }
const CommandLineFlag& Reflect() const { return GetImpl().Reflect(); }
// The data members are logically private, but they need to be public for // The data members are logically private, but they need to be public for
// this to be an aggregate type. // this to be an aggregate type.
const char* name_; const char* name_;
...@@ -204,6 +204,21 @@ void SetFlag(absl::Flag<T>* flag, const V& v) { ...@@ -204,6 +204,21 @@ void SetFlag(absl::Flag<T>* flag, const V& v) {
flag->Set(value); flag->Set(value);
} }
// GetFlagReflectionHandle()
//
// Returns the reflection handle corresponding to specified Abseil Flag
// instance. Use this handle to access flag's reflection information, like name,
// location, default value etc.
//
// Example:
//
// std::string = absl::GetFlagReflectionHandle(FLAGS_count).DefaultValue();
template <typename T>
const CommandLineFlag& GetFlagReflectionHandle(const absl::Flag<T>& f) {
return f.Reflect();
}
ABSL_NAMESPACE_END ABSL_NAMESPACE_END
} // namespace absl } // namespace absl
......
...@@ -13,7 +13,14 @@ ...@@ -13,7 +13,14 @@
// See the License for the specific language governing permissions and // See the License for the specific language governing permissions and
// limitations under the License. // limitations under the License.
#include <stdint.h>
#include <string>
#include <vector>
#include "absl/flags/flag.h" #include "absl/flags/flag.h"
#include "absl/flags/marshalling.h"
#include "absl/strings/string_view.h"
#include "absl/time/time.h" #include "absl/time/time.h"
#include "absl/types/optional.h" #include "absl/types/optional.h"
#include "benchmark/benchmark.h" #include "benchmark/benchmark.h"
......
...@@ -16,13 +16,8 @@ ...@@ -16,13 +16,8 @@
#ifndef ABSL_FLAGS_INTERNAL_COMMANDLINEFLAG_H_ #ifndef ABSL_FLAGS_INTERNAL_COMMANDLINEFLAG_H_
#define ABSL_FLAGS_INTERNAL_COMMANDLINEFLAG_H_ #define ABSL_FLAGS_INTERNAL_COMMANDLINEFLAG_H_
#include <memory>
#include <string>
#include "absl/base/config.h" #include "absl/base/config.h"
#include "absl/base/internal/fast_type_id.h" #include "absl/base/internal/fast_type_id.h"
#include "absl/base/macros.h"
#include "absl/strings/string_view.h"
namespace absl { namespace absl {
ABSL_NAMESPACE_BEGIN ABSL_NAMESPACE_BEGIN
...@@ -33,7 +28,7 @@ namespace flags_internal { ...@@ -33,7 +28,7 @@ namespace flags_internal {
// cases this id is enough to uniquely identify the flag's value type. In a few // cases this id is enough to uniquely identify the flag's value type. In a few
// cases we'll have to resort to using actual RTTI implementation if it is // cases we'll have to resort to using actual RTTI implementation if it is
// available. // available.
using FlagFastTypeId = base_internal::FastTypeIdType; using FlagFastTypeId = absl::base_internal::FastTypeIdType;
// Options that control SetCommandLineOptionWithMode. // Options that control SetCommandLineOptionWithMode.
enum FlagSettingMode { enum FlagSettingMode {
......
...@@ -15,21 +15,26 @@ ...@@ -15,21 +15,26 @@
#include "absl/flags/internal/flag.h" #include "absl/flags/internal/flag.h"
#include <assert.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <array>
#include <atomic> #include <atomic>
#include <memory> #include <memory>
#include <new>
#include <string> #include <string>
#include <vector> #include <typeinfo>
#include "absl/base/attributes.h" #include "absl/base/call_once.h"
#include "absl/base/casts.h" #include "absl/base/casts.h"
#include "absl/base/config.h" #include "absl/base/config.h"
#include "absl/base/const_init.h"
#include "absl/base/optimization.h" #include "absl/base/optimization.h"
#include "absl/flags/config.h"
#include "absl/flags/internal/commandlineflag.h"
#include "absl/flags/usage_config.h" #include "absl/flags/usage_config.h"
#include "absl/memory/memory.h"
#include "absl/strings/str_cat.h" #include "absl/strings/str_cat.h"
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "absl/synchronization/mutex.h" #include "absl/synchronization/mutex.h"
......
...@@ -16,31 +16,36 @@ ...@@ -16,31 +16,36 @@
#ifndef ABSL_FLAGS_INTERNAL_FLAG_H_ #ifndef ABSL_FLAGS_INTERNAL_FLAG_H_
#define ABSL_FLAGS_INTERNAL_FLAG_H_ #define ABSL_FLAGS_INTERNAL_FLAG_H_
#include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include <atomic> #include <atomic>
#include <cstring> #include <cstring>
#include <memory> #include <memory>
#include <new>
#include <string> #include <string>
#include <type_traits> #include <type_traits>
#include <typeinfo> #include <typeinfo>
#include "absl/base/attributes.h"
#include "absl/base/call_once.h" #include "absl/base/call_once.h"
#include "absl/base/config.h" #include "absl/base/config.h"
#include "absl/base/optimization.h"
#include "absl/base/thread_annotations.h" #include "absl/base/thread_annotations.h"
#include "absl/flags/commandlineflag.h" #include "absl/flags/commandlineflag.h"
#include "absl/flags/config.h" #include "absl/flags/config.h"
#include "absl/flags/internal/commandlineflag.h"
#include "absl/flags/internal/registry.h" #include "absl/flags/internal/registry.h"
#include "absl/flags/marshalling.h" #include "absl/flags/marshalling.h"
#include "absl/memory/memory.h"
#include "absl/meta/type_traits.h" #include "absl/meta/type_traits.h"
#include "absl/strings/str_cat.h"
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
#include "absl/synchronization/mutex.h" #include "absl/synchronization/mutex.h"
#include "absl/utility/utility.h"
namespace absl { namespace absl {
ABSL_NAMESPACE_BEGIN ABSL_NAMESPACE_BEGIN
///////////////////////////////////////////////////////////////////////////////
// Forward declaration of absl::Flag<T> public API. // Forward declaration of absl::Flag<T> public API.
namespace flags_internal { namespace flags_internal {
template <typename T> template <typename T>
...@@ -64,12 +69,15 @@ void SetFlag(absl::Flag<T>* flag, const T& v); ...@@ -64,12 +69,15 @@ void SetFlag(absl::Flag<T>* flag, const T& v);
template <typename T, typename V> template <typename T, typename V>
void SetFlag(absl::Flag<T>* flag, const V& v); void SetFlag(absl::Flag<T>* flag, const V& v);
namespace flags_internal { template <typename U>
const CommandLineFlag& GetFlagReflectionHandle(const absl::Flag<U>& f);
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Flag value type operations, eg., parsing, copying, etc. are provided // Flag value type operations, eg., parsing, copying, etc. are provided
// by function specific to that type with a signature matching FlagOpFn. // by function specific to that type with a signature matching FlagOpFn.
namespace flags_internal {
enum class FlagOp { enum class FlagOp {
kAlloc, kAlloc,
kDelete, kDelete,
...@@ -659,6 +667,13 @@ class Flag { ...@@ -659,6 +667,13 @@ class Flag {
impl_.Write(&v); impl_.Write(&v);
} }
template <typename U>
friend const CommandLineFlag& absl::GetFlagReflectionHandle(
const absl::Flag<U>& f);
// Access to the reflection.
const CommandLineFlag& Reflect() const { return impl_; }
// Flag's data // Flag's data
// The implementation depends on value_ field to be placed exactly after the // The implementation depends on value_ field to be placed exactly after the
// impl_ field, so that impl_ can figure out the offset to the value and // impl_ field, so that impl_ can figure out the offset to the value and
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "absl/base/config.h" #include "absl/base/config.h"
#include "absl/flags/declare.h" #include "absl/flags/declare.h"
#include "absl/strings/string_view.h"
ABSL_DECLARE_FLAG(std::vector<std::string>, flagfile); ABSL_DECLARE_FLAG(std::vector<std::string>, flagfile);
ABSL_DECLARE_FLAG(std::vector<std::string>, fromenv); ABSL_DECLARE_FLAG(std::vector<std::string>, fromenv);
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#define ABSL_FLAGS_INTERNAL_PATH_UTIL_H_ #define ABSL_FLAGS_INTERNAL_PATH_UTIL_H_
#include "absl/base/config.h" #include "absl/base/config.h"
#include "absl/strings/match.h"
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
namespace absl { namespace absl {
......
...@@ -15,6 +15,14 @@ ...@@ -15,6 +15,14 @@
#include "absl/flags/internal/private_handle_accessor.h" #include "absl/flags/internal/private_handle_accessor.h"
#include <memory>
#include <string>
#include "absl/base/config.h"
#include "absl/flags/commandlineflag.h"
#include "absl/flags/internal/commandlineflag.h"
#include "absl/strings/string_view.h"
namespace absl { namespace absl {
ABSL_NAMESPACE_BEGIN ABSL_NAMESPACE_BEGIN
namespace flags_internal { namespace flags_internal {
......
...@@ -16,7 +16,13 @@ ...@@ -16,7 +16,13 @@
#ifndef ABSL_FLAGS_INTERNAL_PRIVATE_HANDLE_ACCESSOR_H_ #ifndef ABSL_FLAGS_INTERNAL_PRIVATE_HANDLE_ACCESSOR_H_
#define ABSL_FLAGS_INTERNAL_PRIVATE_HANDLE_ACCESSOR_H_ #define ABSL_FLAGS_INTERNAL_PRIVATE_HANDLE_ACCESSOR_H_
#include <memory>
#include <string>
#include "absl/base/config.h"
#include "absl/flags/commandlineflag.h" #include "absl/flags/commandlineflag.h"
#include "absl/flags/internal/commandlineflag.h"
#include "absl/strings/string_view.h"
namespace absl { namespace absl {
ABSL_NAMESPACE_BEGIN ABSL_NAMESPACE_BEGIN
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "absl/base/internal/raw_logging.h" #include "absl/base/internal/raw_logging.h"
#include "absl/base/thread_annotations.h" #include "absl/base/thread_annotations.h"
#include "absl/flags/commandlineflag.h" #include "absl/flags/commandlineflag.h"
#include "absl/flags/internal/commandlineflag.h"
#include "absl/flags/internal/private_handle_accessor.h" #include "absl/flags/internal/private_handle_accessor.h"
#include "absl/flags/usage_config.h" #include "absl/flags/usage_config.h"
#include "absl/strings/str_cat.h" #include "absl/strings/str_cat.h"
......
...@@ -17,11 +17,9 @@ ...@@ -17,11 +17,9 @@
#define ABSL_FLAGS_INTERNAL_REGISTRY_H_ #define ABSL_FLAGS_INTERNAL_REGISTRY_H_
#include <functional> #include <functional>
#include <map>
#include <string>
#include "absl/base/config.h" #include "absl/base/config.h"
#include "absl/base/macros.h" #include "absl/flags/commandlineflag.h"
#include "absl/flags/internal/commandlineflag.h" #include "absl/flags/internal/commandlineflag.h"
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
...@@ -30,8 +28,6 @@ ...@@ -30,8 +28,6 @@
namespace absl { namespace absl {
ABSL_NAMESPACE_BEGIN ABSL_NAMESPACE_BEGIN
class CommandLineFlag;
namespace flags_internal { namespace flags_internal {
CommandLineFlag* FindCommandLineFlag(absl::string_view name); CommandLineFlag* FindCommandLineFlag(absl::string_view name);
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include "absl/base/config.h" #include "absl/base/config.h"
#include "absl/flags/commandlineflag.h" #include "absl/flags/commandlineflag.h"
#include "absl/flags/internal/commandlineflag.h"
#include "absl/flags/internal/registry.h" #include "absl/flags/internal/registry.h"
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "absl/flags/flag.h" #include "absl/flags/flag.h"
#include "absl/flags/internal/commandlineflag.h"
#include "absl/flags/internal/registry.h" #include "absl/flags/internal/registry.h"
#include "absl/flags/marshalling.h"
#include "absl/memory/memory.h" #include "absl/memory/memory.h"
ABSL_FLAG(int, int_flag, 1, "int_flag help"); ABSL_FLAG(int, int_flag, 1, "int_flag help");
......
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
#include "absl/flags/internal/usage.h" #include "absl/flags/internal/usage.h"
#include <stdint.h>
#include <functional> #include <functional>
#include <map> #include <map>
#include <ostream> #include <ostream>
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include <string> #include <string>
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "absl/flags/declare.h"
#include "absl/flags/flag.h" #include "absl/flags/flag.h"
#include "absl/flags/internal/parse.h" #include "absl/flags/internal/parse.h"
#include "absl/flags/internal/path_util.h" #include "absl/flags/internal/path_util.h"
...@@ -29,7 +28,6 @@ ...@@ -29,7 +28,6 @@
#include "absl/flags/internal/registry.h" #include "absl/flags/internal/registry.h"
#include "absl/flags/usage.h" #include "absl/flags/usage.h"
#include "absl/flags/usage_config.h" #include "absl/flags/usage_config.h"
#include "absl/memory/memory.h"
#include "absl/strings/match.h" #include "absl/strings/match.h"
#include "absl/strings/string_view.h" #include "absl/strings/string_view.h"
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include "absl/flags/commandlineflag.h" #include "absl/flags/commandlineflag.h"
#include "absl/flags/config.h" #include "absl/flags/config.h"
#include "absl/flags/flag.h" #include "absl/flags/flag.h"
#include "absl/flags/internal/commandlineflag.h"
#include "absl/flags/internal/flag.h" #include "absl/flags/internal/flag.h"
#include "absl/flags/internal/parse.h" #include "absl/flags/internal/parse.h"
#include "absl/flags/internal/private_handle_accessor.h" #include "absl/flags/internal/private_handle_accessor.h"
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#ifndef ABSL_FLAGS_PARSE_H_ #ifndef ABSL_FLAGS_PARSE_H_
#define ABSL_FLAGS_PARSE_H_ #define ABSL_FLAGS_PARSE_H_
#include <string>
#include <vector> #include <vector>
#include "absl/base/config.h" #include "absl/base/config.h"
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include "absl/flags/usage_config.h" #include "absl/flags/usage_config.h"
#include <functional>
#include <iostream> #include <iostream>
#include <string> #include <string>
......
...@@ -98,26 +98,26 @@ bool ParseLenient(string_view s, CivilT* c) { ...@@ -98,26 +98,26 @@ bool ParseLenient(string_view s, CivilT* c) {
} // namespace } // namespace
std::string FormatCivilTime(CivilSecond c) { std::string FormatCivilTime(CivilSecond c) {
return FormatYearAnd("-%m-%dT%H:%M:%S", c); return FormatYearAnd("-%m-%d%ET%H:%M:%S", c);
} }
std::string FormatCivilTime(CivilMinute c) { std::string FormatCivilTime(CivilMinute c) {
return FormatYearAnd("-%m-%dT%H:%M", c); return FormatYearAnd("-%m-%d%ET%H:%M", c);
} }
std::string FormatCivilTime(CivilHour c) { std::string FormatCivilTime(CivilHour c) {
return FormatYearAnd("-%m-%dT%H", c); return FormatYearAnd("-%m-%d%ET%H", c);
} }
std::string FormatCivilTime(CivilDay c) { return FormatYearAnd("-%m-%d", c); } std::string FormatCivilTime(CivilDay c) { return FormatYearAnd("-%m-%d", c); }
std::string FormatCivilTime(CivilMonth c) { return FormatYearAnd("-%m", c); } std::string FormatCivilTime(CivilMonth c) { return FormatYearAnd("-%m", c); }
std::string FormatCivilTime(CivilYear c) { return FormatYearAnd("", c); } std::string FormatCivilTime(CivilYear c) { return FormatYearAnd("", c); }
bool ParseCivilTime(string_view s, CivilSecond* c) { bool ParseCivilTime(string_view s, CivilSecond* c) {
return ParseYearAnd("-%m-%dT%H:%M:%S", s, c); return ParseYearAnd("-%m-%d%ET%H:%M:%S", s, c);
} }
bool ParseCivilTime(string_view s, CivilMinute* c) { bool ParseCivilTime(string_view s, CivilMinute* c) {
return ParseYearAnd("-%m-%dT%H:%M", s, c); return ParseYearAnd("-%m-%d%ET%H:%M", s, c);
} }
bool ParseCivilTime(string_view s, CivilHour* c) { bool ParseCivilTime(string_view s, CivilHour* c) {
return ParseYearAnd("-%m-%dT%H", s, c); return ParseYearAnd("-%m-%d%ET%H", s, c);
} }
bool ParseCivilTime(string_view s, CivilDay* c) { bool ParseCivilTime(string_view s, CivilDay* c) {
return ParseYearAnd("-%m-%d", s, c); return ParseYearAnd("-%m-%d", s, c);
......
...@@ -27,14 +27,11 @@ namespace cctz = absl::time_internal::cctz; ...@@ -27,14 +27,11 @@ namespace cctz = absl::time_internal::cctz;
namespace absl { namespace absl {
ABSL_NAMESPACE_BEGIN ABSL_NAMESPACE_BEGIN
ABSL_DLL extern const char RFC3339_full[] = ABSL_DLL extern const char RFC3339_full[] = "%Y-%m-%d%ET%H:%M:%E*S%Ez";
"%Y-%m-%dT%H:%M:%E*S%Ez"; ABSL_DLL extern const char RFC3339_sec[] = "%Y-%m-%d%ET%H:%M:%S%Ez";
ABSL_DLL extern const char RFC3339_sec[] = "%Y-%m-%dT%H:%M:%S%Ez";
ABSL_DLL extern const char RFC1123_full[] = "%a, %d %b %E4Y %H:%M:%S %z";
ABSL_DLL extern const char RFC1123_full[] = ABSL_DLL extern const char RFC1123_no_wday[] = "%d %b %E4Y %H:%M:%S %z";
"%a, %d %b %E4Y %H:%M:%S %z";
ABSL_DLL extern const char RFC1123_no_wday[] =
"%d %b %E4Y %H:%M:%S %z";
namespace { namespace {
......
...@@ -26,7 +26,7 @@ const char* const kFormats[] = { ...@@ -26,7 +26,7 @@ const char* const kFormats[] = {
absl::RFC1123_no_wday, // 1 absl::RFC1123_no_wday, // 1
absl::RFC3339_full, // 2 absl::RFC3339_full, // 2
absl::RFC3339_sec, // 3 absl::RFC3339_sec, // 3
"%Y-%m-%dT%H:%M:%S", // 4 "%Y-%m-%d%ET%H:%M:%S", // 4
"%Y-%m-%d", // 5 "%Y-%m-%d", // 5
}; };
const int kNumFormats = sizeof(kFormats) / sizeof(kFormats[0]); const int kNumFormats = sizeof(kFormats) / sizeof(kFormats[0]);
......
...@@ -322,7 +322,8 @@ inline std::string format(const std::string& fmt, const time_point<D>& tp, ...@@ -322,7 +322,8 @@ inline std::string format(const std::string& fmt, const time_point<D>& tp,
// returns the corresponding time_point. Uses strftime()-like formatting // returns the corresponding time_point. Uses strftime()-like formatting
// options, with the same extensions as cctz::format(), but with the // options, with the same extensions as cctz::format(), but with the
// exceptions that %E#S is interpreted as %E*S, and %E#f as %E*f. %Ez // exceptions that %E#S is interpreted as %E*S, and %E#f as %E*f. %Ez
// and %E*z also accept the same inputs. %ET accepts either 'T' or 't'. // and %E*z also accept the same inputs, which (along with %z) includes
// 'z' and 'Z' as synonyms for +00:00. %ET accepts either 'T' or 't'.
// //
// %Y consumes as many numeric characters as it can, so the matching data // %Y consumes as many numeric characters as it can, so the matching data
// should always be terminated with a non-numeric. %E4Y always consumes // should always be terminated with a non-numeric. %E4Y always consumes
......
...@@ -1203,18 +1203,15 @@ struct tm ToTM(Time t, TimeZone tz); ...@@ -1203,18 +1203,15 @@ struct tm ToTM(Time t, TimeZone tz);
// time with UTC offset. Also note the use of "%Y": RFC3339 mandates that // time with UTC offset. Also note the use of "%Y": RFC3339 mandates that
// years have exactly four digits, but we allow them to take their natural // years have exactly four digits, but we allow them to take their natural
// width. // width.
ABSL_DLL extern const char ABSL_DLL extern const char RFC3339_full[]; // %Y-%m-%d%ET%H:%M:%E*S%Ez
RFC3339_full[]; // %Y-%m-%dT%H:%M:%E*S%Ez ABSL_DLL extern const char RFC3339_sec[]; // %Y-%m-%d%ET%H:%M:%S%Ez
ABSL_DLL extern const char RFC3339_sec[]; // %Y-%m-%dT%H:%M:%S%Ez
// RFC1123_full // RFC1123_full
// RFC1123_no_wday // RFC1123_no_wday
// //
// FormatTime()/ParseTime() format specifiers for RFC1123 date/time strings. // FormatTime()/ParseTime() format specifiers for RFC1123 date/time strings.
ABSL_DLL extern const char ABSL_DLL extern const char RFC1123_full[]; // %a, %d %b %E4Y %H:%M:%S %z
RFC1123_full[]; // %a, %d %b %E4Y %H:%M:%S %z ABSL_DLL extern const char RFC1123_no_wday[]; // %d %b %E4Y %H:%M:%S %z
ABSL_DLL extern const char
RFC1123_no_wday[]; // %d %b %E4Y %H:%M:%S %z
// FormatTime() // FormatTime()
// //
...@@ -1229,6 +1226,7 @@ ABSL_DLL extern const char ...@@ -1229,6 +1226,7 @@ ABSL_DLL extern const char
// - %E#f - Fractional seconds with # digits of precision // - %E#f - Fractional seconds with # digits of precision
// - %E*f - Fractional seconds with full precision (a literal '*') // - %E*f - Fractional seconds with full precision (a literal '*')
// - %E4Y - Four-character years (-999 ... -001, 0000, 0001 ... 9999) // - %E4Y - Four-character years (-999 ... -001, 0000, 0001 ... 9999)
// - %ET - The RFC3339 "date-time" separator "T"
// //
// Note that %E0S behaves like %S, and %E0f produces no characters. In // Note that %E0S behaves like %S, and %E0f produces no characters. In
// contrast %E*f always produces at least one digit, which may be '0'. // contrast %E*f always produces at least one digit, which may be '0'.
...@@ -1271,7 +1269,8 @@ inline std::ostream& operator<<(std::ostream& os, Time t) { ...@@ -1271,7 +1269,8 @@ inline std::ostream& operator<<(std::ostream& os, Time t) {
// returns the corresponding `absl::Time`. Uses strftime()-like formatting // returns the corresponding `absl::Time`. Uses strftime()-like formatting
// options, with the same extensions as FormatTime(), but with the // options, with the same extensions as FormatTime(), but with the
// exceptions that %E#S is interpreted as %E*S, and %E#f as %E*f. %Ez // exceptions that %E#S is interpreted as %E*S, and %E#f as %E*f. %Ez
// and %E*z also accept the same inputs. // and %E*z also accept the same inputs, which (along with %z) includes
// 'z' and 'Z' as synonyms for +00:00. %ET accepts either 'T' or 't'.
// //
// %Y consumes as many numeric characters as it can, so the matching data // %Y consumes as many numeric characters as it can, so the matching data
// should always be terminated with a non-numeric. %E4Y always consumes // should always be terminated with a non-numeric. %E4Y always consumes
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment