From bbfc61421b6488c53ad57117dc757cfb8400aeca Mon Sep 17 00:00:00 2001 From: Justin King Date: Fri, 19 Jun 2026 11:12:25 -0700 Subject: [PATCH] Move `src/` to `internal/` PiperOrigin-RevId: 934992199 --- cel-c/BUILD | 44 +++++++++---------- cel-c/alloc.cc | 4 +- cel-c/alloc_test.cc | 2 +- cel-c/arena.cc | 4 +- cel-c/ast_proto.cc | 4 +- cel-c/ast_proto_v1alpha1.cc | 4 +- cel-c/ast_traverse.cc | 4 +- cel-c/duration.cc | 2 +- cel-c/hash.cc | 8 ++-- cel-c/{src => internal}/BUILD | 8 ++-- cel-c/{src => internal}/align.h | 8 ++-- cel-c/{src => internal}/align_test.cc | 2 +- cel-c/{src => internal}/alloca.h | 8 ++-- cel-c/{src => internal}/any.cc | 2 +- cel-c/{src => internal}/any.h | 6 +-- cel-c/{src => internal}/any_test.cc | 2 +- cel-c/{src => internal}/arc.h | 6 +-- cel-c/{src => internal}/arc_test.cc | 2 +- cel-c/{src => internal}/arena_array.h | 8 ++-- cel-c/{src => internal}/arena_array_test.cc | 2 +- cel-c/{src => internal}/arena_deque.h | 8 ++-- cel-c/{src => internal}/arena_deque_test.cc | 2 +- cel-c/{src => internal}/arena_flat_hash_map.h | 8 ++-- .../arena_flat_hash_map_test.cc | 2 +- cel-c/{src => internal}/arena_string.h | 8 ++-- cel-c/{src => internal}/arena_string_test.cc | 4 +- cel-c/{src => internal}/array.h | 8 ++-- cel-c/{src => internal}/array_test.cc | 2 +- cel-c/{src => internal}/asan.h | 8 ++-- cel-c/{src => internal}/binary_search.h | 6 +-- cel-c/{src => internal}/binary_search_test.cc | 2 +- cel-c/{src => internal}/bit.cc | 2 +- cel-c/{src => internal}/bit.h | 6 +-- cel-c/{src => internal}/bit_test.cc | 2 +- cel-c/{src => internal}/bitset.cc | 4 +- cel-c/{src => internal}/bitset.h | 6 +-- cel-c/{src => internal}/bitset_test.cc | 2 +- cel-c/{src => internal}/charconv.cc | 8 ++-- cel-c/{src => internal}/charconv.h | 8 ++-- cel-c/{src => internal}/charconv_test.cc | 2 +- cel-c/{src => internal}/ckdint.h | 6 +-- cel-c/{src => internal}/ckdint_test.cc | 2 +- cel-c/{src => internal}/compare.h | 6 +-- cel-c/{src => internal}/config.h | 6 +-- cel-c/{src => internal}/config_test.cc | 0 cel-c/{src => internal}/container.h | 8 ++-- cel-c/{src => internal}/container_test.cc | 2 +- cel-c/{src => internal}/ctype.cc | 2 +- cel-c/{src => internal}/ctype.h | 6 +-- cel-c/{src => internal}/ctype_test.cc | 2 +- cel-c/{src => internal}/deque.h | 8 ++-- cel-c/{src => internal}/deque_test.cc | 2 +- cel-c/{src => internal}/durationconv.cc | 2 +- cel-c/{src => internal}/durationconv.h | 6 +-- cel-c/{src => internal}/durationconv_test.cc | 2 +- cel-c/{src => internal}/empty_list_value.cc | 2 +- cel-c/{src => internal}/empty_list_value.h | 6 +-- .../empty_list_value_test.cc | 4 +- cel-c/{src => internal}/empty_map_value.cc | 2 +- cel-c/{src => internal}/empty_map_value.h | 6 +-- .../{src => internal}/empty_map_value_test.cc | 4 +- cel-c/{src => internal}/endian.h | 10 ++--- cel-c/{src => internal}/endian_test.cc | 2 +- cel-c/{src => internal}/flat_hash_map.h | 8 ++-- cel-c/{src => internal}/flat_hash_map_test.cc | 2 +- cel-c/{src => internal}/flat_hash_set.h | 8 ++-- cel-c/{src => internal}/flat_hash_set_test.cc | 2 +- cel-c/{src => internal}/generic_array.cc | 8 ++-- cel-c/{src => internal}/generic_array.h | 10 ++--- cel-c/{src => internal}/generic_deque.cc | 6 +-- cel-c/{src => internal}/generic_deque.h | 8 ++-- cel-c/{src => internal}/generic_flat_hash.cc | 8 ++-- cel-c/{src => internal}/generic_flat_hash.h | 10 ++--- cel-c/{src => internal}/generic_string.cc | 6 +-- cel-c/{src => internal}/generic_string.h | 8 ++-- .../{src => internal}/generic_string_test.cc | 2 +- cel-c/{src => internal}/list_value.cc | 0 cel-c/{src => internal}/list_value_test.cc | 4 +- cel-c/{src => internal}/malloc.cc | 8 ++-- cel-c/{src => internal}/malloc.h | 8 ++-- cel-c/{src => internal}/malloc_test.cc | 4 +- cel-c/{src => internal}/map_value.cc | 6 +-- cel-c/{src => internal}/map_value.h | 6 +-- cel-c/{src => internal}/map_value_test.cc | 6 +-- cel-c/{src => internal}/memory.cc | 4 +- cel-c/{src => internal}/memory.h | 8 ++-- cel-c/{src => internal}/memory_test.cc | 2 +- cel-c/{src => internal}/message_equality.cc | 8 ++-- cel-c/{src => internal}/message_equality.h | 6 +-- .../message_equality_test.cc | 2 +- cel-c/{src => internal}/mutable_list_value.cc | 6 +-- cel-c/{src => internal}/mutable_list_value.h | 6 +-- .../mutable_list_value_test.cc | 4 +- cel-c/{src => internal}/mutable_map_value.cc | 8 ++-- cel-c/{src => internal}/mutable_map_value.h | 6 +-- .../mutable_map_value_test.cc | 4 +- cel-c/{src => internal}/number.h | 8 ++-- cel-c/{src => internal}/number_test.cc | 4 +- cel-c/{src => internal}/opaque_value.cc | 0 cel-c/{src => internal}/opaque_value_test.cc | 2 +- cel-c/{src => internal}/optional_value.cc | 0 .../{src => internal}/optional_value_test.cc | 4 +- .../parsed_map_field_value.cc | 6 +-- .../parsed_map_field_value.h | 8 ++-- .../parsed_map_field_value_test.cc | 4 +- .../{src => internal}/parsed_message_value.cc | 4 +- .../{src => internal}/parsed_message_value.h | 6 +-- .../parsed_message_value_test.cc | 4 +- .../parsed_repeated_field_value.cc | 4 +- .../parsed_repeated_field_value.h | 8 ++-- .../parsed_repeated_field_value_test.cc | 4 +- cel-c/{src => internal}/rc.h | 6 +-- cel-c/{src => internal}/rc_test.cc | 2 +- cel-c/{src => internal}/regexp.cc | 6 +-- cel-c/{src => internal}/regexp.h | 6 +-- cel-c/{src => internal}/regexp_test.cc | 2 +- cel-c/{src => internal}/runtime/BUILD | 34 +++++++------- cel-c/{src => internal}/runtime/activation.cc | 10 ++--- cel-c/{src => internal}/runtime/activation.h | 10 ++--- cel-c/{src => internal}/runtime/instr.h | 6 +-- .../runtime/interpretable.cc | 42 +++++++++--------- .../{src => internal}/runtime/interpretable.h | 14 +++--- .../{src => internal}/runtime/interpreter.cc | 20 ++++----- cel-c/{src => internal}/runtime/interpreter.h | 10 ++--- cel-c/{src => internal}/runtime/program.cc | 12 ++--- cel-c/{src => internal}/runtime/program.h | 14 +++--- cel-c/{src => internal}/runtime/runtime.cc | 10 ++--- cel-c/{src => internal}/runtime/runtime.h | 10 ++--- cel-c/{src => internal}/runtime_test.cc | 10 ++--- cel-c/{src => internal}/setjmp.h | 6 +-- cel-c/{src => internal}/setjmp_test.cc | 2 +- cel-c/{src => internal}/sort.h | 8 ++-- cel-c/{src => internal}/sort_test.cc | 2 +- cel-c/{src => internal}/stable_sort.h | 8 ++-- cel-c/{src => internal}/stable_sort_test.cc | 2 +- cel-c/{src => internal}/string.h | 8 ++-- cel-c/{src => internal}/string_test.cc | 4 +- cel-c/{src => internal}/struct_value.cc | 4 +- cel-c/{src => internal}/struct_value_test.cc | 2 +- cel-c/{src => internal}/testing/BUILD | 0 cel-c/{src => internal}/testing/compile.cc | 4 +- cel-c/{src => internal}/testing/compile.h | 6 +-- cel-c/{src => internal}/testing/compiler.cc | 2 +- cel-c/{src => internal}/testing/compiler.h | 6 +-- cel-c/{src => internal}/testing/def_pool.cc | 2 +- cel-c/{src => internal}/testing/def_pool.h | 6 +-- cel-c/{src => internal}/testing/parse.cc | 4 +- cel-c/{src => internal}/testing/parse.h | 6 +-- cel-c/{src => internal}/testing/parser.cc | 2 +- cel-c/{src => internal}/testing/parser.h | 6 +-- cel-c/{src => internal}/timestampconv.cc | 4 +- cel-c/{src => internal}/timestampconv.h | 8 ++-- cel-c/{src => internal}/timestampconv_test.cc | 2 +- cel-c/{src => internal}/trilean_test.cc | 0 cel-c/{src => internal}/uchar.h | 6 +-- cel-c/{src => internal}/uint128.h | 10 ++--- cel-c/{src => internal}/uint128_test.cc | 2 +- cel-c/{src => internal}/unaligned.h | 8 ++-- cel-c/{src => internal}/unaligned_test.cc | 2 +- cel-c/{src => internal}/unicode.h | 8 ++-- cel-c/{src => internal}/unicode_test.cc | 2 +- cel-c/{src => internal}/utf8.cc | 6 +-- cel-c/{src => internal}/utf8.h | 8 ++-- cel-c/{src => internal}/utf8_test.cc | 2 +- cel-c/{src => internal}/value.cc | 8 ++-- cel-c/{src => internal}/value_test.cc | 12 ++--- cel-c/{src => internal}/value_testing.cc | 2 +- cel-c/{src => internal}/value_testing.h | 6 +-- cel-c/status.cc | 4 +- cel-c/string_view.cc | 2 +- cel-c/timestamp.cc | 2 +- 171 files changed, 500 insertions(+), 500 deletions(-) rename cel-c/{src => internal}/BUILD (99%) rename cel-c/{src => internal}/align.h (99%) rename cel-c/{src => internal}/align_test.cc (99%) rename cel-c/{src => internal}/alloca.h (81%) rename cel-c/{src => internal}/any.cc (99%) rename cel-c/{src => internal}/any.h (94%) rename cel-c/{src => internal}/any_test.cc (99%) rename cel-c/{src => internal}/arc.h (96%) rename cel-c/{src => internal}/arc_test.cc (97%) rename cel-c/{src => internal}/arena_array.h (98%) rename cel-c/{src => internal}/arena_array_test.cc (99%) rename cel-c/{src => internal}/arena_deque.h (97%) rename cel-c/{src => internal}/arena_deque_test.cc (99%) rename cel-c/{src => internal}/arena_flat_hash_map.h (97%) rename cel-c/{src => internal}/arena_flat_hash_map_test.cc (99%) rename cel-c/{src => internal}/arena_string.h (96%) rename cel-c/{src => internal}/arena_string_test.cc (99%) rename cel-c/{src => internal}/array.h (98%) rename cel-c/{src => internal}/array_test.cc (99%) rename cel-c/{src => internal}/asan.h (96%) rename cel-c/{src => internal}/binary_search.h (91%) rename cel-c/{src => internal}/binary_search_test.cc (98%) rename cel-c/{src => internal}/bit.cc (99%) rename cel-c/{src => internal}/bit.h (99%) rename cel-c/{src => internal}/bit_test.cc (99%) rename cel-c/{src => internal}/bitset.cc (96%) rename cel-c/{src => internal}/bitset.h (96%) rename cel-c/{src => internal}/bitset_test.cc (98%) rename cel-c/{src => internal}/charconv.cc (98%) rename cel-c/{src => internal}/charconv.h (98%) rename cel-c/{src => internal}/charconv_test.cc (99%) rename cel-c/{src => internal}/ckdint.h (99%) rename cel-c/{src => internal}/ckdint_test.cc (99%) rename cel-c/{src => internal}/compare.h (88%) rename cel-c/{src => internal}/config.h (96%) rename cel-c/{src => internal}/config_test.cc (100%) rename cel-c/{src => internal}/container.h (95%) rename cel-c/{src => internal}/container_test.cc (98%) rename cel-c/{src => internal}/ctype.cc (99%) rename cel-c/{src => internal}/ctype.h (95%) rename cel-c/{src => internal}/ctype_test.cc (98%) rename cel-c/{src => internal}/deque.h (98%) rename cel-c/{src => internal}/deque_test.cc (99%) rename cel-c/{src => internal}/durationconv.cc (98%) rename cel-c/{src => internal}/durationconv.h (93%) rename cel-c/{src => internal}/durationconv_test.cc (99%) rename cel-c/{src => internal}/empty_list_value.cc (99%) rename cel-c/{src => internal}/empty_list_value.h (85%) rename cel-c/{src => internal}/empty_list_value_test.cc (96%) rename cel-c/{src => internal}/empty_map_value.cc (99%) rename cel-c/{src => internal}/empty_map_value.h (85%) rename cel-c/{src => internal}/empty_map_value_test.cc (97%) rename cel-c/{src => internal}/endian.h (96%) rename cel-c/{src => internal}/endian_test.cc (98%) rename cel-c/{src => internal}/flat_hash_map.h (97%) rename cel-c/{src => internal}/flat_hash_map_test.cc (99%) rename cel-c/{src => internal}/flat_hash_set.h (97%) rename cel-c/{src => internal}/flat_hash_set_test.cc (99%) rename cel-c/{src => internal}/generic_array.cc (98%) rename cel-c/{src => internal}/generic_array.h (97%) rename cel-c/{src => internal}/generic_deque.cc (99%) rename cel-c/{src => internal}/generic_deque.h (97%) rename cel-c/{src => internal}/generic_flat_hash.cc (99%) rename cel-c/{src => internal}/generic_flat_hash.h (94%) rename cel-c/{src => internal}/generic_string.cc (99%) rename cel-c/{src => internal}/generic_string.h (97%) rename cel-c/{src => internal}/generic_string_test.cc (96%) rename cel-c/{src => internal}/list_value.cc (100%) rename cel-c/{src => internal}/list_value_test.cc (99%) rename cel-c/{src => internal}/malloc.cc (96%) rename cel-c/{src => internal}/malloc.h (94%) rename cel-c/{src => internal}/malloc_test.cc (96%) rename cel-c/{src => internal}/map_value.cc (99%) rename cel-c/{src => internal}/map_value.h (98%) rename cel-c/{src => internal}/map_value_test.cc (99%) rename cel-c/{src => internal}/memory.cc (98%) rename cel-c/{src => internal}/memory.h (94%) rename cel-c/{src => internal}/memory_test.cc (99%) rename cel-c/{src => internal}/message_equality.cc (99%) rename cel-c/{src => internal}/message_equality.h (92%) rename cel-c/{src => internal}/message_equality_test.cc (99%) rename cel-c/{src => internal}/mutable_list_value.cc (98%) rename cel-c/{src => internal}/mutable_list_value.h (91%) rename cel-c/{src => internal}/mutable_list_value_test.cc (98%) rename cel-c/{src => internal}/mutable_map_value.cc (99%) rename cel-c/{src => internal}/mutable_map_value.h (92%) rename cel-c/{src => internal}/mutable_map_value_test.cc (99%) rename cel-c/{src => internal}/number.h (98%) rename cel-c/{src => internal}/number_test.cc (99%) rename cel-c/{src => internal}/opaque_value.cc (100%) rename cel-c/{src => internal}/opaque_value_test.cc (98%) rename cel-c/{src => internal}/optional_value.cc (100%) rename cel-c/{src => internal}/optional_value_test.cc (99%) rename cel-c/{src => internal}/parsed_map_field_value.cc (99%) rename cel-c/{src => internal}/parsed_map_field_value.h (85%) rename cel-c/{src => internal}/parsed_map_field_value_test.cc (99%) rename cel-c/{src => internal}/parsed_message_value.cc (99%) rename cel-c/{src => internal}/parsed_message_value.h (88%) rename cel-c/{src => internal}/parsed_message_value_test.cc (99%) rename cel-c/{src => internal}/parsed_repeated_field_value.cc (99%) rename cel-c/{src => internal}/parsed_repeated_field_value.h (85%) rename cel-c/{src => internal}/parsed_repeated_field_value_test.cc (98%) rename cel-c/{src => internal}/rc.h (95%) rename cel-c/{src => internal}/rc_test.cc (97%) rename cel-c/{src => internal}/regexp.cc (98%) rename cel-c/{src => internal}/regexp.h (95%) rename cel-c/{src => internal}/regexp_test.cc (99%) rename cel-c/{src => internal}/runtime/BUILD (74%) rename cel-c/{src => internal}/runtime/activation.cc (94%) rename cel-c/{src => internal}/runtime/activation.h (88%) rename cel-c/{src => internal}/runtime/instr.h (98%) rename cel-c/{src => internal}/runtime/interpretable.cc (99%) rename cel-c/{src => internal}/runtime/interpretable.h (89%) rename cel-c/{src => internal}/runtime/interpreter.cc (99%) rename cel-c/{src => internal}/runtime/interpreter.h (76%) rename cel-c/{src => internal}/runtime/program.cc (93%) rename cel-c/{src => internal}/runtime/program.h (90%) rename cel-c/{src => internal}/runtime/runtime.cc (94%) rename cel-c/{src => internal}/runtime/runtime.h (88%) rename cel-c/{src => internal}/runtime_test.cc (99%) rename cel-c/{src => internal}/setjmp.h (92%) rename cel-c/{src => internal}/setjmp_test.cc (96%) rename cel-c/{src => internal}/sort.h (94%) rename cel-c/{src => internal}/sort_test.cc (97%) rename cel-c/{src => internal}/stable_sort.h (96%) rename cel-c/{src => internal}/stable_sort_test.cc (97%) rename cel-c/{src => internal}/string.h (97%) rename cel-c/{src => internal}/string_test.cc (99%) rename cel-c/{src => internal}/struct_value.cc (99%) rename cel-c/{src => internal}/struct_value_test.cc (99%) rename cel-c/{src => internal}/testing/BUILD (100%) rename cel-c/{src => internal}/testing/compile.cc (91%) rename cel-c/{src => internal}/testing/compile.h (84%) rename cel-c/{src => internal}/testing/compiler.cc (98%) rename cel-c/{src => internal}/testing/compiler.h (90%) rename cel-c/{src => internal}/testing/def_pool.cc (98%) rename cel-c/{src => internal}/testing/def_pool.h (84%) rename cel-c/{src => internal}/testing/parse.cc (92%) rename cel-c/{src => internal}/testing/parse.h (85%) rename cel-c/{src => internal}/testing/parser.cc (98%) rename cel-c/{src => internal}/testing/parser.h (90%) rename cel-c/{src => internal}/timestampconv.cc (96%) rename cel-c/{src => internal}/timestampconv.h (87%) rename cel-c/{src => internal}/timestampconv_test.cc (99%) rename cel-c/{src => internal}/trilean_test.cc (100%) rename cel-c/{src => internal}/uchar.h (89%) rename cel-c/{src => internal}/uint128.h (98%) rename cel-c/{src => internal}/uint128_test.cc (99%) rename cel-c/{src => internal}/unaligned.h (96%) rename cel-c/{src => internal}/unaligned_test.cc (98%) rename cel-c/{src => internal}/unicode.h (86%) rename cel-c/{src => internal}/unicode_test.cc (96%) rename cel-c/{src => internal}/utf8.cc (98%) rename cel-c/{src => internal}/utf8.h (93%) rename cel-c/{src => internal}/utf8_test.cc (99%) rename cel-c/{src => internal}/value.cc (99%) rename cel-c/{src => internal}/value_test.cc (99%) rename cel-c/{src => internal}/value_testing.cc (99%) rename cel-c/{src => internal}/value_testing.h (94%) diff --git a/cel-c/BUILD b/cel-c/BUILD index 2f4a0a2..3a3d7f5 100644 --- a/cel-c/BUILD +++ b/cel-c/BUILD @@ -55,8 +55,8 @@ cc_library( deps = [ ":assert", ":config", - "//cel-c/src:ckdint", - "//cel-c/src:malloc", + "//cel-c/internal:ckdint", + "//cel-c/internal:malloc", "@protobuf//upb/mem", ], ) @@ -67,7 +67,7 @@ cc_test( deps = [ ":alloc", ":config", - "//cel-c/src:align", + "//cel-c/internal:align", "@googletest//:gtest_main", ], ) @@ -85,8 +85,8 @@ cc_library( ":alloc", ":assert", ":config", - "//cel-c/src:align", - "//cel-c/src:ckdint", + "//cel-c/internal:align", + "//cel-c/internal:ckdint", "@protobuf//upb/base", "@protobuf//upb/mem", ], @@ -184,8 +184,8 @@ cc_library( ":string_view", ":type", ":type_proto", - "//cel-c/src:malloc", - "//cel-c/src:setjmp", + "//cel-c/internal:malloc", + "//cel-c/internal:setjmp", "@cel-spec//proto/cel/expr:checked_upb_proto", "@cel-spec//proto/cel/expr:syntax_upb_proto", "@protobuf//upb/mem", @@ -240,8 +240,8 @@ cc_library( ":string_view", ":type", ":type_proto_v1alpha1", - "//cel-c/src:malloc", - "//cel-c/src:setjmp", + "//cel-c/internal:malloc", + "//cel-c/internal:setjmp", "@googleapis//google/api/expr/v1alpha1:checked_upb_proto", "@protobuf//upb/mem", ], @@ -290,8 +290,8 @@ cc_library( ":config", ":status", ":string_view", - "//cel-c/src:deque", - "//cel-c/src:malloc", + "//cel-c/internal:deque", + "//cel-c/internal:malloc", ], ) @@ -617,7 +617,7 @@ cc_library( deps = [ ":assert", ":config", - "//cel-c/src:ckdint", + "//cel-c/internal:ckdint", ], ) @@ -956,10 +956,10 @@ cc_library( deps = [ ":assert", ":config", - "//cel-c/src:bit", - "//cel-c/src:config", - "//cel-c/src:uint128", - "//cel-c/src:unaligned", + "//cel-c/internal:bit", + "//cel-c/internal:config", + "//cel-c/internal:uint128", + "//cel-c/internal:unaligned", "@protobuf//upb/base", ], ) @@ -1049,7 +1049,7 @@ cc_library( ":type", ":value", ":well_known_types", - "//cel-c/src/runtime", # buildcleaner: keep + "//cel-c/internal/runtime", # buildcleaner: keep "@protobuf//upb/reflection", ], ) @@ -1184,8 +1184,8 @@ cc_library( ":error_space", ":status_code", ":string_view", - "//cel-c/src:array", - "//cel-c/src:string", + "//cel-c/internal:array", + "//cel-c/internal:string", ], ) @@ -1363,7 +1363,7 @@ cc_library( ":config", ":cstring_view", ":hash", - "//cel-c/src:memory", + "//cel-c/internal:memory", "@protobuf//upb/base", ], ) @@ -1414,7 +1414,7 @@ cc_library( ":assert", ":config", ":duration", - "//cel-c/src:ckdint", + "//cel-c/internal:ckdint", ], ) @@ -1663,7 +1663,7 @@ cc_library( ":timestamp", ":value_kind", ":well_known_types", - "//cel-c/src:value", # buildcleaner: keep + "//cel-c/internal:value", # buildcleaner: keep "@protobuf//upb/message", "@protobuf//upb/reflection", ], diff --git a/cel-c/alloc.cc b/cel-c/alloc.cc index eb75a96..66ce147 100644 --- a/cel-c/alloc.cc +++ b/cel-c/alloc.cc @@ -22,8 +22,8 @@ #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/ckdint.h" -#include "cel-c/src/malloc.h" +#include "cel-c/internal/ckdint.h" +#include "cel-c/internal/malloc.h" #include "upb/mem/alloc.h" extern "C" CEL_NULLABLE(void*) diff --git a/cel-c/alloc_test.cc b/cel-c/alloc_test.cc index 4038b2d..4ae8b86 100644 --- a/cel-c/alloc_test.cc +++ b/cel-c/alloc_test.cc @@ -20,7 +20,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" #include "cel-c/config.h" -#include "cel-c/src/align.h" +#include "cel-c/internal/align.h" namespace { diff --git a/cel-c/arena.cc b/cel-c/arena.cc index eb03b48..eb6411c 100644 --- a/cel-c/arena.cc +++ b/cel-c/arena.cc @@ -22,8 +22,8 @@ #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/align.h" -#include "cel-c/src/ckdint.h" +#include "cel-c/internal/align.h" +#include "cel-c/internal/ckdint.h" #include "upb/base/string_view.h" #include "upb/mem/arena.h" diff --git a/cel-c/ast_proto.cc b/cel-c/ast_proto.cc index 87eab4f..19d9ca8 100644 --- a/cel-c/ast_proto.cc +++ b/cel-c/ast_proto.cc @@ -26,11 +26,11 @@ #include "cel-c/ast.h" #include "cel-c/config.h" #include "cel-c/constant_proto.h" +#include "cel-c/internal/malloc.h" +#include "cel-c/internal/setjmp.h" #include "cel-c/operators.h" #include "cel-c/ref.h" #include "cel-c/ref_proto.h" -#include "cel-c/src/malloc.h" -#include "cel-c/src/setjmp.h" #include "cel-c/status.h" #include "cel-c/string_view.h" #include "cel-c/type.h" diff --git a/cel-c/ast_proto_v1alpha1.cc b/cel-c/ast_proto_v1alpha1.cc index 84aeeb5..a4ae972 100644 --- a/cel-c/ast_proto_v1alpha1.cc +++ b/cel-c/ast_proto_v1alpha1.cc @@ -26,11 +26,11 @@ #include "cel-c/ast.h" #include "cel-c/config.h" #include "cel-c/constant_proto_v1alpha1.h" +#include "cel-c/internal/malloc.h" +#include "cel-c/internal/setjmp.h" #include "cel-c/operators.h" #include "cel-c/ref.h" #include "cel-c/ref_proto_v1alpha1.h" -#include "cel-c/src/malloc.h" -#include "cel-c/src/setjmp.h" #include "cel-c/status.h" #include "cel-c/string_view.h" #include "cel-c/type.h" diff --git a/cel-c/ast_traverse.cc b/cel-c/ast_traverse.cc index d08fbae..f46b40f 100644 --- a/cel-c/ast_traverse.cc +++ b/cel-c/ast_traverse.cc @@ -23,8 +23,8 @@ #include "cel-c/ast.h" #include "cel-c/ast_visitor.h" #include "cel-c/config.h" -#include "cel-c/src/deque.h" -#include "cel-c/src/malloc.h" +#include "cel-c/internal/deque.h" +#include "cel-c/internal/malloc.h" #include "cel-c/status.h" #include "cel-c/string_view.h" diff --git a/cel-c/duration.cc b/cel-c/duration.cc index 99efeec..e2e257f 100644 --- a/cel-c/duration.cc +++ b/cel-c/duration.cc @@ -19,7 +19,7 @@ #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/ckdint.h" +#include "cel-c/internal/ckdint.h" extern "C" bool cel_Duration_Normalize(int64_t* cel_nonnull sec, int32_t* cel_nonnull nsec) { diff --git a/cel-c/hash.cc b/cel-c/hash.cc index f82c26e..3731e5f 100644 --- a/cel-c/hash.cc +++ b/cel-c/hash.cc @@ -19,10 +19,10 @@ #include #include "cel-c/assert.h" -#include "cel-c/src/bit.h" -#include "cel-c/src/config.h" -#include "cel-c/src/uint128.h" -#include "cel-c/src/unaligned.h" +#include "cel-c/internal/bit.h" +#include "cel-c/internal/config.h" +#include "cel-c/internal/uint128.h" +#include "cel-c/internal/unaligned.h" static CEL_NONNULL(const void*) const _cel_kHashSeed = &_cel_kHashSeed; diff --git a/cel-c/src/BUILD b/cel-c/internal/BUILD similarity index 99% rename from cel-c/src/BUILD rename to cel-c/internal/BUILD index 2756240..839e880 100644 --- a/cel-c/src/BUILD +++ b/cel-c/internal/BUILD @@ -750,10 +750,10 @@ cc_test( "//cel-c:timestamp", "//cel-c:trilean", "//cel-c:value", - "//cel-c/src/runtime", - "//cel-c/src/testing:compiler", - "//cel-c/src/testing:def_pool", - "//cel-c/src/testing:parser", + "//cel-c/internal/runtime", + "//cel-c/internal/testing:compiler", + "//cel-c/internal/testing:def_pool", + "//cel-c/internal/testing:parser", "@abseil-cpp//absl/cleanup", "@abseil-cpp//absl/container:flat_hash_map", "@abseil-cpp//absl/log:absl_check", diff --git a/cel-c/src/align.h b/cel-c/internal/align.h similarity index 99% rename from cel-c/src/align.h rename to cel-c/internal/align.h index 9e256ae..1ce3b9e 100644 --- a/cel-c/src/align.h +++ b/cel-c/internal/align.h @@ -15,8 +15,8 @@ // Internal header providing address alignment functions. Uses compiler // intrinsics if available, otherwise falls back to a pure implementation. -#ifndef THIRD_PARTY_CEL_C_SRC_ALIGN_H_ -#define THIRD_PARTY_CEL_C_SRC_ALIGN_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_ALIGN_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_ALIGN_H_ #include #include // IWYU pragma: keep @@ -25,7 +25,7 @@ #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/bit.h" +#include "cel-c/internal/bit.h" // NOLINTBEGIN(runtime/int) // NOLINTBEGIN(google-runtime-int) @@ -531,4 +531,4 @@ CEL_END_DECLS // NOLINTEND(google-runtime-int) // NOLINTEND(runtime/int) -#endif // THIRD_PARTY_CEL_C_SRC_ALIGN_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_ALIGN_H_ diff --git a/cel-c/src/align_test.cc b/cel-c/internal/align_test.cc similarity index 99% rename from cel-c/src/align_test.cc rename to cel-c/internal/align_test.cc index 0f6e7dd..2be1267 100644 --- a/cel-c/src/align_test.cc +++ b/cel-c/internal/align_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/align.h" +#include "cel-c/internal/align.h" #include diff --git a/cel-c/src/alloca.h b/cel-c/internal/alloca.h similarity index 81% rename from cel-c/src/alloca.h rename to cel-c/internal/alloca.h index 4fa37d1..764ef15 100644 --- a/cel-c/src/alloca.h +++ b/cel-c/internal/alloca.h @@ -12,10 +12,10 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_ALLOCA_H_ -#define THIRD_PARTY_CEL_C_SRC_ALLOCA_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_ALLOCA_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_ALLOCA_H_ -#include "cel-c/src/config.h" +#include "cel-c/internal/config.h" #ifdef _WIN32 #include @@ -28,4 +28,4 @@ #define _cel_alloca(size) alloca(size) -#endif // THIRD_PARTY_CEL_C_SRC_ALLOCA_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_ALLOCA_H_ diff --git a/cel-c/src/any.cc b/cel-c/internal/any.cc similarity index 99% rename from cel-c/src/any.cc rename to cel-c/internal/any.cc index dde6e02..9236562 100644 --- a/cel-c/src/any.cc +++ b/cel-c/internal/any.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/any.h" +#include "cel-c/internal/any.h" #include #include diff --git a/cel-c/src/any.h b/cel-c/internal/any.h similarity index 94% rename from cel-c/src/any.h rename to cel-c/internal/any.h index 44f4775..239cc6a 100644 --- a/cel-c/src/any.h +++ b/cel-c/internal/any.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_ANY_H_ -#define THIRD_PARTY_CEL_C_SRC_ANY_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_ANY_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_ANY_H_ #include @@ -68,4 +68,4 @@ _cel_AnyUnpackResult_ToMessage(_cel_AnyUnpackResult result); CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_ANY_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_ANY_H_ diff --git a/cel-c/src/any_test.cc b/cel-c/internal/any_test.cc similarity index 99% rename from cel-c/src/any_test.cc rename to cel-c/internal/any_test.cc index 8d79602..db3cf57 100644 --- a/cel-c/src/any_test.cc +++ b/cel-c/internal/any_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/any.h" +#include "cel-c/internal/any.h" #include diff --git a/cel-c/src/arc.h b/cel-c/internal/arc.h similarity index 96% rename from cel-c/src/arc.h rename to cel-c/internal/arc.h index d11926e..618bfb6 100644 --- a/cel-c/src/arc.h +++ b/cel-c/internal/arc.h @@ -18,8 +18,8 @@ // toolchains that occur when mixing `` and ``. Instead we // use compiler intrinsics across the board. -#ifndef THIRD_PARTY_CEL_C_SRC_ARC_H_ -#define THIRD_PARTY_CEL_C_SRC_ARC_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_ARC_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_ARC_H_ #include #include // IWYU pragma: keep @@ -135,4 +135,4 @@ CEL_END_DECLS // NOLINTEND(google-runtime-int) // NOLINTEND(runtime/int) -#endif // THIRD_PARTY_CEL_C_SRC_ARC_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_ARC_H_ diff --git a/cel-c/src/arc_test.cc b/cel-c/internal/arc_test.cc similarity index 97% rename from cel-c/src/arc_test.cc rename to cel-c/internal/arc_test.cc index 9b1b1f4..87e8b9d 100644 --- a/cel-c/src/arc_test.cc +++ b/cel-c/internal/arc_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/arc.h" +#include "cel-c/internal/arc.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/cel-c/src/arena_array.h b/cel-c/internal/arena_array.h similarity index 98% rename from cel-c/src/arena_array.h rename to cel-c/internal/arena_array.h index 6482acc..7d30f65 100644 --- a/cel-c/src/arena_array.h +++ b/cel-c/internal/arena_array.h @@ -15,8 +15,8 @@ // Internal header providing a dynamic array implementation which uses // arena-based memory management. -#ifndef THIRD_PARTY_CEL_C_SRC_ARENA_ARRAY_H_ -#define THIRD_PARTY_CEL_C_SRC_ARENA_ARRAY_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_ARENA_ARRAY_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_ARENA_ARRAY_H_ #include // IWYU pragma: keep #include // IWYU pragma: keep @@ -24,7 +24,7 @@ #include "cel-c/arena.h" #include "cel-c/config.h" -#include "cel-c/src/generic_array.h" +#include "cel-c/internal/generic_array.h" CEL_BEGIN_DECLS @@ -376,4 +376,4 @@ static CEL_INLINE CEL_NULLABLE(void*) CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_ARENA_ARRAY_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_ARENA_ARRAY_H_ diff --git a/cel-c/src/arena_array_test.cc b/cel-c/internal/arena_array_test.cc similarity index 99% rename from cel-c/src/arena_array_test.cc rename to cel-c/internal/arena_array_test.cc index 4dc8d05..af5db75 100644 --- a/cel-c/src/arena_array_test.cc +++ b/cel-c/internal/arena_array_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/arena_array.h" +#include "cel-c/internal/arena_array.h" #include diff --git a/cel-c/src/arena_deque.h b/cel-c/internal/arena_deque.h similarity index 97% rename from cel-c/src/arena_deque.h rename to cel-c/internal/arena_deque.h index 2ac4cce..f969169 100644 --- a/cel-c/src/arena_deque.h +++ b/cel-c/internal/arena_deque.h @@ -15,8 +15,8 @@ // Internal header providing a deque implementation which uses arena-based // memory management. -#ifndef THIRD_PARTY_CEL_C_SRC_ARENA_DEQUE_H_ -#define THIRD_PARTY_CEL_C_SRC_ARENA_DEQUE_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_ARENA_DEQUE_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_ARENA_DEQUE_H_ #include // IWYU pragma: keep #include // IWYU pragma: keep @@ -24,7 +24,7 @@ #include "cel-c/arena.h" #include "cel-c/config.h" -#include "cel-c/src/generic_deque.h" +#include "cel-c/internal/generic_deque.h" CEL_BEGIN_DECLS @@ -249,4 +249,4 @@ static CEL_INLINE void _cel_ArenaDeque_Clear(CEL_NONNULL(_cel_ArenaDeque*) CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_ARENA_DEQUE_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_ARENA_DEQUE_H_ diff --git a/cel-c/src/arena_deque_test.cc b/cel-c/internal/arena_deque_test.cc similarity index 99% rename from cel-c/src/arena_deque_test.cc rename to cel-c/internal/arena_deque_test.cc index d351482..6d0ea51 100644 --- a/cel-c/src/arena_deque_test.cc +++ b/cel-c/internal/arena_deque_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/arena_deque.h" +#include "cel-c/internal/arena_deque.h" #include #include diff --git a/cel-c/src/arena_flat_hash_map.h b/cel-c/internal/arena_flat_hash_map.h similarity index 97% rename from cel-c/src/arena_flat_hash_map.h rename to cel-c/internal/arena_flat_hash_map.h index 3afbdd6..23ac9b6 100644 --- a/cel-c/src/arena_flat_hash_map.h +++ b/cel-c/internal/arena_flat_hash_map.h @@ -15,8 +15,8 @@ // Internal header providing a flat hash map implementation which uses // arena-based memory management. -#ifndef THIRD_PARTY_CEL_C_SRC_ARENA_FLAT_HASH_MAP_H_ -#define THIRD_PARTY_CEL_C_SRC_ARENA_FLAT_HASH_MAP_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_ARENA_FLAT_HASH_MAP_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_ARENA_FLAT_HASH_MAP_H_ #include // IWYU pragma: keep #include // IWYU pragma: keep @@ -25,7 +25,7 @@ #include "cel-c/arena.h" #include "cel-c/config.h" -#include "cel-c/src/generic_flat_hash.h" +#include "cel-c/internal/generic_flat_hash.h" CEL_BEGIN_DECLS @@ -252,4 +252,4 @@ static CEL_INLINE bool _cel_ArenaFlatHashMap_MutableNext( CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_ARENA_FLAT_HASH_MAP_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_ARENA_FLAT_HASH_MAP_H_ diff --git a/cel-c/src/arena_flat_hash_map_test.cc b/cel-c/internal/arena_flat_hash_map_test.cc similarity index 99% rename from cel-c/src/arena_flat_hash_map_test.cc rename to cel-c/internal/arena_flat_hash_map_test.cc index c6e2d83..20c1439 100644 --- a/cel-c/src/arena_flat_hash_map_test.cc +++ b/cel-c/internal/arena_flat_hash_map_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/arena_flat_hash_map.h" +#include "cel-c/internal/arena_flat_hash_map.h" #include diff --git a/cel-c/src/arena_string.h b/cel-c/internal/arena_string.h similarity index 96% rename from cel-c/src/arena_string.h rename to cel-c/internal/arena_string.h index f4074b1..1458946 100644 --- a/cel-c/src/arena_string.h +++ b/cel-c/internal/arena_string.h @@ -15,8 +15,8 @@ // Internal header providing a generic string implementation which uses // arena-based memory management. -#ifndef THIRD_PARTY_CEL_C_SRC_ARENA_STRING_H_ -#define THIRD_PARTY_CEL_C_SRC_ARENA_STRING_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_ARENA_STRING_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_ARENA_STRING_H_ #include #include // IWYU pragma: keep @@ -25,7 +25,7 @@ #include "cel-c/arena.h" #include "cel-c/config.h" #include "cel-c/cstring_view.h" -#include "cel-c/src/generic_string.h" +#include "cel-c/internal/generic_string.h" #include "cel-c/string_view.h" CEL_BEGIN_DECLS @@ -158,4 +158,4 @@ _cel_ArenaString_ToCStringView(CEL_NONNULL(const _cel_ArenaString*) str) { CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_ARENA_STRING_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_ARENA_STRING_H_ diff --git a/cel-c/src/arena_string_test.cc b/cel-c/internal/arena_string_test.cc similarity index 99% rename from cel-c/src/arena_string_test.cc rename to cel-c/internal/arena_string_test.cc index b0a2e9f..7644e7d 100644 --- a/cel-c/src/arena_string_test.cc +++ b/cel-c/internal/arena_string_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/arena_string.h" +#include "cel-c/internal/arena_string.h" #include @@ -23,7 +23,7 @@ #include "cel-c/arena.h" #include "cel-c/config.h" #include "cel-c/cstring_view.h" -#include "cel-c/src/generic_string.h" +#include "cel-c/internal/generic_string.h" #include "cel-c/string_view.h" namespace { diff --git a/cel-c/src/array.h b/cel-c/internal/array.h similarity index 98% rename from cel-c/src/array.h rename to cel-c/internal/array.h index d1fef70..60db98b 100644 --- a/cel-c/src/array.h +++ b/cel-c/internal/array.h @@ -15,8 +15,8 @@ // Internal header providing a dynamic array implementation which uses // allocator-based memory management. -#ifndef THIRD_PARTY_CEL_C_SRC_ARRAY_H_ -#define THIRD_PARTY_CEL_C_SRC_ARRAY_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_ARRAY_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_ARRAY_H_ #include // IWYU pragma: keep #include // IWYU pragma: keep @@ -24,7 +24,7 @@ #include "cel-c/alloc.h" #include "cel-c/config.h" -#include "cel-c/src/generic_array.h" +#include "cel-c/internal/generic_array.h" CEL_BEGIN_DECLS @@ -402,4 +402,4 @@ static CEL_INLINE CEL_NULLABLE(void*) CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_ARRAY_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_ARRAY_H_ diff --git a/cel-c/src/array_test.cc b/cel-c/internal/array_test.cc similarity index 99% rename from cel-c/src/array_test.cc rename to cel-c/internal/array_test.cc index fd087db..de26c9f 100644 --- a/cel-c/src/array_test.cc +++ b/cel-c/internal/array_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/array.h" +#include "cel-c/internal/array.h" #include diff --git a/cel-c/src/asan.h b/cel-c/internal/asan.h similarity index 96% rename from cel-c/src/asan.h rename to cel-c/internal/asan.h index 46922df..3c22d62 100644 --- a/cel-c/src/asan.h +++ b/cel-c/internal/asan.h @@ -14,10 +14,10 @@ // Internal header providing wrappers around the ASan interface. -#ifndef THIRD_PARTY_CEL_C_SRC_ASAN_H_ -#define THIRD_PARTY_CEL_C_SRC_ASAN_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_ASAN_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_ASAN_H_ -#include "cel-c/src/config.h" +#include "cel-c/internal/config.h" #ifdef _CEL_HAVE_ASAN #include @@ -112,4 +112,4 @@ CEL_END_DECLS #define _CEL_ATTRIBUTE_NO_SANITIZE_ADDRESS #endif -#endif // THIRD_PARTY_CEL_C_SRC_ASAN_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_ASAN_H_ diff --git a/cel-c/src/binary_search.h b/cel-c/internal/binary_search.h similarity index 91% rename from cel-c/src/binary_search.h rename to cel-c/internal/binary_search.h index 8060bdd..c3a062d 100644 --- a/cel-c/src/binary_search.h +++ b/cel-c/internal/binary_search.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_BINARY_SEARCH_H_ -#define THIRD_PARTY_CEL_C_SRC_BINARY_SEARCH_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_BINARY_SEARCH_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_BINARY_SEARCH_H_ #include #include @@ -62,4 +62,4 @@ static inline void* cel_nullable _cel_BinarySearch( CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_BINARY_SEARCH_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_BINARY_SEARCH_H_ diff --git a/cel-c/src/binary_search_test.cc b/cel-c/internal/binary_search_test.cc similarity index 98% rename from cel-c/src/binary_search_test.cc rename to cel-c/internal/binary_search_test.cc index ddbef53..2abaff8 100644 --- a/cel-c/src/binary_search_test.cc +++ b/cel-c/internal/binary_search_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/binary_search.h" +#include "cel-c/internal/binary_search.h" #include #include diff --git a/cel-c/src/bit.cc b/cel-c/internal/bit.cc similarity index 99% rename from cel-c/src/bit.cc rename to cel-c/internal/bit.cc index 8cfd869..d0c53ca 100644 --- a/cel-c/src/bit.cc +++ b/cel-c/internal/bit.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/bit.h" +#include "cel-c/internal/bit.h" #include // IWYU pragma: keep #include // IWYU pragma: keep diff --git a/cel-c/src/bit.h b/cel-c/internal/bit.h similarity index 99% rename from cel-c/src/bit.h rename to cel-c/internal/bit.h index 75966ae..a4df850 100644 --- a/cel-c/src/bit.h +++ b/cel-c/internal/bit.h @@ -16,8 +16,8 @@ // available, otherwise falls back to compiler intrinsics or a pure // implementation. -#ifndef THIRD_PARTY_CEL_C_SRC_BIT_H_ -#define THIRD_PARTY_CEL_C_SRC_BIT_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_BIT_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_BIT_H_ #include // IWYU pragma: keep #include // IWYU pragma: keep @@ -782,4 +782,4 @@ CEL_END_DECLS // NOLINTEND(google-runtime-int) // NOLINTEND(runtime/int) -#endif // THIRD_PARTY_CEL_C_SRC_BIT_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_BIT_H_ diff --git a/cel-c/src/bit_test.cc b/cel-c/internal/bit_test.cc similarity index 99% rename from cel-c/src/bit_test.cc rename to cel-c/internal/bit_test.cc index ab43b58..0e77ca3 100644 --- a/cel-c/src/bit_test.cc +++ b/cel-c/internal/bit_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/bit.h" +#include "cel-c/internal/bit.h" #include diff --git a/cel-c/src/bitset.cc b/cel-c/internal/bitset.cc similarity index 96% rename from cel-c/src/bitset.cc rename to cel-c/internal/bitset.cc index aaca874..f3a1f64 100644 --- a/cel-c/src/bitset.cc +++ b/cel-c/internal/bitset.cc @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/bitset.h" +#include "cel-c/internal/bitset.h" #include // IWYU pragma: keep #include #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/bit.h" +#include "cel-c/internal/bit.h" extern "C" bool _cel_BitSet_Next(CEL_NULLABLE(const _cel_BitSetWord*) words, size_t bits, CEL_NONNULL(size_t*) bit) { diff --git a/cel-c/src/bitset.h b/cel-c/internal/bitset.h similarity index 96% rename from cel-c/src/bitset.h rename to cel-c/internal/bitset.h index fe51b1f..9b27045 100644 --- a/cel-c/src/bitset.h +++ b/cel-c/internal/bitset.h @@ -14,8 +14,8 @@ // Internal header providing functions for working with bit sets. -#ifndef THIRD_PARTY_CEL_C_SRC_BITSET_H_ -#define THIRD_PARTY_CEL_C_SRC_BITSET_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_BITSET_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_BITSET_H_ #include #include @@ -130,4 +130,4 @@ bool _cel_BitSet_Next(CEL_NULLABLE(const _cel_BitSetWord*) words, size_t bits, CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_BITSET_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_BITSET_H_ diff --git a/cel-c/src/bitset_test.cc b/cel-c/internal/bitset_test.cc similarity index 98% rename from cel-c/src/bitset_test.cc rename to cel-c/internal/bitset_test.cc index cb76ebe..7ce976d 100644 --- a/cel-c/src/bitset_test.cc +++ b/cel-c/internal/bitset_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/bitset.h" +#include "cel-c/internal/bitset.h" #include diff --git a/cel-c/src/charconv.cc b/cel-c/internal/charconv.cc similarity index 98% rename from cel-c/src/charconv.cc rename to cel-c/internal/charconv.cc index 3cbf508..95dc257 100644 --- a/cel-c/src/charconv.cc +++ b/cel-c/internal/charconv.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/charconv.h" +#include "cel-c/internal/charconv.h" #include #include @@ -25,9 +25,9 @@ #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/ckdint.h" -#include "cel-c/src/config.h" -#include "cel-c/src/ctype.h" +#include "cel-c/internal/ckdint.h" +#include "cel-c/internal/config.h" +#include "cel-c/internal/ctype.h" // NOLINTBEGIN(runtime/int) // NOLINTBEGIN(google-runtime-int) diff --git a/cel-c/src/charconv.h b/cel-c/internal/charconv.h similarity index 98% rename from cel-c/src/charconv.h rename to cel-c/internal/charconv.h index b810a9c..f707f0a 100644 --- a/cel-c/src/charconv.h +++ b/cel-c/internal/charconv.h @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_CHARCONV_H_ -#define THIRD_PARTY_CEL_C_SRC_CHARCONV_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_CHARCONV_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_CHARCONV_H_ #include #include #include -#include "cel-c/src/config.h" +#include "cel-c/internal/config.h" // NOLINTBEGIN(runtime/int) // NOLINTBEGIN(google-runtime-int) @@ -322,4 +322,4 @@ CEL_INLINE size_t _cel_ToChars(char* cel_nonnull first, double val) { // NOLINTEND(google-runtime-int) // NOLINTEND(runtime/int) -#endif // THIRD_PARTY_CEL_C_SRC_CHARCONV_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_CHARCONV_H_ diff --git a/cel-c/src/charconv_test.cc b/cel-c/internal/charconv_test.cc similarity index 99% rename from cel-c/src/charconv_test.cc rename to cel-c/internal/charconv_test.cc index eb007cb..9364fdf 100644 --- a/cel-c/src/charconv_test.cc +++ b/cel-c/internal/charconv_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/charconv.h" +#include "cel-c/internal/charconv.h" #include #include diff --git a/cel-c/src/ckdint.h b/cel-c/internal/ckdint.h similarity index 99% rename from cel-c/src/ckdint.h rename to cel-c/internal/ckdint.h index 5c6cf54..bf062c5 100644 --- a/cel-c/src/ckdint.h +++ b/cel-c/internal/ckdint.h @@ -16,8 +16,8 @@ // available, otherwise falls back to compiler intrinsics or a pure // implementation. -#ifndef THIRD_PARTY_CEL_C_SRC_CKDINT_H_ -#define THIRD_PARTY_CEL_C_SRC_CKDINT_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_CKDINT_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_CKDINT_H_ #include #include // IWYU pragma: keep @@ -833,4 +833,4 @@ CEL_END_DECLS // NOLINTEND(google-runtime-int) // NOLINTEND(runtime/int) -#endif // THIRD_PARTY_CEL_C_SRC_CKDINT_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_CKDINT_H_ diff --git a/cel-c/src/ckdint_test.cc b/cel-c/internal/ckdint_test.cc similarity index 99% rename from cel-c/src/ckdint_test.cc rename to cel-c/internal/ckdint_test.cc index 7e5f0bb..69f4a18 100644 --- a/cel-c/src/ckdint_test.cc +++ b/cel-c/internal/ckdint_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/ckdint.h" +#include "cel-c/internal/ckdint.h" #include diff --git a/cel-c/src/compare.h b/cel-c/internal/compare.h similarity index 88% rename from cel-c/src/compare.h rename to cel-c/internal/compare.h index d249864..cc7036e 100644 --- a/cel-c/src/compare.h +++ b/cel-c/internal/compare.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_COMPARE_H_ -#define THIRD_PARTY_CEL_C_SRC_COMPARE_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_COMPARE_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_COMPARE_H_ #include "cel-c/config.h" @@ -35,4 +35,4 @@ static CEL_INLINE _cel_PartialOrdering _cel_PartialOrdering_FromInt(int value) { CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_COMPARE_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_COMPARE_H_ diff --git a/cel-c/src/config.h b/cel-c/internal/config.h similarity index 96% rename from cel-c/src/config.h rename to cel-c/internal/config.h index 4082431..8be8120 100644 --- a/cel-c/src/config.h +++ b/cel-c/internal/config.h @@ -14,8 +14,8 @@ // IWYU pragma: always_keep -#ifndef THIRD_PARTY_CEL_C_SRC_CONFIG_H_ -#define THIRD_PARTY_CEL_C_SRC_CONFIG_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_CONFIG_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_CONFIG_H_ #include "cel-c/config.h" // IWYU pragma: export @@ -135,4 +135,4 @@ #define _CEL_HAVE_SANITIZER 1 #endif -#endif // THIRD_PARTY_CEL_C_SRC_CONFIG_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_CONFIG_H_ diff --git a/cel-c/src/config_test.cc b/cel-c/internal/config_test.cc similarity index 100% rename from cel-c/src/config_test.cc rename to cel-c/internal/config_test.cc diff --git a/cel-c/src/container.h b/cel-c/internal/container.h similarity index 95% rename from cel-c/src/container.h rename to cel-c/internal/container.h index cc1e2ac..bbf3d5d 100644 --- a/cel-c/src/container.h +++ b/cel-c/internal/container.h @@ -12,15 +12,15 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_CONTAINER_H_ -#define THIRD_PARTY_CEL_C_SRC_CONTAINER_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_CONTAINER_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_CONTAINER_H_ #include #include "cel-c/alloc.h" #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/string.h" +#include "cel-c/internal/string.h" #include "cel-c/string_view.h" CEL_BEGIN_DECLS @@ -135,4 +135,4 @@ _cel_ContainerIterator_Next(_cel_ContainerIterator* cel_nonnull iter) { CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_CONTAINER_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_CONTAINER_H_ diff --git a/cel-c/src/container_test.cc b/cel-c/internal/container_test.cc similarity index 98% rename from cel-c/src/container_test.cc rename to cel-c/internal/container_test.cc index 9a15eac..843f956 100644 --- a/cel-c/src/container_test.cc +++ b/cel-c/internal/container_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/container.h" +#include "cel-c/internal/container.h" #include #include diff --git a/cel-c/src/ctype.cc b/cel-c/internal/ctype.cc similarity index 99% rename from cel-c/src/ctype.cc rename to cel-c/internal/ctype.cc index 6e1cca8..60d41d6 100644 --- a/cel-c/src/ctype.cc +++ b/cel-c/internal/ctype.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/ctype.h" +#include "cel-c/internal/ctype.h" extern "C" const unsigned char _cel_CType_kProperties[256] = { 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, // 0x00 diff --git a/cel-c/src/ctype.h b/cel-c/internal/ctype.h similarity index 95% rename from cel-c/src/ctype.h rename to cel-c/internal/ctype.h index 36de49a..7909223 100644 --- a/cel-c/src/ctype.h +++ b/cel-c/internal/ctype.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_CTYPE_H_ -#define THIRD_PARTY_CEL_C_SRC_CTYPE_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_CTYPE_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_CTYPE_H_ #include @@ -100,4 +100,4 @@ static CEL_INLINE char _cel_toupper(unsigned char c) { CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_CTYPE_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_CTYPE_H_ diff --git a/cel-c/src/ctype_test.cc b/cel-c/internal/ctype_test.cc similarity index 98% rename from cel-c/src/ctype_test.cc rename to cel-c/internal/ctype_test.cc index dee48e0..8cba672 100644 --- a/cel-c/src/ctype_test.cc +++ b/cel-c/internal/ctype_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/ctype.h" +#include "cel-c/internal/ctype.h" #include diff --git a/cel-c/src/deque.h b/cel-c/internal/deque.h similarity index 98% rename from cel-c/src/deque.h rename to cel-c/internal/deque.h index 1cb19f5..9878dac 100644 --- a/cel-c/src/deque.h +++ b/cel-c/internal/deque.h @@ -15,8 +15,8 @@ // Internal header providing a deque implementation which uses allocator-based // memory management. -#ifndef THIRD_PARTY_CEL_C_SRC_DEQUE_H_ -#define THIRD_PARTY_CEL_C_SRC_DEQUE_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_DEQUE_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_DEQUE_H_ #include // IWYU pragma: keep #include // IWYU pragma: keep @@ -24,7 +24,7 @@ #include "cel-c/alloc.h" #include "cel-c/config.h" -#include "cel-c/src/generic_deque.h" +#include "cel-c/internal/generic_deque.h" CEL_BEGIN_DECLS @@ -272,4 +272,4 @@ static CEL_INLINE void _cel_Deque_Clear(CEL_NONNULL(_cel_Deque*) deq, CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_DEQUE_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_DEQUE_H_ diff --git a/cel-c/src/deque_test.cc b/cel-c/internal/deque_test.cc similarity index 99% rename from cel-c/src/deque_test.cc rename to cel-c/internal/deque_test.cc index c54de2c..e8973cd 100644 --- a/cel-c/src/deque_test.cc +++ b/cel-c/internal/deque_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/deque.h" +#include "cel-c/internal/deque.h" #include #include diff --git a/cel-c/src/durationconv.cc b/cel-c/internal/durationconv.cc similarity index 98% rename from cel-c/src/durationconv.cc rename to cel-c/internal/durationconv.cc index 8c48724..3d013fa 100644 --- a/cel-c/src/durationconv.cc +++ b/cel-c/internal/durationconv.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/durationconv.h" +#include "cel-c/internal/durationconv.h" #include #include diff --git a/cel-c/src/durationconv.h b/cel-c/internal/durationconv.h similarity index 93% rename from cel-c/src/durationconv.h rename to cel-c/internal/durationconv.h index e434604..f0229ae 100644 --- a/cel-c/src/durationconv.h +++ b/cel-c/internal/durationconv.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_DURATIONCONV_H_ -#define THIRD_PARTY_CEL_C_SRC_DURATIONCONV_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_DURATIONCONV_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_DURATIONCONV_H_ #include "cel-c/arena.h" #include "cel-c/config.h" @@ -69,4 +69,4 @@ CEL_END_DECLS // NOLINTEND(google-runtime-int) // NOLINTEND(runtime/int) -#endif // THIRD_PARTY_CEL_C_SRC_DURATIONCONV_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_DURATIONCONV_H_ diff --git a/cel-c/src/durationconv_test.cc b/cel-c/internal/durationconv_test.cc similarity index 99% rename from cel-c/src/durationconv_test.cc rename to cel-c/internal/durationconv_test.cc index b67e650..de3adc1 100644 --- a/cel-c/src/durationconv_test.cc +++ b/cel-c/internal/durationconv_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/durationconv.h" +#include "cel-c/internal/durationconv.h" #include #include diff --git a/cel-c/src/empty_list_value.cc b/cel-c/internal/empty_list_value.cc similarity index 99% rename from cel-c/src/empty_list_value.cc rename to cel-c/internal/empty_list_value.cc index 3ae54de..1bc004b 100644 --- a/cel-c/src/empty_list_value.cc +++ b/cel-c/internal/empty_list_value.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/empty_list_value.h" +#include "cel-c/internal/empty_list_value.h" #include #include diff --git a/cel-c/src/empty_list_value.h b/cel-c/internal/empty_list_value.h similarity index 85% rename from cel-c/src/empty_list_value.h rename to cel-c/internal/empty_list_value.h index 5d41ede..0b002cf 100644 --- a/cel-c/src/empty_list_value.h +++ b/cel-c/internal/empty_list_value.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_EMPTY_LIST_VALUE_H_ -#define THIRD_PARTY_CEL_C_SRC_EMPTY_LIST_VALUE_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_EMPTY_LIST_VALUE_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_EMPTY_LIST_VALUE_H_ #include "cel-c/assert.h" #include "cel-c/config.h" @@ -34,4 +34,4 @@ static CEL_INLINE void _cel_EmptyListValue_Set( CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_EMPTY_LIST_VALUE_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_EMPTY_LIST_VALUE_H_ diff --git a/cel-c/src/empty_list_value_test.cc b/cel-c/internal/empty_list_value_test.cc similarity index 96% rename from cel-c/src/empty_list_value_test.cc rename to cel-c/internal/empty_list_value_test.cc index a1bd3c3..e74c995 100644 --- a/cel-c/src/empty_list_value_test.cc +++ b/cel-c/internal/empty_list_value_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/empty_list_value.h" +#include "cel-c/internal/empty_list_value.h" #include @@ -20,7 +20,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "cel-c/src/value_testing.h" +#include "cel-c/internal/value_testing.h" #include "cel-c/value.h" namespace { diff --git a/cel-c/src/empty_map_value.cc b/cel-c/internal/empty_map_value.cc similarity index 99% rename from cel-c/src/empty_map_value.cc rename to cel-c/internal/empty_map_value.cc index 99ed0a1..bac17ae 100644 --- a/cel-c/src/empty_map_value.cc +++ b/cel-c/internal/empty_map_value.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/empty_map_value.h" +#include "cel-c/internal/empty_map_value.h" #include #include diff --git a/cel-c/src/empty_map_value.h b/cel-c/internal/empty_map_value.h similarity index 85% rename from cel-c/src/empty_map_value.h rename to cel-c/internal/empty_map_value.h index a1e643c..4a96fa1 100644 --- a/cel-c/src/empty_map_value.h +++ b/cel-c/internal/empty_map_value.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_EMPTY_MAP_VALUE_H_ -#define THIRD_PARTY_CEL_C_SRC_EMPTY_MAP_VALUE_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_EMPTY_MAP_VALUE_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_EMPTY_MAP_VALUE_H_ #include "cel-c/assert.h" #include "cel-c/config.h" @@ -34,4 +34,4 @@ static CEL_INLINE void _cel_EmptyMapValue_Set( CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_EMPTY_MAP_VALUE_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_EMPTY_MAP_VALUE_H_ diff --git a/cel-c/src/empty_map_value_test.cc b/cel-c/internal/empty_map_value_test.cc similarity index 97% rename from cel-c/src/empty_map_value_test.cc rename to cel-c/internal/empty_map_value_test.cc index d4d17f1..98e5b40 100644 --- a/cel-c/src/empty_map_value_test.cc +++ b/cel-c/internal/empty_map_value_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/empty_map_value.h" +#include "cel-c/internal/empty_map_value.h" #include @@ -20,7 +20,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "cel-c/src/value_testing.h" +#include "cel-c/internal/value_testing.h" #include "cel-c/status.h" #include "cel-c/value.h" diff --git a/cel-c/src/endian.h b/cel-c/internal/endian.h similarity index 96% rename from cel-c/src/endian.h rename to cel-c/internal/endian.h index 274d290..e865237 100644 --- a/cel-c/src/endian.h +++ b/cel-c/internal/endian.h @@ -15,8 +15,8 @@ // Internal header providing byte swapping functions. Uses compiler intrinsics // when available. -#ifndef THIRD_PARTY_CEL_C_SRC_ENDIAN_H_ -#define THIRD_PARTY_CEL_C_SRC_ENDIAN_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_ENDIAN_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_ENDIAN_H_ #include #include @@ -26,8 +26,8 @@ #endif #include "cel-c/assert.h" -#include "cel-c/src/config.h" -#include "cel-c/src/unaligned.h" +#include "cel-c/internal/config.h" +#include "cel-c/internal/unaligned.h" // NOLINTBEGIN(runtime/int) // NOLINTBEGIN(google-runtime-int) @@ -175,4 +175,4 @@ CEL_END_DECLS // NOLINTEND(google-runtime-int) // NOLINTEND(runtime/int) -#endif // THIRD_PARTY_CEL_C_SRC_ENDIAN_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_ENDIAN_H_ diff --git a/cel-c/src/endian_test.cc b/cel-c/internal/endian_test.cc similarity index 98% rename from cel-c/src/endian_test.cc rename to cel-c/internal/endian_test.cc index ab72d66..ab71bbe 100644 --- a/cel-c/src/endian_test.cc +++ b/cel-c/internal/endian_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/endian.h" +#include "cel-c/internal/endian.h" #include #include diff --git a/cel-c/src/flat_hash_map.h b/cel-c/internal/flat_hash_map.h similarity index 97% rename from cel-c/src/flat_hash_map.h rename to cel-c/internal/flat_hash_map.h index 666c0cb..49ad5b7 100644 --- a/cel-c/src/flat_hash_map.h +++ b/cel-c/internal/flat_hash_map.h @@ -15,8 +15,8 @@ // Internal header providing a flat hash map implementation which uses // allocator-based memory management. -#ifndef THIRD_PARTY_CEL_C_SRC_FLAT_HASH_MAP_H_ -#define THIRD_PARTY_CEL_C_SRC_FLAT_HASH_MAP_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_FLAT_HASH_MAP_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_FLAT_HASH_MAP_H_ #include // IWYU pragma: keep #include // IWYU pragma: keep @@ -25,7 +25,7 @@ #include "cel-c/alloc.h" #include "cel-c/config.h" -#include "cel-c/src/generic_flat_hash.h" +#include "cel-c/internal/generic_flat_hash.h" CEL_BEGIN_DECLS @@ -279,4 +279,4 @@ static CEL_INLINE bool _cel_FlatHashMap_MutableNext( CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_FLAT_HASH_MAP_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_FLAT_HASH_MAP_H_ diff --git a/cel-c/src/flat_hash_map_test.cc b/cel-c/internal/flat_hash_map_test.cc similarity index 99% rename from cel-c/src/flat_hash_map_test.cc rename to cel-c/internal/flat_hash_map_test.cc index cb8f224..28dd708 100644 --- a/cel-c/src/flat_hash_map_test.cc +++ b/cel-c/internal/flat_hash_map_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/flat_hash_map.h" +#include "cel-c/internal/flat_hash_map.h" #include diff --git a/cel-c/src/flat_hash_set.h b/cel-c/internal/flat_hash_set.h similarity index 97% rename from cel-c/src/flat_hash_set.h rename to cel-c/internal/flat_hash_set.h index 978e654..64cdeaa 100644 --- a/cel-c/src/flat_hash_set.h +++ b/cel-c/internal/flat_hash_set.h @@ -15,8 +15,8 @@ // Internal header providing a flat hash map implementation which uses // allocator-based memory management. -#ifndef THIRD_PARTY_CEL_C_SRC_FLAT_HASH_SET_H_ -#define THIRD_PARTY_CEL_C_SRC_FLAT_HASH_SET_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_FLAT_HASH_SET_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_FLAT_HASH_SET_H_ #include // IWYU pragma: keep #include // IWYU pragma: keep @@ -25,7 +25,7 @@ #include "cel-c/alloc.h" #include "cel-c/config.h" -#include "cel-c/src/generic_flat_hash.h" +#include "cel-c/internal/generic_flat_hash.h" CEL_BEGIN_DECLS @@ -270,4 +270,4 @@ static CEL_INLINE bool _cel_FlatHashSet_MutableNext( CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_FLAT_HASH_SET_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_FLAT_HASH_SET_H_ diff --git a/cel-c/src/flat_hash_set_test.cc b/cel-c/internal/flat_hash_set_test.cc similarity index 99% rename from cel-c/src/flat_hash_set_test.cc rename to cel-c/internal/flat_hash_set_test.cc index 1f733a6..e86602c 100644 --- a/cel-c/src/flat_hash_set_test.cc +++ b/cel-c/internal/flat_hash_set_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/flat_hash_set.h" +#include "cel-c/internal/flat_hash_set.h" #include diff --git a/cel-c/src/generic_array.cc b/cel-c/internal/generic_array.cc similarity index 98% rename from cel-c/src/generic_array.cc rename to cel-c/internal/generic_array.cc index 788ef04..6e1c22d 100644 --- a/cel-c/src/generic_array.cc +++ b/cel-c/internal/generic_array.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/generic_array.h" +#include "cel-c/internal/generic_array.h" #include #include // IWYU pragma: keep @@ -22,9 +22,9 @@ #include "cel-c/alloc.h" #include "cel-c/arena.h" #include "cel-c/assert.h" -#include "cel-c/src/asan.h" -#include "cel-c/src/ckdint.h" -#include "cel-c/src/config.h" +#include "cel-c/internal/asan.h" +#include "cel-c/internal/ckdint.h" +#include "cel-c/internal/config.h" static void _cel_GenericArray_Annotate(CEL_NULLABLE(const void*) ptr, size_t cap, size_t old_len, diff --git a/cel-c/src/generic_array.h b/cel-c/internal/generic_array.h similarity index 97% rename from cel-c/src/generic_array.h rename to cel-c/internal/generic_array.h index 83098cf..d6fcbeb 100644 --- a/cel-c/src/generic_array.h +++ b/cel-c/internal/generic_array.h @@ -15,10 +15,10 @@ // Internal header providing a generic dynamic array implementation. // IWYU pragma: private -// IWYU pragma: friend "cel-c/src/(?:(?:arena|generic)_)?array\.[hc]" +// IWYU pragma: friend "cel-c/internal/(?:(?:arena|generic)_)?array\.[hc]" -#ifndef THIRD_PARTY_CEL_C_SRC_GENERIC_ARRAY_H_ -#define THIRD_PARTY_CEL_C_SRC_GENERIC_ARRAY_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_GENERIC_ARRAY_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_GENERIC_ARRAY_H_ #include // IWYU pragma: keep #include @@ -26,7 +26,7 @@ #include "cel-c/alloc.h" #include "cel-c/arena.h" #include "cel-c/assert.h" -#include "cel-c/src/config.h" +#include "cel-c/internal/config.h" CEL_BEGIN_DECLS @@ -371,4 +371,4 @@ static CEL_INLINE CEL_NULLABLE(void*) CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_GENERIC_ARRAY_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_GENERIC_ARRAY_H_ diff --git a/cel-c/src/generic_deque.cc b/cel-c/internal/generic_deque.cc similarity index 99% rename from cel-c/src/generic_deque.cc rename to cel-c/internal/generic_deque.cc index 9ec1819..310b18e 100644 --- a/cel-c/src/generic_deque.cc +++ b/cel-c/internal/generic_deque.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/generic_deque.h" +#include "cel-c/internal/generic_deque.h" #include #include // IWYU pragma: keep @@ -23,8 +23,8 @@ #include "cel-c/arena.h" #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/align.h" -#include "cel-c/src/asan.h" +#include "cel-c/internal/align.h" +#include "cel-c/internal/asan.h" typedef struct _cel_GenericDequeBlock _cel_GenericDequeBlock; diff --git a/cel-c/src/generic_deque.h b/cel-c/internal/generic_deque.h similarity index 97% rename from cel-c/src/generic_deque.h rename to cel-c/internal/generic_deque.h index d0aa947..62f0411 100644 --- a/cel-c/src/generic_deque.h +++ b/cel-c/internal/generic_deque.h @@ -15,10 +15,10 @@ // Internal header providing a generic deque implementation. // IWYU pragma: private -// IWYU pragma: friend "cel-c/src/(?:(?:arena|generic)_)?deque\.[hc]" +// IWYU pragma: friend "cel-c/internal/(?:(?:arena|generic)_)?deque\.[hc]" -#ifndef THIRD_PARTY_CEL_C_SRC_GENERIC_DEQUE_H_ -#define THIRD_PARTY_CEL_C_SRC_GENERIC_DEQUE_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_GENERIC_DEQUE_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_GENERIC_DEQUE_H_ #include // IWYU pragma: keep #include @@ -232,4 +232,4 @@ void _cel_GenericDeque_ClearArena(CEL_NONNULL(_cel_GenericDeque*) deq); CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_GENERIC_DEQUE_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_GENERIC_DEQUE_H_ diff --git a/cel-c/src/generic_flat_hash.cc b/cel-c/internal/generic_flat_hash.cc similarity index 99% rename from cel-c/src/generic_flat_hash.cc rename to cel-c/internal/generic_flat_hash.cc index f45ad33..b9a013f 100644 --- a/cel-c/src/generic_flat_hash.cc +++ b/cel-c/internal/generic_flat_hash.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/generic_flat_hash.h" +#include "cel-c/internal/generic_flat_hash.h" #include #include // IWYU pragma: keep @@ -25,9 +25,9 @@ #include "cel-c/arena.h" #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/align.h" -#include "cel-c/src/bit.h" -#include "cel-c/src/bitset.h" +#include "cel-c/internal/align.h" +#include "cel-c/internal/bit.h" +#include "cel-c/internal/bitset.h" CEL_ATTRIBUTE_NODISCARD static size_t _cel_GenericFlatHash_Rehash( diff --git a/cel-c/src/generic_flat_hash.h b/cel-c/internal/generic_flat_hash.h similarity index 94% rename from cel-c/src/generic_flat_hash.h rename to cel-c/internal/generic_flat_hash.h index 615246f..dc5b04f 100644 --- a/cel-c/src/generic_flat_hash.h +++ b/cel-c/internal/generic_flat_hash.h @@ -15,10 +15,10 @@ // Internal header providing a generic flat hash implementation. // IWYU pragma: private -// IWYU pragma: friend "cel-c/src/(?:(?:arena|generic)_)?flat_hash(?:_(?:set|map))?\.[hc]" +// IWYU pragma: friend "cel-c/internal/(?:(?:arena|generic)_)?flat_hash(?:_(?:set|map))?\.[hc]" -#ifndef THIRD_PARTY_CEL_C_SRC_GENERIC_FLAT_HASH_H_ -#define THIRD_PARTY_CEL_C_SRC_GENERIC_FLAT_HASH_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_GENERIC_FLAT_HASH_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_GENERIC_FLAT_HASH_H_ #include // IWYU pragma: keep #include @@ -27,7 +27,7 @@ #include "cel-c/arena.h" #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/bitset.h" +#include "cel-c/internal/bitset.h" CEL_BEGIN_DECLS @@ -157,4 +157,4 @@ static CEL_INLINE bool _cel_GenericFlatHash_MutableNext( CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_GENERIC_FLAT_HASH_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_GENERIC_FLAT_HASH_H_ diff --git a/cel-c/src/generic_string.cc b/cel-c/internal/generic_string.cc similarity index 99% rename from cel-c/src/generic_string.cc rename to cel-c/internal/generic_string.cc index 792100c..94bb64f 100644 --- a/cel-c/src/generic_string.cc +++ b/cel-c/internal/generic_string.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/generic_string.h" +#include "cel-c/internal/generic_string.h" #include #include @@ -27,8 +27,8 @@ #include "cel-c/arena.h" #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/asan.h" -#include "cel-c/src/ckdint.h" +#include "cel-c/internal/asan.h" +#include "cel-c/internal/ckdint.h" #include "cel-c/string_view.h" static void _cel_GenericString_AnnotateNew(CEL_NONNULL(char*) str, size_t len, diff --git a/cel-c/src/generic_string.h b/cel-c/internal/generic_string.h similarity index 97% rename from cel-c/src/generic_string.h rename to cel-c/internal/generic_string.h index ffd6e4e..eb49244 100644 --- a/cel-c/src/generic_string.h +++ b/cel-c/internal/generic_string.h @@ -15,10 +15,10 @@ // Internal header providing a generic string implementation. // IWYU pragma: private -// IWYU pragma: friend "cel-c/src/(?:(?:arena|generic)_)?string\.[hc]" +// IWYU pragma: friend "cel-c/internal/(?:(?:arena|generic)_)?string\.[hc]" -#ifndef THIRD_PARTY_CEL_C_SRC_GENERIC_STRING_H_ -#define THIRD_PARTY_CEL_C_SRC_GENERIC_STRING_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_GENERIC_STRING_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_GENERIC_STRING_H_ #include #include @@ -263,4 +263,4 @@ _cel_GenericString_ToCStringView(CEL_NONNULL(const _cel_GenericString*) str) { CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_GENERIC_STRING_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_GENERIC_STRING_H_ diff --git a/cel-c/src/generic_string_test.cc b/cel-c/internal/generic_string_test.cc similarity index 96% rename from cel-c/src/generic_string_test.cc rename to cel-c/internal/generic_string_test.cc index 3e52bcd..0515d60 100644 --- a/cel-c/src/generic_string_test.cc +++ b/cel-c/internal/generic_string_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/generic_string.h" +#include "cel-c/internal/generic_string.h" #include diff --git a/cel-c/src/list_value.cc b/cel-c/internal/list_value.cc similarity index 100% rename from cel-c/src/list_value.cc rename to cel-c/internal/list_value.cc diff --git a/cel-c/src/list_value_test.cc b/cel-c/internal/list_value_test.cc similarity index 99% rename from cel-c/src/list_value_test.cc rename to cel-c/internal/list_value_test.cc index c2aff38..43dede0 100644 --- a/cel-c/src/list_value_test.cc +++ b/cel-c/internal/list_value_test.cc @@ -18,8 +18,8 @@ #include "cel-c/config.h" #include "cel-c/error.h" #include "cel-c/error_code.h" -#include "cel-c/src/empty_list_value.h" -#include "cel-c/src/value_testing.h" +#include "cel-c/internal/empty_list_value.h" +#include "cel-c/internal/value_testing.h" #include "cel-c/status.h" #include "cel-c/string_view.h" #include "cel-c/value.h" diff --git a/cel-c/src/malloc.cc b/cel-c/internal/malloc.cc similarity index 96% rename from cel-c/src/malloc.cc rename to cel-c/internal/malloc.cc index 4896d9b..60f0c74 100644 --- a/cel-c/src/malloc.cc +++ b/cel-c/internal/malloc.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/malloc.h" +#include "cel-c/internal/malloc.h" #if defined(__APPLE__) #include @@ -31,9 +31,9 @@ #include #include "cel-c/assert.h" -#include "cel-c/src/bit.h" -#include "cel-c/src/ckdint.h" -#include "cel-c/src/config.h" +#include "cel-c/internal/bit.h" +#include "cel-c/internal/ckdint.h" +#include "cel-c/internal/config.h" #ifdef _CEL_HAVE_SANITIZER #include diff --git a/cel-c/src/malloc.h b/cel-c/internal/malloc.h similarity index 94% rename from cel-c/src/malloc.h rename to cel-c/internal/malloc.h index 937a8b4..b06c1fd 100644 --- a/cel-c/src/malloc.h +++ b/cel-c/internal/malloc.h @@ -14,12 +14,12 @@ // Internal header exposing an interface to malloc. -#ifndef THIRD_PARTY_CEL_C_SRC_MALLOC_H_ -#define THIRD_PARTY_CEL_C_SRC_MALLOC_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_MALLOC_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_MALLOC_H_ #include -#include "cel-c/src/config.h" +#include "cel-c/internal/config.h" CEL_BEGIN_DECLS @@ -80,4 +80,4 @@ void _cel_FreeSized(CEL_NULLABLE(void*) addr, size_t size); CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_MALLOC_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_MALLOC_H_ diff --git a/cel-c/src/malloc_test.cc b/cel-c/internal/malloc_test.cc similarity index 96% rename from cel-c/src/malloc_test.cc rename to cel-c/internal/malloc_test.cc index 516b0a2..f23a70c 100644 --- a/cel-c/src/malloc_test.cc +++ b/cel-c/internal/malloc_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/malloc.h" +#include "cel-c/internal/malloc.h" #include #include @@ -20,7 +20,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" #include "cel-c/config.h" -#include "cel-c/src/align.h" +#include "cel-c/internal/align.h" namespace { diff --git a/cel-c/src/map_value.cc b/cel-c/internal/map_value.cc similarity index 99% rename from cel-c/src/map_value.cc rename to cel-c/internal/map_value.cc index c749fad..e7eefdd 100644 --- a/cel-c/src/map_value.cc +++ b/cel-c/internal/map_value.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/map_value.h" +#include "cel-c/internal/map_value.h" #include #include @@ -21,8 +21,8 @@ #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/array.h" -#include "cel-c/src/sort.h" +#include "cel-c/internal/array.h" +#include "cel-c/internal/sort.h" #include "cel-c/status.h" #include "cel-c/value.h" #include "cel-c/value_kind.h" diff --git a/cel-c/src/map_value.h b/cel-c/internal/map_value.h similarity index 98% rename from cel-c/src/map_value.h rename to cel-c/internal/map_value.h index c4ecfb6..bbdb98b 100644 --- a/cel-c/src/map_value.h +++ b/cel-c/internal/map_value.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_MAP_VALUE_H_ -#define THIRD_PARTY_CEL_C_SRC_MAP_VALUE_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_MAP_VALUE_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_MAP_VALUE_H_ #include @@ -378,4 +378,4 @@ static inline void _cel_MapValueKey_FromMessageValue( CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_MAP_VALUE_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_MAP_VALUE_H_ diff --git a/cel-c/src/map_value_test.cc b/cel-c/internal/map_value_test.cc similarity index 99% rename from cel-c/src/map_value_test.cc rename to cel-c/internal/map_value_test.cc index 13fc79d..3afb4ae 100644 --- a/cel-c/src/map_value_test.cc +++ b/cel-c/internal/map_value_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/map_value.h" +#include "cel-c/internal/map_value.h" #include #include @@ -23,8 +23,8 @@ #include "cel-c/error.h" #include "cel-c/error_code.h" #include "cel-c/hash.h" -#include "cel-c/src/empty_map_value.h" -#include "cel-c/src/value_testing.h" +#include "cel-c/internal/empty_map_value.h" +#include "cel-c/internal/value_testing.h" #include "cel-c/status.h" #include "cel-c/string_view.h" #include "cel-c/value.h" diff --git a/cel-c/src/memory.cc b/cel-c/internal/memory.cc similarity index 98% rename from cel-c/src/memory.cc rename to cel-c/internal/memory.cc index e2b4d39..f2f94d0 100644 --- a/cel-c/src/memory.cc +++ b/cel-c/internal/memory.cc @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/memory.h" +#include "cel-c/internal/memory.h" #include // IWYU pragma: keep #include #include #include "cel-c/assert.h" -#include "cel-c/src/config.h" +#include "cel-c/internal/config.h" #ifndef __GLIBC__ static inline void* memrchr(const void* b, int c, size_t len) { diff --git a/cel-c/src/memory.h b/cel-c/internal/memory.h similarity index 94% rename from cel-c/src/memory.h rename to cel-c/internal/memory.h index 76f9a02..7bd95b0 100644 --- a/cel-c/src/memory.h +++ b/cel-c/internal/memory.h @@ -14,13 +14,13 @@ // Internal header providing miscellaneous memory functions. -#ifndef THIRD_PARTY_CEL_C_SRC_MEMORY_H_ -#define THIRD_PARTY_CEL_C_SRC_MEMORY_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_MEMORY_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_MEMORY_H_ #include #include -#include "cel-c/src/config.h" +#include "cel-c/internal/config.h" CEL_BEGIN_DECLS @@ -86,4 +86,4 @@ _cel_Memory_FindLast(CEL_NULLABLE(const void*) hay_data, size_t hay_size, CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_MEMORY_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_MEMORY_H_ diff --git a/cel-c/src/memory_test.cc b/cel-c/internal/memory_test.cc similarity index 99% rename from cel-c/src/memory_test.cc rename to cel-c/internal/memory_test.cc index df19dcb..14248d2 100644 --- a/cel-c/src/memory_test.cc +++ b/cel-c/internal/memory_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/memory.h" +#include "cel-c/internal/memory.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/cel-c/src/message_equality.cc b/cel-c/internal/message_equality.cc similarity index 99% rename from cel-c/src/message_equality.cc rename to cel-c/internal/message_equality.cc index 1836679..899eb49 100644 --- a/cel-c/src/message_equality.cc +++ b/cel-c/internal/message_equality.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/message_equality.h" +#include "cel-c/internal/message_equality.h" #include #include @@ -22,9 +22,9 @@ #include "cel-c/arena.h" #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/any.h" -#include "cel-c/src/number.h" -#include "cel-c/src/setjmp.h" +#include "cel-c/internal/any.h" +#include "cel-c/internal/number.h" +#include "cel-c/internal/setjmp.h" #include "cel-c/string_view.h" #include "cel-c/well_known_types.h" #include "upb/base/descriptor_constants.h" diff --git a/cel-c/src/message_equality.h b/cel-c/internal/message_equality.h similarity index 92% rename from cel-c/src/message_equality.h rename to cel-c/internal/message_equality.h index 9985fa1..bfcb082 100644 --- a/cel-c/src/message_equality.h +++ b/cel-c/internal/message_equality.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_MESSAGE_EQUALITY_H_ -#define THIRD_PARTY_CEL_C_SRC_MESSAGE_EQUALITY_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_MESSAGE_EQUALITY_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_MESSAGE_EQUALITY_H_ #include @@ -62,4 +62,4 @@ _cel_MessageEquality _cel_MessageField_Equals( CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_MESSAGE_EQUALITY_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_MESSAGE_EQUALITY_H_ diff --git a/cel-c/src/message_equality_test.cc b/cel-c/internal/message_equality_test.cc similarity index 99% rename from cel-c/src/message_equality_test.cc rename to cel-c/internal/message_equality_test.cc index a4c7a0f..6362d78 100644 --- a/cel-c/src/message_equality_test.cc +++ b/cel-c/internal/message_equality_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/message_equality.h" +#include "cel-c/internal/message_equality.h" #include #include diff --git a/cel-c/src/mutable_list_value.cc b/cel-c/internal/mutable_list_value.cc similarity index 98% rename from cel-c/src/mutable_list_value.cc rename to cel-c/internal/mutable_list_value.cc index 2da0489..5ac7ae8 100644 --- a/cel-c/src/mutable_list_value.cc +++ b/cel-c/internal/mutable_list_value.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/mutable_list_value.h" +#include "cel-c/internal/mutable_list_value.h" #include #include @@ -25,8 +25,8 @@ #include "cel-c/config.h" #include "cel-c/error.h" #include "cel-c/error_code.h" -#include "cel-c/src/ckdint.h" -#include "cel-c/src/empty_list_value.h" +#include "cel-c/internal/ckdint.h" +#include "cel-c/internal/empty_list_value.h" #include "cel-c/status.h" #include "cel-c/string_view.h" #include "cel-c/value.h" diff --git a/cel-c/src/mutable_list_value.h b/cel-c/internal/mutable_list_value.h similarity index 91% rename from cel-c/src/mutable_list_value.h rename to cel-c/internal/mutable_list_value.h index e642e98..84978bf 100644 --- a/cel-c/src/mutable_list_value.h +++ b/cel-c/internal/mutable_list_value.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_MUTABLE_LIST_VALUE_H_ -#define THIRD_PARTY_CEL_C_SRC_MUTABLE_LIST_VALUE_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_MUTABLE_LIST_VALUE_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_MUTABLE_LIST_VALUE_H_ #include #include @@ -61,4 +61,4 @@ static CEL_INLINE cel_Value* cel_nullable _cel_MutableListValue_Add( CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_MUTABLE_LIST_VALUE_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_MUTABLE_LIST_VALUE_H_ diff --git a/cel-c/src/mutable_list_value_test.cc b/cel-c/internal/mutable_list_value_test.cc similarity index 98% rename from cel-c/src/mutable_list_value_test.cc rename to cel-c/internal/mutable_list_value_test.cc index d6591dd..990c89b 100644 --- a/cel-c/src/mutable_list_value_test.cc +++ b/cel-c/internal/mutable_list_value_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/mutable_list_value.h" +#include "cel-c/internal/mutable_list_value.h" #include #include @@ -23,7 +23,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "cel-c/src/value_testing.h" +#include "cel-c/internal/value_testing.h" #include "cel-c/string_view.h" #include "cel-c/string_view_absl.h" #include "cel-c/value.h" diff --git a/cel-c/src/mutable_map_value.cc b/cel-c/internal/mutable_map_value.cc similarity index 99% rename from cel-c/src/mutable_map_value.cc rename to cel-c/internal/mutable_map_value.cc index b86c8f4..8911c99 100644 --- a/cel-c/src/mutable_map_value.cc +++ b/cel-c/internal/mutable_map_value.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/mutable_map_value.h" +#include "cel-c/internal/mutable_map_value.h" #include #include @@ -27,9 +27,9 @@ #include "cel-c/error.h" #include "cel-c/error_code.h" #include "cel-c/hash.h" -#include "cel-c/src/bit.h" -#include "cel-c/src/empty_map_value.h" -#include "cel-c/src/map_value.h" +#include "cel-c/internal/bit.h" +#include "cel-c/internal/empty_map_value.h" +#include "cel-c/internal/map_value.h" #include "cel-c/status.h" #include "cel-c/string_view.h" #include "cel-c/value.h" diff --git a/cel-c/src/mutable_map_value.h b/cel-c/internal/mutable_map_value.h similarity index 92% rename from cel-c/src/mutable_map_value.h rename to cel-c/internal/mutable_map_value.h index 41280ef..d8f65b7 100644 --- a/cel-c/src/mutable_map_value.h +++ b/cel-c/internal/mutable_map_value.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_MUTABLE_MAP_VALUE_H_ -#define THIRD_PARTY_CEL_C_SRC_MUTABLE_MAP_VALUE_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_MUTABLE_MAP_VALUE_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_MUTABLE_MAP_VALUE_H_ #include #include @@ -63,4 +63,4 @@ _cel_MutableMapValueInsertResult _cel_MutableMapValue_Insert( CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_MUTABLE_MAP_VALUE_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_MUTABLE_MAP_VALUE_H_ diff --git a/cel-c/src/mutable_map_value_test.cc b/cel-c/internal/mutable_map_value_test.cc similarity index 99% rename from cel-c/src/mutable_map_value_test.cc rename to cel-c/internal/mutable_map_value_test.cc index ca44326..6bff0eb 100644 --- a/cel-c/src/mutable_map_value_test.cc +++ b/cel-c/internal/mutable_map_value_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/mutable_map_value.h" +#include "cel-c/internal/mutable_map_value.h" #include #include @@ -23,7 +23,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "cel-c/src/value_testing.h" +#include "cel-c/internal/value_testing.h" #include "cel-c/string_view.h" #include "cel-c/string_view_absl.h" #include "cel-c/value.h" diff --git a/cel-c/src/number.h b/cel-c/internal/number.h similarity index 98% rename from cel-c/src/number.h rename to cel-c/internal/number.h index 785c336..2db1873 100644 --- a/cel-c/src/number.h +++ b/cel-c/internal/number.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_NUMERIC_H_ -#define THIRD_PARTY_CEL_C_SRC_NUMERIC_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_NUMERIC_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_NUMERIC_H_ #include #include @@ -23,7 +23,7 @@ #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/compare.h" +#include "cel-c/internal/compare.h" CEL_BEGIN_DECLS @@ -361,4 +361,4 @@ static CEL_INLINE double _cel_Number_ToDouble(_cel_Number in) { CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_NUMERIC_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_NUMERIC_H_ diff --git a/cel-c/src/number_test.cc b/cel-c/internal/number_test.cc similarity index 99% rename from cel-c/src/number_test.cc rename to cel-c/internal/number_test.cc index beb2782..aae47f9 100644 --- a/cel-c/src/number_test.cc +++ b/cel-c/internal/number_test.cc @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/number.h" +#include "cel-c/internal/number.h" #include #include #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "cel-c/src/compare.h" +#include "cel-c/internal/compare.h" namespace { diff --git a/cel-c/src/opaque_value.cc b/cel-c/internal/opaque_value.cc similarity index 100% rename from cel-c/src/opaque_value.cc rename to cel-c/internal/opaque_value.cc diff --git a/cel-c/src/opaque_value_test.cc b/cel-c/internal/opaque_value_test.cc similarity index 98% rename from cel-c/src/opaque_value_test.cc rename to cel-c/internal/opaque_value_test.cc index a13cd79..f81fbba 100644 --- a/cel-c/src/opaque_value_test.cc +++ b/cel-c/internal/opaque_value_test.cc @@ -14,7 +14,7 @@ #include "gtest/gtest.h" #include "cel-c/config.h" -#include "cel-c/src/value_testing.h" +#include "cel-c/internal/value_testing.h" #include "cel-c/status.h" #include "cel-c/string_view.h" #include "cel-c/value.h" diff --git a/cel-c/src/optional_value.cc b/cel-c/internal/optional_value.cc similarity index 100% rename from cel-c/src/optional_value.cc rename to cel-c/internal/optional_value.cc diff --git a/cel-c/src/optional_value_test.cc b/cel-c/internal/optional_value_test.cc similarity index 99% rename from cel-c/src/optional_value_test.cc rename to cel-c/internal/optional_value_test.cc index 1b758c7..bc0a5d4 100644 --- a/cel-c/src/optional_value_test.cc +++ b/cel-c/internal/optional_value_test.cc @@ -14,8 +14,8 @@ #include "gtest/gtest.h" #include "cel-c/duration.h" -#include "cel-c/src/empty_list_value.h" -#include "cel-c/src/value_testing.h" +#include "cel-c/internal/empty_list_value.h" +#include "cel-c/internal/value_testing.h" #include "cel-c/string_view.h" #include "cel-c/timestamp.h" #include "cel-c/value.h" diff --git a/cel-c/src/parsed_map_field_value.cc b/cel-c/internal/parsed_map_field_value.cc similarity index 99% rename from cel-c/src/parsed_map_field_value.cc rename to cel-c/internal/parsed_map_field_value.cc index 038f8be..8bf7d81 100644 --- a/cel-c/src/parsed_map_field_value.cc +++ b/cel-c/internal/parsed_map_field_value.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/parsed_map_field_value.h" +#include "cel-c/internal/parsed_map_field_value.h" #include #include @@ -24,8 +24,8 @@ #include "cel-c/config.h" #include "cel-c/error.h" #include "cel-c/error_code.h" -#include "cel-c/src/map_value.h" -#include "cel-c/src/message_equality.h" +#include "cel-c/internal/map_value.h" +#include "cel-c/internal/message_equality.h" #include "cel-c/status.h" #include "cel-c/status_code.h" #include "cel-c/string_view.h" diff --git a/cel-c/src/parsed_map_field_value.h b/cel-c/internal/parsed_map_field_value.h similarity index 85% rename from cel-c/src/parsed_map_field_value.h rename to cel-c/internal/parsed_map_field_value.h index 96c4f61..41a2706 100644 --- a/cel-c/src/parsed_map_field_value.h +++ b/cel-c/internal/parsed_map_field_value.h @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_PARSED_MAP_FIELD_VALUE_H_ -#define THIRD_PARTY_CEL_C_SRC_PARSED_MAP_FIELD_VALUE_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_PARSED_MAP_FIELD_VALUE_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_PARSED_MAP_FIELD_VALUE_H_ #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/empty_map_value.h" +#include "cel-c/internal/empty_map_value.h" #include "cel-c/value.h" #include "upb/message/map.h" #include "upb/reflection/def.h" @@ -44,4 +44,4 @@ static CEL_INLINE void _cel_ParsedMapFieldValue_Set( CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_PARSED_MAP_FIELD_VALUE_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_PARSED_MAP_FIELD_VALUE_H_ diff --git a/cel-c/src/parsed_map_field_value_test.cc b/cel-c/internal/parsed_map_field_value_test.cc similarity index 99% rename from cel-c/src/parsed_map_field_value_test.cc rename to cel-c/internal/parsed_map_field_value_test.cc index f559334..d98aad3 100644 --- a/cel-c/src/parsed_map_field_value_test.cc +++ b/cel-c/internal/parsed_map_field_value_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/parsed_map_field_value.h" +#include "cel-c/internal/parsed_map_field_value.h" #include #include @@ -23,7 +23,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "cel-c/src/value_testing.h" +#include "cel-c/internal/value_testing.h" #include "cel-c/status.h" #include "cel-c/string_view.h" #include "cel-c/string_view_absl.h" diff --git a/cel-c/src/parsed_message_value.cc b/cel-c/internal/parsed_message_value.cc similarity index 99% rename from cel-c/src/parsed_message_value.cc rename to cel-c/internal/parsed_message_value.cc index dbb4e64..ce077c6 100644 --- a/cel-c/src/parsed_message_value.cc +++ b/cel-c/internal/parsed_message_value.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/parsed_message_value.h" +#include "cel-c/internal/parsed_message_value.h" #include #include @@ -24,7 +24,7 @@ #include "cel-c/config.h" #include "cel-c/error.h" #include "cel-c/error_code.h" -#include "cel-c/src/message_equality.h" +#include "cel-c/internal/message_equality.h" #include "cel-c/status.h" #include "cel-c/status_code.h" #include "cel-c/string_view.h" diff --git a/cel-c/src/parsed_message_value.h b/cel-c/internal/parsed_message_value.h similarity index 88% rename from cel-c/src/parsed_message_value.h rename to cel-c/internal/parsed_message_value.h index eb0f4fa..9a4b886 100644 --- a/cel-c/src/parsed_message_value.h +++ b/cel-c/internal/parsed_message_value.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_PARSED_MESSAGE_VALUE_H_ -#define THIRD_PARTY_CEL_C_SRC_PARSED_MESSAGE_VALUE_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_PARSED_MESSAGE_VALUE_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_PARSED_MESSAGE_VALUE_H_ #include "cel-c/assert.h" #include "cel-c/config.h" @@ -42,4 +42,4 @@ static CEL_INLINE void _cel_ParsedMessageValue_Set( CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_PARSED_MESSAGE_VALUE_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_PARSED_MESSAGE_VALUE_H_ diff --git a/cel-c/src/parsed_message_value_test.cc b/cel-c/internal/parsed_message_value_test.cc similarity index 99% rename from cel-c/src/parsed_message_value_test.cc rename to cel-c/internal/parsed_message_value_test.cc index 7d5e252..8996652 100644 --- a/cel-c/src/parsed_message_value_test.cc +++ b/cel-c/internal/parsed_message_value_test.cc @@ -1,4 +1,4 @@ -#include "cel-c/src/parsed_message_value.h" +#include "cel-c/internal/parsed_message_value.h" #include #include @@ -9,7 +9,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "cel-c/src/value_testing.h" +#include "cel-c/internal/value_testing.h" #include "cel-c/string_view.h" #include "cel-c/string_view_absl.h" #include "cel-c/value.h" diff --git a/cel-c/src/parsed_repeated_field_value.cc b/cel-c/internal/parsed_repeated_field_value.cc similarity index 99% rename from cel-c/src/parsed_repeated_field_value.cc rename to cel-c/internal/parsed_repeated_field_value.cc index f959b4f..2defeb9 100644 --- a/cel-c/src/parsed_repeated_field_value.cc +++ b/cel-c/internal/parsed_repeated_field_value.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/parsed_repeated_field_value.h" +#include "cel-c/internal/parsed_repeated_field_value.h" #include #include @@ -24,7 +24,7 @@ #include "cel-c/config.h" #include "cel-c/error.h" #include "cel-c/error_code.h" -#include "cel-c/src/message_equality.h" +#include "cel-c/internal/message_equality.h" #include "cel-c/status.h" #include "cel-c/status_code.h" #include "cel-c/string_view.h" diff --git a/cel-c/src/parsed_repeated_field_value.h b/cel-c/internal/parsed_repeated_field_value.h similarity index 85% rename from cel-c/src/parsed_repeated_field_value.h rename to cel-c/internal/parsed_repeated_field_value.h index d3eb409..669ab76 100644 --- a/cel-c/src/parsed_repeated_field_value.h +++ b/cel-c/internal/parsed_repeated_field_value.h @@ -12,12 +12,12 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_PARSED_REPEATED_FIELD_VALUE_H_ -#define THIRD_PARTY_CEL_C_SRC_PARSED_REPEATED_FIELD_VALUE_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_PARSED_REPEATED_FIELD_VALUE_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_PARSED_REPEATED_FIELD_VALUE_H_ #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/empty_list_value.h" +#include "cel-c/internal/empty_list_value.h" #include "cel-c/value.h" #include "upb/message/array.h" #include "upb/reflection/def.h" @@ -46,4 +46,4 @@ static CEL_INLINE void _cel_ParsedRepeatedFieldValue_Set( CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_PARSED_REPEATED_FIELD_VALUE_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_PARSED_REPEATED_FIELD_VALUE_H_ diff --git a/cel-c/src/parsed_repeated_field_value_test.cc b/cel-c/internal/parsed_repeated_field_value_test.cc similarity index 98% rename from cel-c/src/parsed_repeated_field_value_test.cc rename to cel-c/internal/parsed_repeated_field_value_test.cc index 597f181..a185f4c 100644 --- a/cel-c/src/parsed_repeated_field_value_test.cc +++ b/cel-c/internal/parsed_repeated_field_value_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/parsed_repeated_field_value.h" +#include "cel-c/internal/parsed_repeated_field_value.h" #include #include @@ -23,7 +23,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" -#include "cel-c/src/value_testing.h" +#include "cel-c/internal/value_testing.h" #include "cel-c/string_view.h" #include "cel-c/string_view_absl.h" #include "cel-c/value.h" diff --git a/cel-c/src/rc.h b/cel-c/internal/rc.h similarity index 95% rename from cel-c/src/rc.h rename to cel-c/internal/rc.h index 1d68c31..317138f 100644 --- a/cel-c/src/rc.h +++ b/cel-c/internal/rc.h @@ -14,8 +14,8 @@ // Internal header providing thread-compatible reference counting. -#ifndef THIRD_PARTY_CEL_C_SRC_RC_H_ -#define THIRD_PARTY_CEL_C_SRC_RC_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_RC_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_RC_H_ #include #include // IWYU pragma: keep @@ -97,4 +97,4 @@ CEL_END_DECLS // NOLINTEND(google-runtime-int) // NOLINTEND(runtime/int) -#endif // THIRD_PARTY_CEL_C_SRC_RC_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_RC_H_ diff --git a/cel-c/src/rc_test.cc b/cel-c/internal/rc_test.cc similarity index 97% rename from cel-c/src/rc_test.cc rename to cel-c/internal/rc_test.cc index af0b160..ea9721a 100644 --- a/cel-c/src/rc_test.cc +++ b/cel-c/internal/rc_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/rc.h" +#include "cel-c/internal/rc.h" #include "gmock/gmock.h" #include "gtest/gtest.h" diff --git a/cel-c/src/regexp.cc b/cel-c/internal/regexp.cc similarity index 98% rename from cel-c/src/regexp.cc rename to cel-c/internal/regexp.cc index 2aa2e6f..290262e 100644 --- a/cel-c/src/regexp.cc +++ b/cel-c/internal/regexp.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/regexp.h" +#include "cel-c/internal/regexp.h" #include #include @@ -22,8 +22,8 @@ #include "absl/strings/string_view.h" #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/alloca.h" -#include "cel-c/src/malloc.h" +#include "cel-c/internal/alloca.h" +#include "cel-c/internal/malloc.h" #include "cel-c/status.h" #include "cel-c/status_code.h" #include "cel-c/string_view.h" diff --git a/cel-c/src/regexp.h b/cel-c/internal/regexp.h similarity index 95% rename from cel-c/src/regexp.h rename to cel-c/internal/regexp.h index 98e3726..a496675 100644 --- a/cel-c/src/regexp.h +++ b/cel-c/internal/regexp.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_REGEXP_H_ -#define THIRD_PARTY_CEL_C_SRC_REGEXP_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_REGEXP_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_REGEXP_H_ #include #include @@ -83,4 +83,4 @@ bool _cel_RegExp_Matches(cel_StringView pattern, CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_REGEXP_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_REGEXP_H_ diff --git a/cel-c/src/regexp_test.cc b/cel-c/internal/regexp_test.cc similarity index 99% rename from cel-c/src/regexp_test.cc rename to cel-c/internal/regexp_test.cc index bb23b56..c982ec7 100644 --- a/cel-c/src/regexp_test.cc +++ b/cel-c/internal/regexp_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/regexp.h" +#include "cel-c/internal/regexp.h" #include diff --git a/cel-c/src/runtime/BUILD b/cel-c/internal/runtime/BUILD similarity index 74% rename from cel-c/src/runtime/BUILD rename to cel-c/internal/runtime/BUILD index 0cc6995..3484534 100644 --- a/cel-c/src/runtime/BUILD +++ b/cel-c/internal/runtime/BUILD @@ -60,23 +60,23 @@ cc_library( "//cel-c:value", "//cel-c:value_kind", "//cel-c:well_known_types", - "//cel-c/src:arc", - "//cel-c/src:array", - "//cel-c/src:charconv", - "//cel-c/src:ckdint", - "//cel-c/src:compare", - "//cel-c/src:config", - "//cel-c/src:container", - "//cel-c/src:deque", - "//cel-c/src:durationconv", - "//cel-c/src:flat_hash_map", - "//cel-c/src:number", - "//cel-c/src:regexp", - "//cel-c/src:setjmp", - "//cel-c/src:string", - "//cel-c/src:timestampconv", - "//cel-c/src:utf8", - "//cel-c/src:value", + "//cel-c/internal:arc", + "//cel-c/internal:array", + "//cel-c/internal:charconv", + "//cel-c/internal:ckdint", + "//cel-c/internal:compare", + "//cel-c/internal:config", + "//cel-c/internal:container", + "//cel-c/internal:deque", + "//cel-c/internal:durationconv", + "//cel-c/internal:flat_hash_map", + "//cel-c/internal:number", + "//cel-c/internal:regexp", + "//cel-c/internal:setjmp", + "//cel-c/internal:string", + "//cel-c/internal:timestampconv", + "//cel-c/internal:utf8", + "//cel-c/internal:value", "@protobuf//upb/reflection", ], ) diff --git a/cel-c/src/runtime/activation.cc b/cel-c/internal/runtime/activation.cc similarity index 94% rename from cel-c/src/runtime/activation.cc rename to cel-c/internal/runtime/activation.cc index 491e232..e5cfa17 100644 --- a/cel-c/src/runtime/activation.cc +++ b/cel-c/internal/runtime/activation.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/runtime/activation.h" +#include "cel-c/internal/runtime/activation.h" #include #include @@ -22,10 +22,10 @@ #include "cel-c/arena.h" #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/runtime/instr.h" -#include "cel-c/src/runtime/interpretable.h" -#include "cel-c/src/runtime/program.h" -#include "cel-c/src/runtime/runtime.h" +#include "cel-c/internal/runtime/instr.h" +#include "cel-c/internal/runtime/interpretable.h" +#include "cel-c/internal/runtime/program.h" +#include "cel-c/internal/runtime/runtime.h" #include "cel-c/status.h" #include "cel-c/string_view.h" #include "cel-c/trilean.h" diff --git a/cel-c/src/runtime/activation.h b/cel-c/internal/runtime/activation.h similarity index 88% rename from cel-c/src/runtime/activation.h rename to cel-c/internal/runtime/activation.h index b6adfaf..77b0f63 100644 --- a/cel-c/src/runtime/activation.h +++ b/cel-c/internal/runtime/activation.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_RUNTIME_ACTIVATION_H_ -#define THIRD_PARTY_CEL_C_SRC_RUNTIME_ACTIVATION_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_RUNTIME_ACTIVATION_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_RUNTIME_ACTIVATION_H_ #include #include @@ -22,9 +22,9 @@ #include "cel-c/arena.h" #include "cel-c/assert.h" #include "cel-c/config.h" +#include "cel-c/internal/runtime/instr.h" +#include "cel-c/internal/runtime/interpretable.h" #include "cel-c/program.h" -#include "cel-c/src/runtime/instr.h" -#include "cel-c/src/runtime/interpretable.h" #include "cel-c/status.h" #include "cel-c/string_view.h" #include "cel-c/trilean.h" @@ -66,4 +66,4 @@ static CEL_INLINE cel_Trilean _cel_Activation_FindVariable( CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_RUNTIME_ACTIVATION_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_RUNTIME_ACTIVATION_H_ diff --git a/cel-c/src/runtime/instr.h b/cel-c/internal/runtime/instr.h similarity index 98% rename from cel-c/src/runtime/instr.h rename to cel-c/internal/runtime/instr.h index 4e11d98..107a24b 100644 --- a/cel-c/src/runtime/instr.h +++ b/cel-c/internal/runtime/instr.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_RUNTIME_INSTR_H_ -#define THIRD_PARTY_CEL_C_SRC_RUNTIME_INSTR_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_RUNTIME_INSTR_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_RUNTIME_INSTR_H_ #include #include @@ -313,4 +313,4 @@ CEL_STATIC_ASSERT(alignof(_cel_Instr) <= 8); CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_RUNTIME_INSTR_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_RUNTIME_INSTR_H_ diff --git a/cel-c/src/runtime/interpretable.cc b/cel-c/internal/runtime/interpretable.cc similarity index 99% rename from cel-c/src/runtime/interpretable.cc rename to cel-c/internal/runtime/interpretable.cc index acece06..38b903d 100644 --- a/cel-c/src/runtime/interpretable.cc +++ b/cel-c/internal/runtime/interpretable.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/runtime/interpretable.h" +#include "cel-c/internal/runtime/interpretable.h" #include #include @@ -29,26 +29,26 @@ #include "cel-c/duration.h" #include "cel-c/error.h" #include "cel-c/error_code.h" -#include "cel-c/src/array.h" -#include "cel-c/src/charconv.h" -#include "cel-c/src/ckdint.h" -#include "cel-c/src/compare.h" -#include "cel-c/src/config.h" -#include "cel-c/src/durationconv.h" -#include "cel-c/src/empty_list_value.h" -#include "cel-c/src/empty_map_value.h" -#include "cel-c/src/mutable_list_value.h" -#include "cel-c/src/mutable_map_value.h" -#include "cel-c/src/number.h" -#include "cel-c/src/regexp.h" -#include "cel-c/src/runtime/activation.h" -#include "cel-c/src/runtime/instr.h" -#include "cel-c/src/runtime/program.h" -#include "cel-c/src/runtime/runtime.h" -#include "cel-c/src/setjmp.h" -#include "cel-c/src/string.h" -#include "cel-c/src/timestampconv.h" -#include "cel-c/src/utf8.h" +#include "cel-c/internal/array.h" +#include "cel-c/internal/charconv.h" +#include "cel-c/internal/ckdint.h" +#include "cel-c/internal/compare.h" +#include "cel-c/internal/config.h" +#include "cel-c/internal/durationconv.h" +#include "cel-c/internal/empty_list_value.h" +#include "cel-c/internal/empty_map_value.h" +#include "cel-c/internal/mutable_list_value.h" +#include "cel-c/internal/mutable_map_value.h" +#include "cel-c/internal/number.h" +#include "cel-c/internal/regexp.h" +#include "cel-c/internal/runtime/activation.h" +#include "cel-c/internal/runtime/instr.h" +#include "cel-c/internal/runtime/program.h" +#include "cel-c/internal/runtime/runtime.h" +#include "cel-c/internal/setjmp.h" +#include "cel-c/internal/string.h" +#include "cel-c/internal/timestampconv.h" +#include "cel-c/internal/utf8.h" #include "cel-c/status.h" #include "cel-c/string_view.h" #include "cel-c/timestamp.h" diff --git a/cel-c/src/runtime/interpretable.h b/cel-c/internal/runtime/interpretable.h similarity index 89% rename from cel-c/src/runtime/interpretable.h rename to cel-c/internal/runtime/interpretable.h index 1f1efc1..640b882 100644 --- a/cel-c/src/runtime/interpretable.h +++ b/cel-c/internal/runtime/interpretable.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_RUNTIME_INTERPRETABLE_H_ -#define THIRD_PARTY_CEL_C_SRC_RUNTIME_INTERPRETABLE_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_RUNTIME_INTERPRETABLE_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_RUNTIME_INTERPRETABLE_H_ #include #include @@ -22,10 +22,10 @@ #include "cel-c/arena.h" #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/runtime/instr.h" -#include "cel-c/src/runtime/program.h" -#include "cel-c/src/setjmp.h" -#include "cel-c/src/string.h" +#include "cel-c/internal/runtime/instr.h" +#include "cel-c/internal/runtime/program.h" +#include "cel-c/internal/setjmp.h" +#include "cel-c/internal/string.h" #include "cel-c/status.h" #include "cel-c/value.h" #include "cel-c/well_known_types.h" @@ -100,4 +100,4 @@ static CEL_INLINE bool _cel_Interpretable_Interpret( CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_RUNTIME_INTERPRETABLE_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_RUNTIME_INTERPRETABLE_H_ diff --git a/cel-c/src/runtime/interpreter.cc b/cel-c/internal/runtime/interpreter.cc similarity index 99% rename from cel-c/src/runtime/interpreter.cc rename to cel-c/internal/runtime/interpreter.cc index f3c72f7..0deb6ff 100644 --- a/cel-c/src/runtime/interpreter.cc +++ b/cel-c/internal/runtime/interpreter.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/runtime/interpreter.h" +#include "cel-c/internal/runtime/interpreter.h" #include #include @@ -26,17 +26,17 @@ #include "cel-c/config.h" #include "cel-c/constant.h" #include "cel-c/hash.h" +#include "cel-c/internal/array.h" +#include "cel-c/internal/container.h" +#include "cel-c/internal/deque.h" +#include "cel-c/internal/flat_hash_map.h" +#include "cel-c/internal/runtime/instr.h" +#include "cel-c/internal/runtime/program.h" +#include "cel-c/internal/runtime/runtime.h" +#include "cel-c/internal/setjmp.h" +#include "cel-c/internal/string.h" #include "cel-c/operators.h" #include "cel-c/ref.h" -#include "cel-c/src/array.h" -#include "cel-c/src/container.h" -#include "cel-c/src/deque.h" -#include "cel-c/src/flat_hash_map.h" -#include "cel-c/src/runtime/instr.h" -#include "cel-c/src/runtime/program.h" -#include "cel-c/src/runtime/runtime.h" -#include "cel-c/src/setjmp.h" -#include "cel-c/src/string.h" #include "cel-c/status.h" #include "cel-c/string_view.h" #include "cel-c/type.h" diff --git a/cel-c/src/runtime/interpreter.h b/cel-c/internal/runtime/interpreter.h similarity index 76% rename from cel-c/src/runtime/interpreter.h rename to cel-c/internal/runtime/interpreter.h index d011d3a..fe9bbec 100644 --- a/cel-c/src/runtime/interpreter.h +++ b/cel-c/internal/runtime/interpreter.h @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_RUNTIME_INTERPRETER_H_ -#define THIRD_PARTY_CEL_C_SRC_RUNTIME_INTERPRETER_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_RUNTIME_INTERPRETER_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_RUNTIME_INTERPRETER_H_ #include "cel-c/ast.h" #include "cel-c/config.h" -#include "cel-c/src/runtime/program.h" -#include "cel-c/src/runtime/runtime.h" +#include "cel-c/internal/runtime/program.h" +#include "cel-c/internal/runtime/runtime.h" #include "cel-c/status.h" CEL_BEGIN_DECLS @@ -30,4 +30,4 @@ cel_Program* cel_nullable _cel_Interpreter_Compile( CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_RUNTIME_INTERPRETER_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_RUNTIME_INTERPRETER_H_ diff --git a/cel-c/src/runtime/program.cc b/cel-c/internal/runtime/program.cc similarity index 93% rename from cel-c/src/runtime/program.cc rename to cel-c/internal/runtime/program.cc index 6cca502..a25bd0c 100644 --- a/cel-c/src/runtime/program.cc +++ b/cel-c/internal/runtime/program.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/runtime/program.h" +#include "cel-c/internal/runtime/program.h" #include #include @@ -20,11 +20,11 @@ #include "cel-c/alloc.h" #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/arc.h" -#include "cel-c/src/array.h" -#include "cel-c/src/runtime/activation.h" -#include "cel-c/src/runtime/runtime.h" -#include "cel-c/src/string.h" +#include "cel-c/internal/arc.h" +#include "cel-c/internal/array.h" +#include "cel-c/internal/runtime/activation.h" +#include "cel-c/internal/runtime/runtime.h" +#include "cel-c/internal/string.h" extern "C" cel_ProgramOptions* cel_nonnull cel_ProgramOptions_Default(cel_ProgramOptions* cel_nonnull opts) { diff --git a/cel-c/src/runtime/program.h b/cel-c/internal/runtime/program.h similarity index 90% rename from cel-c/src/runtime/program.h rename to cel-c/internal/runtime/program.h index 1616306..1c7a57b 100644 --- a/cel-c/src/runtime/program.h +++ b/cel-c/internal/runtime/program.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_RUNTIME_PROGRAM_H_ -#define THIRD_PARTY_CEL_C_SRC_RUNTIME_PROGRAM_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_RUNTIME_PROGRAM_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_RUNTIME_PROGRAM_H_ #include #include @@ -21,11 +21,11 @@ #include "cel-c/alloc.h" #include "cel-c/config.h" +#include "cel-c/internal/arc.h" +#include "cel-c/internal/array.h" +#include "cel-c/internal/runtime/instr.h" +#include "cel-c/internal/string.h" #include "cel-c/program.h" // IWYU pragma: export -#include "cel-c/src/arc.h" -#include "cel-c/src/array.h" -#include "cel-c/src/runtime/instr.h" -#include "cel-c/src/string.h" CEL_BEGIN_DECLS @@ -102,4 +102,4 @@ static CEL_INLINE void _cel_Program_Unref( CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_RUNTIME_PROGRAM_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_RUNTIME_PROGRAM_H_ diff --git a/cel-c/src/runtime/runtime.cc b/cel-c/internal/runtime/runtime.cc similarity index 94% rename from cel-c/src/runtime/runtime.cc rename to cel-c/internal/runtime/runtime.cc index d2f6222..c0d86b0 100644 --- a/cel-c/src/runtime/runtime.cc +++ b/cel-c/internal/runtime/runtime.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/runtime/runtime.h" +#include "cel-c/internal/runtime/runtime.h" #include @@ -23,10 +23,10 @@ #include "cel-c/program.h" #include "cel-c/status.h" #include "cel-c/well_known_types.h" -#include "cel-c/src/arc.h" -#include "cel-c/src/container.h" -#include "cel-c/src/runtime/interpreter.h" -#include "cel-c/src/string.h" +#include "cel-c/internal/arc.h" +#include "cel-c/internal/container.h" +#include "cel-c/internal/runtime/interpreter.h" +#include "cel-c/internal/string.h" #include "upb/reflection/def.h" cel_RuntimeOptions* cel_nonnull diff --git a/cel-c/src/runtime/runtime.h b/cel-c/internal/runtime/runtime.h similarity index 88% rename from cel-c/src/runtime/runtime.h rename to cel-c/internal/runtime/runtime.h index 09f532c..611a49a 100644 --- a/cel-c/src/runtime/runtime.h +++ b/cel-c/internal/runtime/runtime.h @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_RUNTIME_RUNTIME_H_ -#define THIRD_PARTY_CEL_C_SRC_RUNTIME_RUNTIME_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_RUNTIME_RUNTIME_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_RUNTIME_RUNTIME_H_ #include "cel-c/alloc.h" #include "cel-c/config.h" #include "cel-c/runtime.h" // IWYU pragma: export -#include "cel-c/src/arc.h" -#include "cel-c/src/container.h" +#include "cel-c/internal/arc.h" +#include "cel-c/internal/container.h" #include "cel-c/well_known_types.h" #include "upb/reflection/def.h" @@ -60,4 +60,4 @@ static CEL_INLINE void _cel_Runtime_Unref(const cel_Runtime* cel_nullable rt) { CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_RUNTIME_RUNTIME_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_RUNTIME_RUNTIME_H_ diff --git a/cel-c/src/runtime_test.cc b/cel-c/internal/runtime_test.cc similarity index 99% rename from cel-c/src/runtime_test.cc rename to cel-c/internal/runtime_test.cc index fe34146..2e59d87 100644 --- a/cel-c/src/runtime_test.cc +++ b/cel-c/internal/runtime_test.cc @@ -36,12 +36,12 @@ #include "cel-c/duration.h" #include "cel-c/error.h" #include "cel-c/error_code.h" +#include "cel-c/internal/parsed_map_field_value.h" +#include "cel-c/internal/runtime/program.h" +#include "cel-c/internal/testing/compiler.h" +#include "cel-c/internal/testing/def_pool.h" +#include "cel-c/internal/testing/parser.h" #include "cel-c/program.h" -#include "cel-c/src/parsed_map_field_value.h" -#include "cel-c/src/runtime/program.h" -#include "cel-c/src/testing/compiler.h" -#include "cel-c/src/testing/def_pool.h" -#include "cel-c/src/testing/parser.h" #include "cel-c/status.h" #include "cel-c/status_absl.h" #include "cel-c/string_view.h" diff --git a/cel-c/src/setjmp.h b/cel-c/internal/setjmp.h similarity index 92% rename from cel-c/src/setjmp.h rename to cel-c/internal/setjmp.h index 6bb155c..4589fe2 100644 --- a/cel-c/src/setjmp.h +++ b/cel-c/internal/setjmp.h @@ -16,8 +16,8 @@ // setjmp/longjmp, that is the implementation that avoids saving and restoring // signal masks which requires syscalls. -#ifndef THIRD_PARTY_CEL_C_SRC_SETJMP_H_ -#define THIRD_PARTY_CEL_C_SRC_SETJMP_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_SETJMP_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_SETJMP_H_ #include // IWYU pragma: keep @@ -47,4 +47,4 @@ typedef jmp_buf _cel_jmp_buf; CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_SETJMP_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_SETJMP_H_ diff --git a/cel-c/src/setjmp_test.cc b/cel-c/internal/setjmp_test.cc similarity index 96% rename from cel-c/src/setjmp_test.cc rename to cel-c/internal/setjmp_test.cc index 35cf028..2f534b2 100644 --- a/cel-c/src/setjmp_test.cc +++ b/cel-c/internal/setjmp_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/setjmp.h" +#include "cel-c/internal/setjmp.h" #include "gtest/gtest.h" diff --git a/cel-c/src/sort.h b/cel-c/internal/sort.h similarity index 94% rename from cel-c/src/sort.h rename to cel-c/internal/sort.h index d008998..6428055 100644 --- a/cel-c/src/sort.h +++ b/cel-c/internal/sort.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_SORT_H_ -#define THIRD_PARTY_CEL_C_SRC_SORT_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_SORT_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_SORT_H_ #include #include @@ -21,7 +21,7 @@ #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/alloca.h" +#include "cel-c/internal/alloca.h" CEL_BEGIN_DECLS @@ -105,4 +105,4 @@ static inline void _cel_Sort(void* cel_nullability_unknown ptr, size_t count, CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_SORT_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_SORT_H_ diff --git a/cel-c/src/sort_test.cc b/cel-c/internal/sort_test.cc similarity index 97% rename from cel-c/src/sort_test.cc rename to cel-c/internal/sort_test.cc index 25a9843..a714978 100644 --- a/cel-c/src/sort_test.cc +++ b/cel-c/internal/sort_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/sort.h" +#include "cel-c/internal/sort.h" #include #include diff --git a/cel-c/src/stable_sort.h b/cel-c/internal/stable_sort.h similarity index 96% rename from cel-c/src/stable_sort.h rename to cel-c/internal/stable_sort.h index 3f99420..5c3f62c 100644 --- a/cel-c/src/stable_sort.h +++ b/cel-c/internal/stable_sort.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_MERGESORT_H_ -#define THIRD_PARTY_CEL_C_SRC_MERGESORT_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_MERGESORT_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_MERGESORT_H_ #include #include @@ -21,7 +21,7 @@ #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/alloca.h" +#include "cel-c/internal/alloca.h" CEL_BEGIN_DECLS @@ -204,4 +204,4 @@ static inline void _cel_StableSort( CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_MERGESORT_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_MERGESORT_H_ diff --git a/cel-c/src/stable_sort_test.cc b/cel-c/internal/stable_sort_test.cc similarity index 97% rename from cel-c/src/stable_sort_test.cc rename to cel-c/internal/stable_sort_test.cc index 7cd309a..6f691aa 100644 --- a/cel-c/src/stable_sort_test.cc +++ b/cel-c/internal/stable_sort_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/stable_sort.h" +#include "cel-c/internal/stable_sort.h" #include #include diff --git a/cel-c/src/string.h b/cel-c/internal/string.h similarity index 97% rename from cel-c/src/string.h rename to cel-c/internal/string.h index 61944fd..87c3aca 100644 --- a/cel-c/src/string.h +++ b/cel-c/internal/string.h @@ -15,8 +15,8 @@ // Internal header providing a generic string implementation which uses // allocator-based memory management. -#ifndef THIRD_PARTY_CEL_C_SRC_STRING_H_ -#define THIRD_PARTY_CEL_C_SRC_STRING_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_STRING_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_STRING_H_ #include #include // IWYU pragma: keep @@ -25,7 +25,7 @@ #include "cel-c/alloc.h" #include "cel-c/config.h" #include "cel-c/cstring_view.h" -#include "cel-c/src/generic_string.h" +#include "cel-c/internal/generic_string.h" #include "cel-c/string_view.h" CEL_BEGIN_DECLS @@ -170,4 +170,4 @@ _cel_String_ToCStringView(CEL_NONNULL(const _cel_String*) str) { CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_STRING_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_STRING_H_ diff --git a/cel-c/src/string_test.cc b/cel-c/internal/string_test.cc similarity index 99% rename from cel-c/src/string_test.cc rename to cel-c/internal/string_test.cc index 6a66620..cb7f9e6 100644 --- a/cel-c/src/string_test.cc +++ b/cel-c/internal/string_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/string.h" +#include "cel-c/internal/string.h" #include @@ -21,7 +21,7 @@ #include "cel-c/alloc.h" #include "cel-c/config.h" #include "cel-c/cstring_view.h" -#include "cel-c/src/generic_string.h" +#include "cel-c/internal/generic_string.h" #include "cel-c/string_view.h" namespace { diff --git a/cel-c/src/struct_value.cc b/cel-c/internal/struct_value.cc similarity index 99% rename from cel-c/src/struct_value.cc rename to cel-c/internal/struct_value.cc index 5a5cabe..8807122 100644 --- a/cel-c/src/struct_value.cc +++ b/cel-c/internal/struct_value.cc @@ -19,8 +19,8 @@ #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/array.h" -#include "cel-c/src/sort.h" +#include "cel-c/internal/array.h" +#include "cel-c/internal/sort.h" #include "cel-c/status.h" #include "cel-c/string_view.h" #include "cel-c/value.h" diff --git a/cel-c/src/struct_value_test.cc b/cel-c/internal/struct_value_test.cc similarity index 99% rename from cel-c/src/struct_value_test.cc rename to cel-c/internal/struct_value_test.cc index 0395bfa..304a1fb 100644 --- a/cel-c/src/struct_value_test.cc +++ b/cel-c/internal/struct_value_test.cc @@ -19,7 +19,7 @@ #include "cel-c/config.h" #include "cel-c/error.h" #include "cel-c/error_code.h" -#include "cel-c/src/value_testing.h" +#include "cel-c/internal/value_testing.h" #include "cel-c/status.h" #include "cel-c/string_view.h" #include "cel-c/value.h" diff --git a/cel-c/src/testing/BUILD b/cel-c/internal/testing/BUILD similarity index 100% rename from cel-c/src/testing/BUILD rename to cel-c/internal/testing/BUILD diff --git a/cel-c/src/testing/compile.cc b/cel-c/internal/testing/compile.cc similarity index 91% rename from cel-c/src/testing/compile.cc rename to cel-c/internal/testing/compile.cc index c27be17..1c230c6 100644 --- a/cel-c/src/testing/compile.cc +++ b/cel-c/internal/testing/compile.cc @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/testing/compile.h" +#include "cel-c/internal/testing/compile.h" #include "cel-c/arena.h" #include "cel-c/assert.h" #include "cel-c/ast.h" #include "cel-c/config.h" -#include "cel-c/src/testing/compiler.h" +#include "cel-c/internal/testing/compiler.h" #include "cel-c/string_view.h" extern "C" CEL_ATTRIBUTE_NOTHROW cel_Ast* cel_nonnull diff --git a/cel-c/src/testing/compile.h b/cel-c/internal/testing/compile.h similarity index 84% rename from cel-c/src/testing/compile.h rename to cel-c/internal/testing/compile.h index 6399a81..3a128a7 100644 --- a/cel-c/src/testing/compile.h +++ b/cel-c/internal/testing/compile.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_TESTING_COMPILE_H_ -#define THIRD_PARTY_CEL_C_SRC_TESTING_COMPILE_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_TESTING_COMPILE_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_TESTING_COMPILE_H_ #include "cel-c/arena.h" #include "cel-c/ast.h" @@ -29,4 +29,4 @@ cel_Ast* cel_nonnull _cel_TestingCompile(cel_StringView content, CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_TESTING_COMPILE_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_TESTING_COMPILE_H_ diff --git a/cel-c/src/testing/compiler.cc b/cel-c/internal/testing/compiler.cc similarity index 98% rename from cel-c/src/testing/compiler.cc rename to cel-c/internal/testing/compiler.cc index 6c27a0b..36c5937 100644 --- a/cel-c/src/testing/compiler.cc +++ b/cel-c/internal/testing/compiler.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/testing/compiler.h" +#include "cel-c/internal/testing/compiler.h" #include #include diff --git a/cel-c/src/testing/compiler.h b/cel-c/internal/testing/compiler.h similarity index 90% rename from cel-c/src/testing/compiler.h rename to cel-c/internal/testing/compiler.h index 9f7b8ce..9f1f7ed 100644 --- a/cel-c/src/testing/compiler.h +++ b/cel-c/internal/testing/compiler.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_TESTING_COMPILER_H_ -#define THIRD_PARTY_CEL_C_SRC_TESTING_COMPILER_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_TESTING_COMPILER_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_TESTING_COMPILER_H_ #include "cel-c/arena.h" #include "cel-c/ast.h" @@ -57,4 +57,4 @@ using _cel_TestingCompilerPtr = std::unique_ptr<_cel_TestingCompiler, _cel_TestingCompilerDeleter>; #endif -#endif // THIRD_PARTY_CEL_C_SRC_TESTING_COMPILER_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_TESTING_COMPILER_H_ diff --git a/cel-c/src/testing/def_pool.cc b/cel-c/internal/testing/def_pool.cc similarity index 98% rename from cel-c/src/testing/def_pool.cc rename to cel-c/internal/testing/def_pool.cc index 924d023..cc503d8 100644 --- a/cel-c/src/testing/def_pool.cc +++ b/cel-c/internal/testing/def_pool.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/testing/def_pool.h" +#include "cel-c/internal/testing/def_pool.h" #include "google/protobuf/any.upbdefs.h" #include "google/protobuf/duration.upbdefs.h" diff --git a/cel-c/src/testing/def_pool.h b/cel-c/internal/testing/def_pool.h similarity index 84% rename from cel-c/src/testing/def_pool.h rename to cel-c/internal/testing/def_pool.h index 9218b95..9bef00a 100644 --- a/cel-c/src/testing/def_pool.h +++ b/cel-c/internal/testing/def_pool.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_TESTING_DEF_POOL_H_ -#define THIRD_PARTY_CEL_C_SRC_TESTING_DEF_POOL_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_TESTING_DEF_POOL_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_TESTING_DEF_POOL_H_ #include "cel-c/config.h" #include "upb/reflection/def.h" @@ -31,4 +31,4 @@ void _cel_TestingDefs(upb_DefPool* cel_nonnull def_pool); CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_TESTING_DEF_POOL_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_TESTING_DEF_POOL_H_ diff --git a/cel-c/src/testing/parse.cc b/cel-c/internal/testing/parse.cc similarity index 92% rename from cel-c/src/testing/parse.cc rename to cel-c/internal/testing/parse.cc index 2cedd1e..799ca94 100644 --- a/cel-c/src/testing/parse.cc +++ b/cel-c/internal/testing/parse.cc @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/testing/parse.h" +#include "cel-c/internal/testing/parse.h" #include "cel-c/arena.h" #include "cel-c/assert.h" #include "cel-c/ast.h" #include "cel-c/config.h" -#include "cel-c/src/testing/parser.h" +#include "cel-c/internal/testing/parser.h" #include "cel-c/string_view.h" extern "C" CEL_ATTRIBUTE_NOTHROW cel_Ast* cel_nonnull diff --git a/cel-c/src/testing/parse.h b/cel-c/internal/testing/parse.h similarity index 85% rename from cel-c/src/testing/parse.h rename to cel-c/internal/testing/parse.h index c252c1e..33779c3 100644 --- a/cel-c/src/testing/parse.h +++ b/cel-c/internal/testing/parse.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_TESTING_PARSE_H_ -#define THIRD_PARTY_CEL_C_SRC_TESTING_PARSE_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_TESTING_PARSE_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_TESTING_PARSE_H_ #include "cel-c/arena.h" #include "cel-c/ast.h" @@ -29,4 +29,4 @@ cel_Ast* cel_nonnull _cel_TestingParse(cel_StringView content, CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_TESTING_PARSE_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_TESTING_PARSE_H_ diff --git a/cel-c/src/testing/parser.cc b/cel-c/internal/testing/parser.cc similarity index 98% rename from cel-c/src/testing/parser.cc rename to cel-c/internal/testing/parser.cc index 732f3bd..34e3f80 100644 --- a/cel-c/src/testing/parser.cc +++ b/cel-c/internal/testing/parser.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/testing/parser.h" +#include "cel-c/internal/testing/parser.h" #include #include diff --git a/cel-c/src/testing/parser.h b/cel-c/internal/testing/parser.h similarity index 90% rename from cel-c/src/testing/parser.h rename to cel-c/internal/testing/parser.h index 1cbfeda..e20f857 100644 --- a/cel-c/src/testing/parser.h +++ b/cel-c/internal/testing/parser.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_TESTING_PARSER_H_ -#define THIRD_PARTY_CEL_C_SRC_TESTING_PARSER_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_TESTING_PARSER_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_TESTING_PARSER_H_ #include "cel-c/arena.h" #include "cel-c/ast.h" @@ -57,4 +57,4 @@ using _cel_TestingParserPtr = std::unique_ptr<_cel_TestingParser, _cel_TestingParserDeleter>; #endif -#endif // THIRD_PARTY_CEL_C_SRC_TESTING_PARSER_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_TESTING_PARSER_H_ diff --git a/cel-c/src/timestampconv.cc b/cel-c/internal/timestampconv.cc similarity index 96% rename from cel-c/src/timestampconv.cc rename to cel-c/internal/timestampconv.cc index a37d74e..9dba091 100644 --- a/cel-c/src/timestampconv.cc +++ b/cel-c/internal/timestampconv.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/timestampconv.h" +#include "cel-c/internal/timestampconv.h" #include #include @@ -21,7 +21,7 @@ #include "absl/time/time.h" #include "cel-c/arena.h" #include "cel-c/assert.h" -#include "cel-c/src/config.h" +#include "cel-c/internal/config.h" #include "cel-c/string_view.h" #include "cel-c/string_view_absl.h" #include "cel-c/timestamp.h" diff --git a/cel-c/src/timestampconv.h b/cel-c/internal/timestampconv.h similarity index 87% rename from cel-c/src/timestampconv.h rename to cel-c/internal/timestampconv.h index 338dc8d..924c923 100644 --- a/cel-c/src/timestampconv.h +++ b/cel-c/internal/timestampconv.h @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_TIMESTAMPCONV_H_ -#define THIRD_PARTY_CEL_C_SRC_TIMESTAMPCONV_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_TIMESTAMPCONV_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_TIMESTAMPCONV_H_ #include #include "cel-c/arena.h" -#include "cel-c/src/config.h" +#include "cel-c/internal/config.h" #include "cel-c/string_view.h" #include "cel-c/timestamp.h" @@ -44,4 +44,4 @@ bool _cel_Timestamp_FromRFC3339(cel_Timestamp* cel_nonnull out, CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_TIMESTAMPCONV_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_TIMESTAMPCONV_H_ diff --git a/cel-c/src/timestampconv_test.cc b/cel-c/internal/timestampconv_test.cc similarity index 99% rename from cel-c/src/timestampconv_test.cc rename to cel-c/internal/timestampconv_test.cc index 4691f53..8a24d4f 100644 --- a/cel-c/src/timestampconv_test.cc +++ b/cel-c/internal/timestampconv_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/timestampconv.h" +#include "cel-c/internal/timestampconv.h" #include diff --git a/cel-c/src/trilean_test.cc b/cel-c/internal/trilean_test.cc similarity index 100% rename from cel-c/src/trilean_test.cc rename to cel-c/internal/trilean_test.cc diff --git a/cel-c/src/uchar.h b/cel-c/internal/uchar.h similarity index 89% rename from cel-c/src/uchar.h rename to cel-c/internal/uchar.h index 95256e6..ea6b9e0 100644 --- a/cel-c/src/uchar.h +++ b/cel-c/internal/uchar.h @@ -15,8 +15,8 @@ // Internal header providing compatible typedefs for `uchar.h`. Some platforms, // namely older versions of macOS, do not have them. -#ifndef THIRD_PARTY_CEL_C_SRC_UCHAR_H_ -#define THIRD_PARTY_CEL_C_SRC_UCHAR_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_UCHAR_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_UCHAR_H_ #include // IWYU pragma: keep @@ -37,4 +37,4 @@ typedef uint_least32_t char32_t; CEL_END_DECLS #endif -#endif // THIRD_PARTY_CEL_C_SRC_UCHAR_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_UCHAR_H_ diff --git a/cel-c/src/uint128.h b/cel-c/internal/uint128.h similarity index 98% rename from cel-c/src/uint128.h rename to cel-c/internal/uint128.h index 840389c..f443775 100644 --- a/cel-c/src/uint128.h +++ b/cel-c/internal/uint128.h @@ -14,8 +14,8 @@ // Internal header providing an unsigned 128 bit unsigned integral. -#ifndef THIRD_PARTY_CEL_C_SRC_UINT128_H_ -#define THIRD_PARTY_CEL_C_SRC_UINT128_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_UINT128_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_UINT128_H_ #include #include // IWYU pragma: keep @@ -27,8 +27,8 @@ #endif #include "cel-c/assert.h" -#include "cel-c/src/config.h" -#include "cel-c/src/endian.h" // IWYU pragma: keep +#include "cel-c/internal/config.h" +#include "cel-c/internal/endian.h" // IWYU pragma: keep #ifdef __cplusplus #include @@ -368,4 +368,4 @@ CEL_END_DECLS // NOLINTEND(google-runtime-int) // NOLINTEND(runtime/int) -#endif // THIRD_PARTY_CEL_C_SRC_UINT128_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_UINT128_H_ diff --git a/cel-c/src/uint128_test.cc b/cel-c/internal/uint128_test.cc similarity index 99% rename from cel-c/src/uint128_test.cc rename to cel-c/internal/uint128_test.cc index 4a81bef..af2f1d1 100644 --- a/cel-c/src/uint128_test.cc +++ b/cel-c/internal/uint128_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/uint128.h" +#include "cel-c/internal/uint128.h" #include #include diff --git a/cel-c/src/unaligned.h b/cel-c/internal/unaligned.h similarity index 96% rename from cel-c/src/unaligned.h rename to cel-c/internal/unaligned.h index 19829f5..c2a6bc0 100644 --- a/cel-c/src/unaligned.h +++ b/cel-c/internal/unaligned.h @@ -14,14 +14,14 @@ // Internal header providing unaligned load and store functions. -#ifndef THIRD_PARTY_CEL_C_SRC_UNALIGNED_H_ -#define THIRD_PARTY_CEL_C_SRC_UNALIGNED_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_UNALIGNED_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_UNALIGNED_H_ #include #include // IWYU pragma: keep #include "cel-c/assert.h" -#include "cel-c/src/config.h" +#include "cel-c/internal/config.h" #if defined(_CEL_HAVE_ASAN) || defined(_CEL_HAVE_HWASAN) || \ defined(_CEL_HAVE_TSAN) || defined(_CEL_HAVE_MSAN) @@ -150,4 +150,4 @@ static CEL_INLINE void _cel_UnalignedStore64(CEL_NONNULL(void*) data, CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_UNALIGNED_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_UNALIGNED_H_ diff --git a/cel-c/src/unaligned_test.cc b/cel-c/internal/unaligned_test.cc similarity index 98% rename from cel-c/src/unaligned_test.cc rename to cel-c/internal/unaligned_test.cc index d7e6811..e44f9bc 100644 --- a/cel-c/src/unaligned_test.cc +++ b/cel-c/internal/unaligned_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/unaligned.h" +#include "cel-c/internal/unaligned.h" #include #include diff --git a/cel-c/src/unicode.h b/cel-c/internal/unicode.h similarity index 86% rename from cel-c/src/unicode.h rename to cel-c/internal/unicode.h index 855b546..fe4b0b1 100644 --- a/cel-c/src/unicode.h +++ b/cel-c/internal/unicode.h @@ -14,14 +14,14 @@ // Internal header providing utilities for working with unicode. -#ifndef THIRD_PARTY_CEL_C_SRC_UNICODE_H_ -#define THIRD_PARTY_CEL_C_SRC_UNICODE_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_UNICODE_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_UNICODE_H_ #include // IWYU pragma: keep #include #include "cel-c/config.h" -#include "cel-c/src/uchar.h" // IWYU pragma: keep +#include "cel-c/internal/uchar.h" // IWYU pragma: keep CEL_BEGIN_DECLS @@ -43,4 +43,4 @@ static CEL_INLINE bool _cel_Unicode_IsValid(char32_t pnt) { CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_UNICODE_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_UNICODE_H_ diff --git a/cel-c/src/unicode_test.cc b/cel-c/internal/unicode_test.cc similarity index 96% rename from cel-c/src/unicode_test.cc rename to cel-c/internal/unicode_test.cc index 8f55eb6..150dcc6 100644 --- a/cel-c/src/unicode_test.cc +++ b/cel-c/internal/unicode_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/unicode.h" +#include "cel-c/internal/unicode.h" #include "gtest/gtest.h" diff --git a/cel-c/src/utf8.cc b/cel-c/internal/utf8.cc similarity index 98% rename from cel-c/src/utf8.cc rename to cel-c/internal/utf8.cc index b5c9856..587bb15 100644 --- a/cel-c/src/utf8.cc +++ b/cel-c/internal/utf8.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/utf8.h" +#include "cel-c/internal/utf8.h" #include // IWYU pragma: keep #include @@ -20,8 +20,8 @@ #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/uchar.h" // IWYU pragma: keep -#include "cel-c/src/unicode.h" +#include "cel-c/internal/uchar.h" // IWYU pragma: keep +#include "cel-c/internal/unicode.h" #include "upb/base/string_view.h" #define _cel_kUtf8RuneSelf 0x80 diff --git a/cel-c/src/utf8.h b/cel-c/internal/utf8.h similarity index 93% rename from cel-c/src/utf8.h rename to cel-c/internal/utf8.h index 1197aeb..d2a7a04 100644 --- a/cel-c/src/utf8.h +++ b/cel-c/internal/utf8.h @@ -14,15 +14,15 @@ // Internal header providing facilities for working with UTF-8. -#ifndef THIRD_PARTY_CEL_C_SRC_UTF8_H_ -#define THIRD_PARTY_CEL_C_SRC_UTF8_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_UTF8_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_UTF8_H_ #include // IWYU pragma: keep #include #include #include "cel-c/config.h" -#include "cel-c/src/uchar.h" // IWYU pragma: keep +#include "cel-c/internal/uchar.h" // IWYU pragma: keep #include "upb/base/string_view.h" CEL_BEGIN_DECLS @@ -80,4 +80,4 @@ bool _cel_Utf8_IsValid(upb_StringView str); CEL_END_DECLS -#endif // THIRD_PARTY_CEL_C_SRC_UTF8_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_UTF8_H_ diff --git a/cel-c/src/utf8_test.cc b/cel-c/internal/utf8_test.cc similarity index 99% rename from cel-c/src/utf8_test.cc rename to cel-c/internal/utf8_test.cc index 62fffbd..aeb653b 100644 --- a/cel-c/src/utf8_test.cc +++ b/cel-c/internal/utf8_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/utf8.h" +#include "cel-c/internal/utf8.h" #include diff --git a/cel-c/src/value.cc b/cel-c/internal/value.cc similarity index 99% rename from cel-c/src/value.cc rename to cel-c/internal/value.cc index 5323eab..e538da8 100644 --- a/cel-c/src/value.cc +++ b/cel-c/internal/value.cc @@ -23,10 +23,10 @@ #include "cel-c/duration.h" #include "cel-c/error.h" #include "cel-c/error_code.h" -#include "cel-c/src/any.h" -#include "cel-c/src/parsed_map_field_value.h" -#include "cel-c/src/parsed_message_value.h" -#include "cel-c/src/parsed_repeated_field_value.h" +#include "cel-c/internal/any.h" +#include "cel-c/internal/parsed_map_field_value.h" +#include "cel-c/internal/parsed_message_value.h" +#include "cel-c/internal/parsed_repeated_field_value.h" #include "cel-c/status.h" #include "cel-c/string_view.h" #include "cel-c/timestamp.h" diff --git a/cel-c/src/value_test.cc b/cel-c/internal/value_test.cc similarity index 99% rename from cel-c/src/value_test.cc rename to cel-c/internal/value_test.cc index e739749..d3df729 100644 --- a/cel-c/src/value_test.cc +++ b/cel-c/internal/value_test.cc @@ -20,12 +20,12 @@ #include "cel-c/config.h" #include "cel-c/duration.h" #include "cel-c/error.h" -#include "cel-c/src/empty_list_value.h" -#include "cel-c/src/empty_map_value.h" -#include "cel-c/src/mutable_list_value.h" -#include "cel-c/src/mutable_map_value.h" -#include "cel-c/src/parsed_message_value.h" -#include "cel-c/src/value_testing.h" +#include "cel-c/internal/empty_list_value.h" +#include "cel-c/internal/empty_map_value.h" +#include "cel-c/internal/mutable_list_value.h" +#include "cel-c/internal/mutable_map_value.h" +#include "cel-c/internal/parsed_message_value.h" +#include "cel-c/internal/value_testing.h" #include "cel-c/status.h" #include "cel-c/string_view.h" #include "cel-c/timestamp.h" diff --git a/cel-c/src/value_testing.cc b/cel-c/internal/value_testing.cc similarity index 99% rename from cel-c/src/value_testing.cc rename to cel-c/internal/value_testing.cc index cc4be73..1b93d64 100644 --- a/cel-c/src/value_testing.cc +++ b/cel-c/internal/value_testing.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "cel-c/src/value_testing.h" +#include "cel-c/internal/value_testing.h" #include #include diff --git a/cel-c/src/value_testing.h b/cel-c/internal/value_testing.h similarity index 94% rename from cel-c/src/value_testing.h rename to cel-c/internal/value_testing.h index b228b79..fc39f2b 100644 --- a/cel-c/src/value_testing.h +++ b/cel-c/internal/value_testing.h @@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef THIRD_PARTY_CEL_C_SRC_VALUE_TESTING_H_ -#define THIRD_PARTY_CEL_C_SRC_VALUE_TESTING_H_ +#ifndef THIRD_PARTY_CEL_C_INTERNAL_VALUE_TESTING_H_ +#define THIRD_PARTY_CEL_C_INTERNAL_VALUE_TESTING_H_ #include "gtest/gtest.h" #include "absl/log/die_if_null.h" @@ -80,4 +80,4 @@ class ValueTest : public ::testing::Test { cel_ValueContext ctx_ = {}; }; -#endif // THIRD_PARTY_CEL_C_SRC_VALUE_TESTING_H_ +#endif // THIRD_PARTY_CEL_C_INTERNAL_VALUE_TESTING_H_ diff --git a/cel-c/status.cc b/cel-c/status.cc index 07a8826..e90fbd9 100644 --- a/cel-c/status.cc +++ b/cel-c/status.cc @@ -25,8 +25,8 @@ #include "cel-c/assert.h" #include "cel-c/config.h" #include "cel-c/error_space.h" -#include "cel-c/src/array.h" -#include "cel-c/src/string.h" +#include "cel-c/internal/array.h" +#include "cel-c/internal/string.h" #include "cel-c/status_code.h" #include "cel-c/string_view.h" diff --git a/cel-c/string_view.cc b/cel-c/string_view.cc index 5e1ec21..e72bf77 100644 --- a/cel-c/string_view.cc +++ b/cel-c/string_view.cc @@ -19,7 +19,7 @@ #include "cel-c/assert.h" #include "cel-c/config.h" -#include "cel-c/src/memory.h" +#include "cel-c/internal/memory.h" extern "C" const char* cel_nullable cel_StringView_FindFirst(cel_StringView haystack, cel_StringView needle) { diff --git a/cel-c/timestamp.cc b/cel-c/timestamp.cc index 10c8ef2..27c5c36 100644 --- a/cel-c/timestamp.cc +++ b/cel-c/timestamp.cc @@ -20,7 +20,7 @@ #include "cel-c/assert.h" #include "cel-c/config.h" #include "cel-c/duration.h" -#include "cel-c/src/ckdint.h" +#include "cel-c/internal/ckdint.h" extern "C" bool cel_Timestamp_Normalize(int64_t* cel_nonnull sec, int32_t* cel_nonnull nsec) {