Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cel-c/alloc.cc
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ static CEL_NULLABILITY_UNKNOWN(void*) _cel_DefaultAllocator_AllocFunc(
}

static cel_Allocator _cel_DefaultAllocator = {
.func = &_cel_DefaultAllocator_AllocFunc,
/*func=*/&_cel_DefaultAllocator_AllocFunc,
};

extern "C" CEL_NONNULL(cel_Allocator*) const cel_DefaultAllocator =
Expand Down
15 changes: 15 additions & 0 deletions cel-c/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,21 @@ CEL_STATIC_ASSERT(sizeof(unsigned char) == 1);
#define cel_nullptr NULL
#endif

#ifdef CEL_COMPOUND_LITERAL
#error CEL_COMPOUND_LITERAL cannot be directly set
#endif

// CEL_COMPOUND_LITERAL
//
// `CEL_COMPOUND_LITERAL(T){...}` expands to the compound literal `(T){...}` in
// C and to the equivalent explicit type conversion `T{...}` in C++, where
// compound literals are a non-standard extension (e.g. MSVC warning C4576).
#ifdef __cplusplus
#define CEL_COMPOUND_LITERAL(T) T
#else
#define CEL_COMPOUND_LITERAL(T) (T)
#endif

#ifdef CEL_HAVE_BUILTIN
#error CEL_HAVE_BUILTIN cannot be directly set
#endif
Expand Down
12 changes: 6 additions & 6 deletions cel-c/duration.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,28 +60,28 @@ CEL_BEGIN_DECLS

