Skip to content

Commit 574cbe1

Browse files
TristonianJoneskyessenov
TristonianJones
authored and
kyessenov
committed
Incorporate Macro Calls metadata into decompilation
PiperOrigin-RevId: 400845109
1 parent b82d6af commit 574cbe1

79 files changed

Lines changed: 209 additions & 209 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎base/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ cc_library(
1212
"testing.h",
1313
],
1414
deps = [
15+
"//internal:testing",
1516
"@com_google_absl//absl/status",
1617
"@com_google_absl//absl/status:statusor",
17-
"@com_google_googletest//:gtest_main",
1818
],
1919
)
2020

‎common/BUILD‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ cc_test(
4242
srcs = ["escaping_test.cc"],
4343
deps = [
4444
":escaping",
45-
"//base:testing",
45+
"//internal:testing",
4646
],
4747
)
4848

@@ -51,7 +51,7 @@ cc_library(
5151
srcs = ["overflow.cc"],
5252
hdrs = ["overflow.h"],
5353
deps = [
54-
"//base:status_macros",
54+
"//util/task:status",
5555
"@com_google_absl//absl/status",
5656
"@com_google_absl//absl/status:statusor",
5757
"@com_google_absl//absl/strings",
@@ -64,7 +64,7 @@ cc_test(
6464
srcs = ["overflow_test.cc"],
6565
deps = [
6666
":overflow",
67-
"//base:testing",
67+
"//internal:testing",
6868
"@com_google_absl//absl/functional:function_ref",
6969
"@com_google_absl//absl/status",
7070
"@com_google_absl//absl/time",

‎common/escaping_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "common/escaping.h"
22

3-
#include "base/testing.h"
3+
#include "gmock/gmock.h"
44
#include "gtest/gtest.h"
55

66
namespace google {

‎common/overflow.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
#include "absl/status/statusor.h"
88
#include "absl/strings/str_cat.h"
99
#include "absl/time/time.h"
10-
#include "base/status_macros.h"
10+
#include "util/task/status_macros.h"
1111

1212
namespace google::api::expr::common {
1313
namespace {

‎common/overflow_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <limits>
55
#include <vector>
66

7-
#include "base/testing.h"
7+
#include "gmock/gmock.h"
88
#include "gtest/gtest.h"
99
#include "absl/functional/function_ref.h"
1010
#include "absl/status/status.h"

‎eval/compiler/BUILD‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ cc_library(
1818
":constant_folding",
1919
":qualified_reference_resolver",
2020
":resolver",
21-
"//base:status_macros",
2221
"//eval/eval:comprehension_step",
2322
"//eval/eval:const_value_step",
2423
"//eval/eval:container_access_step",
@@ -39,6 +38,7 @@ cc_library(
3938
"//eval/public:cel_expression",
4039
"//eval/public:cel_function_registry",
4140
"//eval/public:source_position",
41+
"//util/task:status",
4242
"@com_google_absl//absl/container:node_hash_map",
4343
"@com_google_absl//absl/status",
4444
"@com_google_absl//absl/status:statusor",
@@ -55,8 +55,6 @@ cc_test(
5555
],
5656
deps = [
5757
":flat_expr_builder",
58-
"//base:status_macros",
59-
"//base:testing",
6058
"//eval/public:builtin_func_registrar",
6159
"//eval/public:cel_attribute",
6260
"//eval/public:cel_builtins",
@@ -69,6 +67,8 @@ cc_test(
6967
"//eval/public/containers:container_backed_map_impl",
7068
"//eval/public/structs:cel_proto_wrapper",
7169
"//eval/testutil:test_message_cc_proto",
70+
"//internal:testing",
71+
"//util/task:status",
7272
"@com_google_absl//absl/status",
7373
"@com_google_absl//absl/strings",
7474
"@com_google_absl//absl/types:span",
@@ -85,8 +85,6 @@ cc_test(
8585
],
8686
deps = [
8787
":flat_expr_builder",
88-
"//base:status_macros",
89-
"//base:testing",
9088
"//eval/public:builtin_func_registrar",
9189
"//eval/public:cel_attribute",
9290
"//eval/public:cel_builtins",
@@ -96,6 +94,8 @@ cc_test(
9694
"//eval/public:unknown_attribute_set",
9795
"//eval/public:unknown_set",
9896
"//eval/testutil:test_message_cc_proto",
97+
"//internal:testing",
98+
"//util/task:status",
9999
"@com_google_absl//absl/status",
100100
"@com_google_absl//absl/strings",
101101
"@com_google_googleapis//google/api/expr/v1alpha1:syntax_cc_proto",
@@ -131,11 +131,11 @@ cc_test(
131131
],
132132
deps = [
133133
":constant_folding",
134-
"//base:status_macros",
135-
"//base:testing",
136134
"//eval/public:builtin_func_registrar",
137135
"//eval/public:cel_function_registry",
138136
"//eval/testutil:test_message_cc_proto",
137+
"//internal:testing",
138+
"//util/task:status",
139139
"@com_google_absl//absl/strings",
140140
"@com_google_googleapis//google/api/expr/v1alpha1:syntax_cc_proto",
141141
"@com_google_protobuf//:protobuf",
@@ -152,11 +152,11 @@ cc_library(
152152
],
153153
deps = [
154154
":resolver",
155-
"//base:status_macros",
156155
"//eval/eval:const_value_step",
157156
"//eval/eval:expression_build_warning",
158157
"//eval/public:cel_builtins",
159158
"//eval/public:cel_function_registry",
159+
"//util/task:status",
160160
"@com_google_absl//absl/status",
161161
"@com_google_absl//absl/status:statusor",
162162
"@com_google_absl//absl/strings",
@@ -189,14 +189,14 @@ cc_test(
189189
],
190190
deps = [
191191
":qualified_reference_resolver",
192-
"//base:status_macros",
193-
"//base:testing",
194192
"//eval/public:builtin_func_registrar",
195193
"//eval/public:cel_builtins",
196194
"//eval/public:cel_function",
197195
"//eval/public:cel_function_registry",
198196
"//eval/public:cel_type_registry",
197+
"//internal:testing",
199198
"//testutil:util",
199+
"//util/task:status",
200200
"@com_google_absl//absl/status",
201201
"@com_google_absl//absl/types:optional",
202202
"@com_google_protobuf//:protobuf",
@@ -210,15 +210,15 @@ cc_test(
210210
],
211211
deps = [
212212
":flat_expr_builder",
213-
"//base:status_macros",
214-
"//base:testing",
215213
"//eval/public:activation",
216214
"//eval/public:cel_attribute",
217215
"//eval/public:cel_builtins",
218216
"//eval/public:cel_expression",
219217
"//eval/public:cel_options",
220218
"//eval/public:unknown_attribute_set",
221219
"//eval/public:unknown_set",
220+
"//internal:testing",
221+
"//util/task:status",
222222
"@com_google_absl//absl/status",
223223
"@com_google_absl//absl/strings",
224224
"@com_google_protobuf//:protobuf",
@@ -231,12 +231,12 @@ cc_test(
231231
srcs = ["resolver_test.cc"],
232232
deps = [
233233
":resolver",
234-
"//base:status_macros",
235-
"//base:testing",
236234
"//eval/public:cel_function",
237235
"//eval/public:cel_function_registry",
238236
"//eval/public:cel_type_registry",
239237
"//eval/testutil:test_message_cc_proto",
238+
"//internal:testing",
239+
"//util/task:status",
240240
"@com_google_absl//absl/status",
241241
],
242242
)

‎eval/compiler/constant_folding_test.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
#include "google/api/expr/v1alpha1/syntax.pb.h"
44
#include "google/protobuf/text_format.h"
55
#include "google/protobuf/util/message_differencer.h"
6-
#include "base/testing.h"
6+
#include "gmock/gmock.h"
77
#include "gtest/gtest.h"
88
#include "eval/public/builtin_func_registrar.h"
99
#include "eval/public/cel_function_registry.h"
1010
#include "eval/testutil/test_message.pb.h"
11-
#include "base/status_macros.h"
11+
#include "util/task/status_macros.h"
1212

1313
namespace google {
1414
namespace api {

‎eval/compiler/flat_expr_builder_comprehensions_test.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "google/api/expr/v1alpha1/syntax.pb.h"
22
#include "google/protobuf/field_mask.pb.h"
33
#include "google/protobuf/text_format.h"
4-
#include "base/testing.h"
4+
#include "gmock/gmock.h"
55
#include "gtest/gtest.h"
66
#include "absl/status/status.h"
77
#include "absl/strings/str_split.h"
@@ -16,7 +16,7 @@
1616
#include "eval/public/unknown_attribute_set.h"
1717
#include "eval/public/unknown_set.h"
1818
#include "eval/testutil/test_message.pb.h"
19-
#include "base/status_macros.h"
19+
#include "util/task/status_macros.h"
2020

2121
namespace google {
2222
namespace api {
@@ -29,7 +29,7 @@ using google::api::expr::v1alpha1::CheckedExpr;
2929
using google::api::expr::v1alpha1::Expr;
3030
using google::api::expr::v1alpha1::SourceInfo;
3131
using testing::HasSubstr;
32-
using cel_base::testing::StatusIs;
32+
using cel::internal::StatusIs;
3333

3434
// [1, 2].filter(x, [3, 4].all(y, x < y))
3535
const char kNestedComprehension[] = R"pb(

‎eval/compiler/flat_expr_builder_short_circuiting_conformance_test.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include <memory>
44

55
#include "google/protobuf/text_format.h"
6-
#include "base/testing.h"
6+
#include "gmock/gmock.h"
77
#include "gtest/gtest.h"
88
#include "absl/status/status.h"
99
#include "absl/strings/string_view.h"
@@ -16,7 +16,7 @@
1616
#include "eval/public/cel_options.h"
1717
#include "eval/public/unknown_attribute_set.h"
1818
#include "eval/public/unknown_set.h"
19-
#include "base/status_macros.h"
19+
#include "util/task/status_macros.h"
2020

2121
namespace google {
2222
namespace api {

‎eval/compiler/flat_expr_builder_test.cc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "google/api/expr/v1alpha1/syntax.pb.h"
77
#include "google/protobuf/field_mask.pb.h"
88
#include "google/protobuf/text_format.h"
9-
#include "base/testing.h"
9+
#include "gmock/gmock.h"
1010
#include "gtest/gtest.h"
1111
#include "absl/status/status.h"
1212
#include "absl/strings/str_split.h"
@@ -24,7 +24,7 @@
2424
#include "eval/public/unknown_attribute_set.h"
2525
#include "eval/public/unknown_set.h"
2626
#include "eval/testutil/test_message.pb.h"
27-
#include "base/status_macros.h"
27+
#include "util/task/status_macros.h"
2828

2929
namespace google {
3030
namespace api {
@@ -41,8 +41,8 @@ using google::protobuf::FieldMask;
4141
using testing::Eq;
4242
using testing::HasSubstr;
4343
using testing::Not;
44-
using cel_base::testing::IsOk;
45-
using cel_base::testing::StatusIs;
44+
using cel::internal::IsOk;
45+
using cel::internal::StatusIs;
4646

4747
class ConcatFunction : public CelFunction {
4848
public:

0 commit comments

Comments
 (0)