Skip to content

Commit

Permalink
Merge "Export of internal Abseil changes"
Browse files Browse the repository at this point in the history
  • Loading branch information
Xiaoyi Zhang authored and Gerrit Code Review committed Feb 21, 2020
2 parents f9b3d6e + 914ff44 commit 2a5633f
Show file tree
Hide file tree
Showing 13 changed files with 1,556 additions and 43 deletions.
2 changes: 1 addition & 1 deletion absl/container/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ absl_cc_library(
NAME
container_common
HDRS
"internal/commom.h"
"internal/common.h"
COPTS
${ABSL_DEFAULT_COPTS}
DEPS
Expand Down
48 changes: 28 additions & 20 deletions absl/flags/internal/flag.h
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,10 @@ template <typename T>
class Flag;

///////////////////////////////////////////////////////////////////////////////
// Type-specific 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.

enum FlagOp {
enum class FlagOp {
kDelete,
kClone,
kCopy,
Expand All @@ -58,26 +58,26 @@ enum FlagOp {
};
using FlagOpFn = void* (*)(FlagOp, const void*, void*, void*);

// The per-type function
// Flag value specific operations routine.
template <typename T>
void* FlagOps(FlagOp op, const void* v1, void* v2, void* v3) {
switch (op) {
case flags_internal::kDelete:
case FlagOp::kDelete:
delete static_cast<const T*>(v1);
return nullptr;
case flags_internal::kClone:
case FlagOp::kClone:
return new T(*static_cast<const T*>(v1));
case flags_internal::kCopy:
case FlagOp::kCopy:
*static_cast<T*>(v2) = *static_cast<const T*>(v1);
return nullptr;
case flags_internal::kCopyConstruct:
case FlagOp::kCopyConstruct:
new (v2) T(*static_cast<const T*>(v1));
return nullptr;
case flags_internal::kSizeof:
case FlagOp::kSizeof:
return reinterpret_cast<void*>(sizeof(T));
case flags_internal::kStaticTypeId:
case FlagOp::kStaticTypeId:
return reinterpret_cast<void*>(&FlagStaticTypeIdGen<T>);
case flags_internal::kParse: {
case FlagOp::kParse: {
// Initialize the temporary instance of type T based on current value in
// destination (which is going to be flag's default value).
T temp(*static_cast<T*>(v2));
Expand All @@ -88,7 +88,7 @@ void* FlagOps(FlagOp op, const void* v1, void* v2, void* v3) {
*static_cast<T*>(v2) = std::move(temp);
return v2;
}
case flags_internal::kUnparse:
case FlagOp::kUnparse:
*static_cast<std::string*>(v2) =
absl::UnparseFlag<T>(*static_cast<const T*>(v1));
return nullptr;
Expand All @@ -97,37 +97,45 @@ void* FlagOps(FlagOp op, const void* v1, void* v2, void* v3) {
}
}

// Functions that invoke flag-type-specific operations.
// Deletes memory interpreting obj as flag value type pointer.
inline void Delete(FlagOpFn op, const void* obj) {
op(flags_internal::kDelete, obj, nullptr, nullptr);
op(FlagOp::kDelete, obj, nullptr, nullptr);
}
// Makes a copy of flag value pointed by obj.
inline void* Clone(FlagOpFn op, const void* obj) {
return op(flags_internal::kClone, obj, nullptr, nullptr);
return op(FlagOp::kClone, obj, nullptr, nullptr);
}
// Copies src to dst interpreting as flag value type pointers.
inline void Copy(FlagOpFn op, const void* src, void* dst) {
op(flags_internal::kCopy, src, dst, nullptr);
op(FlagOp::kCopy, src, dst, nullptr);
}
// Construct a copy of flag value in a location pointed by dst
// based on src - pointer to the flag's value.
inline void CopyConstruct(FlagOpFn op, const void* src, void* dst) {
op(flags_internal::kCopyConstruct, src, dst, nullptr);
op(FlagOp::kCopyConstruct, src, dst, nullptr);
}
// Returns true if parsing of input text is successfull.
inline bool Parse(FlagOpFn op, absl::string_view text, void* dst,
std::string* error) {
return op(flags_internal::kParse, &text, dst, error) != nullptr;
return op(FlagOp::kParse, &text, dst, error) != nullptr;
}
// Returns string representing supplied value.
inline std::string Unparse(FlagOpFn op, const void* val) {
std::string result;
op(flags_internal::kUnparse, val, &result, nullptr);
op(FlagOp::kUnparse, val, &result, nullptr);
return result;
}
// Returns size of flag value type.
inline size_t Sizeof(FlagOpFn op) {
// This sequence of casts reverses the sequence from
// `flags_internal::FlagOps()`
return static_cast<size_t>(reinterpret_cast<intptr_t>(
op(flags_internal::kSizeof, nullptr, nullptr, nullptr)));
op(FlagOp::kSizeof, nullptr, nullptr, nullptr)));
}
// Returns static type id coresponding to the value type.
inline FlagStaticTypeId StaticTypeId(FlagOpFn op) {
return reinterpret_cast<FlagStaticTypeId>(
op(flags_internal::kStaticTypeId, nullptr, nullptr, nullptr));
op(FlagOp::kStaticTypeId, nullptr, nullptr, nullptr));
}

///////////////////////////////////////////////////////////////////////////////
Expand Down
65 changes: 65 additions & 0 deletions absl/status/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
#
# Copyright 2017 The Abseil Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

# This package contains `absl::Status`.
# It will expand later to have utilities around `Status` like `StatusOr`,
# `StatusBuilder` and macros.

load("@rules_cc//cc:defs.bzl", "cc_library", "cc_test")
load(
"//absl:copts/configure_copts.bzl",
"ABSL_DEFAULT_COPTS",
"ABSL_TEST_COPTS",
)

package(default_visibility = ["//visibility:public"])

licenses(["notice"]) # Apache 2.0

cc_library(
name = "status",
srcs = [
"status.cc",
"status_payload_printer.cc",
],
hdrs = [
"status.h",
"status_payload_printer.h",
],
copts = ABSL_DEFAULT_COPTS,
deps = [
"//absl/base:config",
"//absl/base:core_headers",
"//absl/base:raw_logging_internal",
"//absl/container:inlined_vector",
"//absl/debugging:stacktrace",
"//absl/debugging:symbolize",
"//absl/strings",
"//absl/strings:cord",
"//absl/strings:str_format",
"//absl/types:optional",
],
)

cc_test(
name = "status_test",
srcs = ["status_test.cc"],
copts = ABSL_TEST_COPTS,
deps = [
":status",
"//absl/strings",
"@com_google_googletest//:gtest_main",
],
)
52 changes: 52 additions & 0 deletions absl/status/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
#
# Copyright 2020 The Abseil Authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
absl_cc_library(
NAME
status
HDRS
"status.h"
SRCS
"status.cc"
"status_payload_printer.h"
"status_payload_printer.cc"
COPTS
${ABSL_DEFAULT_COPTS}
DEPS
absl::config
absl::core_headers
absl::raw_logging_internal
absl::inlined_vector
absl::stacktrace
absl::symbolize
absl::strings
absl::cord
absl::str_format
absl::optional
PUBLIC
)

absl_cc_test(
NAME
status_test
HDRS
"status_test.cc"
COPTS
${ABSL_TEST_COPTS}
DEPS
absl::status
absl::strings
gmock_main
)

0 comments on commit 2a5633f

Please sign in to comment.