#ifdef _CEL_IS_BIG_ENDIAN
#define cel_Duration_kZero \
((cel_Duration){{INT32_C(0), UINT32_C{0}}, INT32_C(0)})
(CEL_COMPOUND_LITERAL(cel_Duration){{INT32_C(0), UINT32_C(0)}, INT32_C(0)})
#define cel_Duration_kMin \
((cel_Duration){ \
(CEL_COMPOUND_LITERAL(cel_Duration){ \
{(int32_t)(uint32_t)(((uint64_t)cel_Duration_kMinSeconds) >> 32), \
((uint32_t)(uint64_t)cel_Duration_kMinSeconds)}, \
cel_Duration_kMinNanos})
#define cel_Duration_kMax \
((cel_Duration){ \
(CEL_COMPOUND_LITERAL(cel_Duration){ \
{(int32_t)(uint32_t)(((uint64_t)cel_Duration_kMaxSeconds) >> 32), \
((uint32_t)(uint64_t)cel_Duration_kMaxSeconds)}, \
cel_Duration_kMaxNanos})
#endif
#ifdef _CEL_IS_LITTLE_ENDIAN
#define cel_Duration_kZero \
((cel_Duration){{UINT32_C(0), INT32_C(0)}, INT32_C(0)})
(CEL_COMPOUND_LITERAL(cel_Duration){{UINT32_C(0), INT32_C(0)}, INT32_C(0)})
#define cel_Duration_kMin \
((cel_Duration){ \
(CEL_COMPOUND_LITERAL(cel_Duration){ \
{((uint32_t)(uint64_t)cel_Duration_kMinSeconds), \
(int32_t)(uint32_t)(((uint64_t)cel_Duration_kMinSeconds) >> 32)}, \
cel_Duration_kMinNanos})
#define cel_Duration_kMax \
((cel_Duration){ \
(CEL_COMPOUND_LITERAL(cel_Duration){ \
{((uint32_t)(uint64_t)cel_Duration_kMaxSeconds), \
(int32_t)(uint32_t)(((uint64_t)cel_Duration_kMaxSeconds) >> 32)}, \
cel_Duration_kMaxNanos})
Expand Down
14 changes: 7 additions & 7 deletions cel-c/error.cc
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ struct cel_Error {
};

static const cel_Error _cel_DefaultError = {
.message = CEL_STRINGVIEW_C(""),
.space = cel_nullptr,
.raw_code = cel_ErrorCode_kUnknown,
.code = cel_ErrorCode_kUnknown,
.payloads_len = 0,
.payloads_head = cel_nullptr,
.payloads_tail = cel_nullptr,
/*message=*/CEL_STRINGVIEW_C(""),
/*space=*/cel_nullptr,
/*raw_code=*/cel_ErrorCode_kUnknown,
/*code=*/cel_ErrorCode_kUnknown,
/*payloads_len=*/0,
/*payloads_head=*/cel_nullptr,
/*payloads_tail=*/cel_nullptr,
};

extern "C" const cel_Error* const cel_nonnull cel_DefaultError =
Expand Down
30 changes: 15 additions & 15 deletions cel-c/error_space.cc
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,14 @@ static int _cel_CanonicalErrorSpace_Message(CEL_NONNULL(const cel_ErrorSpace*)
}

static const cel_ErrorSpaceVTable _cel_CanonicalErrorSpaceVTable = {
.name = CEL_CSTRINGVIEW_C("canonical"),
.OutOfMemory = _cel_CanonicalErrorSpace_OutOfMemory,
.Canonical = _cel_CanonicalErrorSpace_Canonical,
.Message = _cel_CanonicalErrorSpace_Message,
/*name=*/CEL_CSTRINGVIEW_C("canonical"),
/*OutOfMemory=*/_cel_CanonicalErrorSpace_OutOfMemory,
/*Canonical=*/_cel_CanonicalErrorSpace_Canonical,
/*Message=*/_cel_CanonicalErrorSpace_Message,
};

static const cel_ErrorSpace _cel_CanonicalErrorSpace = {
.vtable = &_cel_CanonicalErrorSpaceVTable,
/*vtable=*/&_cel_CanonicalErrorSpaceVTable,
};

extern "C" CEL_NONNULL(const cel_ErrorSpace*)
Expand Down Expand Up @@ -427,14 +427,14 @@ static int _cel_GenericErrorSpace_Message(CEL_NONNULL(const cel_ErrorSpace*)
}

static const cel_ErrorSpaceVTable _cel_GenericErrorSpaceVTable = {
.name = CEL_CSTRINGVIEW_C("generic"),
.OutOfMemory = _cel_GenericErrorSpace_OutOfMemory,
.Canonical = _cel_GenericErrorSpace_Canonical,
.Message = _cel_GenericErrorSpace_Message,
/*name=*/CEL_CSTRINGVIEW_C("generic"),
/*OutOfMemory=*/_cel_GenericErrorSpace_OutOfMemory,
/*Canonical=*/_cel_GenericErrorSpace_Canonical,
/*Message=*/_cel_GenericErrorSpace_Message,
};

static const cel_ErrorSpace _cel_GenericErrorSpace = {
.vtable = &_cel_GenericErrorSpaceVTable,
/*vtable=*/&_cel_GenericErrorSpaceVTable,
};

extern "C" CEL_NONNULL(const cel_ErrorSpace*)
Expand Down Expand Up @@ -672,14 +672,14 @@ static int _cel_SystemErrorSpace_Message(CEL_NONNULL(const cel_ErrorSpace*)
}

static const cel_ErrorSpaceVTable _cel_SystemErrorSpaceVTable = {
.name = CEL_CSTRINGVIEW_C("system"),
.OutOfMemory = _cel_SystemErrorSpace_OutOfMemory,
.Canonical = _cel_SystemErrorSpace_Canonical,
.Message = _cel_SystemErrorSpace_Message,
/*name=*/CEL_CSTRINGVIEW_C("system"),
/*OutOfMemory=*/_cel_SystemErrorSpace_OutOfMemory,
/*Canonical=*/_cel_SystemErrorSpace_Canonical,
/*Message=*/_cel_SystemErrorSpace_Message,
};

static const cel_ErrorSpace _cel_SystemErrorSpace = {
.vtable = &_cel_SystemErrorSpaceVTable,
/*vtable=*/&_cel_SystemErrorSpaceVTable,
};

extern "C" CEL_NONNULL(const cel_ErrorSpace*)
Expand Down
14 changes: 14 additions & 0 deletions cel-c/internal/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,20 @@ cc_test(
],
)

# Compiled as C to cover the C99 versions of the macros in constant.h and
# attribute.h, which C++ translation units do not see.
cc_test(
name = "c_macros_test",
srcs = ["c_macros_test.c"],
deps = [
":attribute",
":constant",
"//cel-c:duration",
"//cel-c:string_view",
"//cel-c:timestamp",
],
)

cc_library(
name = "binary_search",
hdrs = ["binary_search.h"],
Expand Down
81 changes: 77 additions & 4 deletions cel-c/internal/attribute.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <stdalign.h>
#include <stdbool.h>
#include <stdint.h>
#include <string.h>

#include "cel-c/assert.h"
#include "cel-c/config.h"
Expand Down Expand Up @@ -62,6 +63,8 @@ typedef struct {
CEL_STATIC_ASSERT(sizeof(cel_AttributeQualifier) == 16);
CEL_STATIC_ASSERT(alignof(cel_AttributeQualifier) == 8);

#ifndef __cplusplus

// cel_UnspecifiedAttributeQualifier
//
// Returns an unspecified attribute qualifier.
Expand Down Expand Up @@ -109,14 +112,34 @@ CEL_STATIC_ASSERT(alignof(cel_AttributeQualifier) == 8);
}, \
.kind = cel_AttributeQualifierKind_kString})

#else // __cplusplus

// In C++ the attribute-qualifier-returning macros are implemented with the
// inline functions defined below, since designated initializers are a C++20
// feature and are rejected by some compilers (e.g. MSVC) in earlier language
// modes.
#define cel_UnspecifiedAttributeQualifier() \
(_cel_AttributeQualifier_MakeUnspecified())
#define cel_BoolAttributeQualifier(val) \
(_cel_AttributeQualifier_MakeBool((val)))
#define cel_IntAttributeQualifier(val) (_cel_AttributeQualifier_MakeInt((val)))
#define cel_UintAttributeQualifier(val) \
(_cel_AttributeQualifier_MakeUint((val)))
#define cel_StringAttributeQualifier(val) \
(_cel_AttributeQualifier_MakeString((val)))

#endif // __cplusplus

// cel_AttributeQualifier_SetBool
//
// Sets the attribute qualifier to be bool.
static CEL_INLINE void cel_AttributeQualifier_SetBool(
CEL_NONNULL(cel_AttributeQualifier*) attribute_qualifier, bool val) {
CEL_ASSERT_NOT_NULL(attribute_qualifier);

*attribute_qualifier = cel_BoolAttributeQualifier(val);
memset(&attribute_qualifier->data, 0, sizeof(attribute_qualifier->data));
attribute_qualifier->data.b = val;
attribute_qualifier->kind = cel_AttributeQualifierKind_kBool;
}

// cel_AttributeQualifier_SetInt
Expand All @@ -126,7 +149,9 @@ static CEL_INLINE void cel_AttributeQualifier_SetInt(
CEL_NONNULL(cel_AttributeQualifier*) attribute_qualifier, int64_t val) {
CEL_ASSERT_NOT_NULL(attribute_qualifier);

*attribute_qualifier = cel_IntAttributeQualifier(val);
memset(&attribute_qualifier->data, 0, sizeof(attribute_qualifier->data));
attribute_qualifier->data.i = val;
attribute_qualifier->kind = cel_AttributeQualifierKind_kInt;
}

// cel_AttributeQualifier_SetUint
Expand All @@ -136,7 +161,9 @@ static CEL_INLINE void cel_AttributeQualifier_SetUint(
CEL_NONNULL(cel_AttributeQualifier*) attribute_qualifier, uint64_t val) {
CEL_ASSERT_NOT_NULL(attribute_qualifier);

*attribute_qualifier = cel_UintAttributeQualifier(val);
memset(&attribute_qualifier->data, 0, sizeof(attribute_qualifier->data));
attribute_qualifier->data.u = val;
attribute_qualifier->kind = cel_AttributeQualifierKind_kUint;
}

// cel_AttributeQualifier_SetString
Expand All @@ -147,9 +174,55 @@ static CEL_INLINE void cel_AttributeQualifier_SetString(
cel_StringView val) {
CEL_ASSERT_NOT_NULL(attribute_qualifier);

*attribute_qualifier = cel_StringAttributeQualifier(val);
memset(&attribute_qualifier->data, 0, sizeof(attribute_qualifier->data));
attribute_qualifier->data.s.data = cel_StringView_Data(val);
attribute_qualifier->data.s.size = cel_StringView_Size32(val);
attribute_qualifier->kind = cel_AttributeQualifierKind_kString;
}

#ifdef __cplusplus

// Implementation details of the C++ versions of the
// `cel_*AttributeQualifier()` macros.

static CEL_INLINE cel_AttributeQualifier
_cel_AttributeQualifier_MakeUnspecified(void) {
cel_AttributeQualifier attribute_qualifier;
memset(&attribute_qualifier.data, 0, sizeof(attribute_qualifier.data));
attribute_qualifier.kind = cel_AttributeQualifierKind_kUnspecified;
return attribute_qualifier;
}

static CEL_INLINE cel_AttributeQualifier
_cel_AttributeQualifier_MakeBool(bool val) {
cel_AttributeQualifier attribute_qualifier;
cel_AttributeQualifier_SetBool(&attribute_qualifier, val);
return attribute_qualifier;
}

static CEL_INLINE cel_AttributeQualifier
_cel_AttributeQualifier_MakeInt(int64_t val) {
cel_AttributeQualifier attribute_qualifier;
cel_AttributeQualifier_SetInt(&attribute_qualifier, val);
return attribute_qualifier;
}

static CEL_INLINE cel_AttributeQualifier
_cel_AttributeQualifier_MakeUint(uint64_t val) {
cel_AttributeQualifier attribute_qualifier;
cel_AttributeQualifier_SetUint(&attribute_qualifier, val);
return attribute_qualifier;
}

static CEL_INLINE cel_AttributeQualifier
_cel_AttributeQualifier_MakeString(cel_StringView val) {
cel_AttributeQualifier attribute_qualifier;
cel_AttributeQualifier_SetString(&attribute_qualifier, val);
return attribute_qualifier;
}

#endif // __cplusplus

// cel_AttributeQualifier_Kind
//
// Returns the kind of the attribute qualifier.
Expand Down
Loading
Loading