github/esphome
2
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2026-09-19 02:58:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[api] Use proto_varint_value_t type alias instead of #ifdef blocks

Browse Source 
Replace per-override #ifdef USE_API_VARINT64 conditionals with a
single type alias proto_varint_value_t, eliminating preprocessor
blocks from every decode_varint signature in api_pb2.cpp/h.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
J. Nick Koston
2026-03-08 18:56:15 -10:00
co-authored by Claude Opus 4.6
parent fcd72336f0
commit b838085e41
5 changed files with 115 additions and 540 deletions
Download Patch File Download Diff File Expand all files Collapse all files
script/api_protobuf/api_protobuf.py
+3 -15
View File
@@ -2213,12 +2213,7 @@ def build_message_type(
cpp = ""
if decode_varint:
# Use conditional parameter type to match base class
o = "#ifdef USE_API_VARINT64\n"
o += f"bool {desc.name}::decode_varint(uint32_t field_id, uint64_t value) {{\n"
o += "#else\n"
o += f"bool {desc.name}::decode_varint(uint32_t field_id, uint32_t value) {{\n"
o += "#endif\n"
o = f"bool {desc.name}::decode_varint(uint32_t field_id, proto_varint_value_t value) {{\n"
o += " switch (field_id) {\n"
o += indent("\n".join(decode_varint), " ") + "\n"
o += " default: return false;\n"
@@ -2226,15 +2221,8 @@ def build_message_type(
o += " return true;\n"
o += "}\n"
cpp += o
prot_lines = [
"#ifdef USE_API_VARINT64",
"bool decode_varint(uint32_t field_id, uint64_t value) override;",
"#else",
"bool decode_varint(uint32_t field_id, uint32_t value) override;",
"#endif",
]
for i, line in enumerate(prot_lines):
protected_content.insert(i, line)
prot = "bool decode_varint(uint32_t field_id, proto_varint_value_t value) override;"
protected_content.insert(0, prot)
if decode_length:
o = f"bool {desc.name}::decode_length(uint32_t field_id, ProtoLengthDelimited value) {{\n"
o += " switch (field_id) {\n"