tools: handle generating print templates for CSV without tlvs, messages

We want to use this to handle the simple description for channel_type. It also needs to handle variable-size types (just like subtypes). Signed-off-by: Rusty Russell <[email protected]>
vlivecarefree · Sep 13, 2021 · 1b85519 · 1b85519
1 parent d12a2ec
commit 1b85519
Show file tree

Hide file tree

Showing 39 changed files with 44 additions and 44 deletions.
diff --git a/channeld/channeld_wiregen.c b/channeld/channeld_wiregen.c
diff --git a/channeld/channeld_wiregen.h b/channeld/channeld_wiregen.h
diff --git a/closingd/closingd_wiregen.c b/closingd/closingd_wiregen.c
diff --git a/closingd/closingd_wiregen.h b/closingd/closingd_wiregen.h
diff --git a/common/peer_status_wiregen.c b/common/peer_status_wiregen.c
diff --git a/common/peer_status_wiregen.h b/common/peer_status_wiregen.h
diff --git a/common/status_wiregen.c b/common/status_wiregen.c
diff --git a/common/status_wiregen.h b/common/status_wiregen.h
diff --git a/connectd/connectd_gossipd_wiregen.c b/connectd/connectd_gossipd_wiregen.c
diff --git a/connectd/connectd_gossipd_wiregen.h b/connectd/connectd_gossipd_wiregen.h
diff --git a/connectd/connectd_wiregen.c b/connectd/connectd_wiregen.c
diff --git a/connectd/connectd_wiregen.h b/connectd/connectd_wiregen.h
diff --git a/gossipd/gossip_store_wiregen.c b/gossipd/gossip_store_wiregen.c
diff --git a/gossipd/gossip_store_wiregen.h b/gossipd/gossip_store_wiregen.h
diff --git a/gossipd/gossipd_peerd_wiregen.c b/gossipd/gossipd_peerd_wiregen.c
diff --git a/gossipd/gossipd_peerd_wiregen.h b/gossipd/gossipd_peerd_wiregen.h
diff --git a/gossipd/gossipd_wiregen.c b/gossipd/gossipd_wiregen.c
diff --git a/gossipd/gossipd_wiregen.h b/gossipd/gossipd_wiregen.h
diff --git a/hsmd/hsmd_wiregen.c b/hsmd/hsmd_wiregen.c
diff --git a/hsmd/hsmd_wiregen.h b/hsmd/hsmd_wiregen.h
diff --git a/onchaind/onchaind_wiregen.c b/onchaind/onchaind_wiregen.c
diff --git a/onchaind/onchaind_wiregen.h b/onchaind/onchaind_wiregen.h
diff --git a/openingd/dualopend_wiregen.c b/openingd/dualopend_wiregen.c
diff --git a/openingd/dualopend_wiregen.h b/openingd/dualopend_wiregen.h
diff --git a/openingd/openingd_wiregen.c b/openingd/openingd_wiregen.c
diff --git a/openingd/openingd_wiregen.h b/openingd/openingd_wiregen.h
diff --git a/tools/gen/print_impl_template b/tools/gen/print_impl_template
@@ -9,6 +9,7 @@
 #include <inttypes.h>
 #include <stdio.h>
 
+% if enum_sets:
 void print${options.enum_name}_message(const u8 *msg)
 {
 	switch ((enum ${options.enum_name})fromwire_peektype(msg)) {
@@ -22,6 +23,7 @@ void print${options.enum_name}_message(const u8 *msg)
 
 	printf("UNKNOWN: %s\\n", tal_hex(msg, msg));
 }
+% endif
 
 ## 'component' for 'truncate check 
 <%def name="truncate_check(nested=False)">
@@ -54,7 +56,7 @@ void print${options.enum_name}_message(const u8 *msg)
 	    % else:
 	for (size_t i = 0; i < ${f.size()}; i++) {
 	    % endif
-	    % if f.type_obj.is_subtype():
+	    % if f.type_obj.is_subtype() or f.type_obj.is_varsize():
 		printf("{\n");
 		printwire_${f.type_obj.name}(tal_fmt(NULL, "%s.${f.name}", fieldname), ${cursor}, ${plen});
 		printf("}\n");
@@ -76,7 +78,7 @@ void print${options.enum_name}_message(const u8 *msg)
 	printf("]");
 	% endif
 ${truncate_check(nested)} \
-    % elif f.type_obj.is_subtype():
+    % elif f.type_obj.is_subtype() or f.type_obj.is_varsize():
 	printf("{\n");
 	printwire_${f.type_obj.name}(tal_fmt(NULL, "%s.${f.name}", fieldname), ${cursor}, ${plen});
 	printf("}\n");
@@ -136,15 +138,13 @@ ${print_fieldset(msg.fields.values(), False, '&cursor', '&plen')}
 }
 % endfor
 
-void print${options.enum_name}_tlv_message(const char *tlv_name, const u8 *msg) {
 % if bool(tlvs):
+void print${options.enum_name}_tlv_message(const char *tlv_name, const u8 *msg) {
 	size_t plen = tal_count(msg);
     % for tlv_name in tlvs:
 	if (strcmp(tlv_name, "${tlv_name}") == 0) {
 		printwire_tlvs(tlv_name, &msg, &plen, print_tlvs_${tlv_name}, ARRAY_SIZE(print_tlvs_${tlv_name}));
 	}
     % endfor
-% else:
-	printf("ERR: No TLV definition found for %s\n", tlv_name);
-% endif
 }
+% endif
diff --git a/wire/bolt12_wiregen.c b/wire/bolt12_wiregen.c
diff --git a/wire/bolt12_wiregen.h b/wire/bolt12_wiregen.h
diff --git a/wire/common_wiregen.c b/wire/common_wiregen.c
diff --git a/wire/common_wiregen.h b/wire/common_wiregen.h
diff --git a/wire/onion_printgen.c b/wire/onion_printgen.c
diff --git a/wire/onion_printgen.h b/wire/onion_printgen.h
diff --git a/wire/onion_wiregen.c b/wire/onion_wiregen.c
diff --git a/wire/onion_wiregen.h b/wire/onion_wiregen.h
diff --git a/wire/peer_printgen.c b/wire/peer_printgen.c
diff --git a/wire/peer_printgen.h b/wire/peer_printgen.h
diff --git a/wire/peer_wiregen.c b/wire/peer_wiregen.c
diff --git a/wire/peer_wiregen.h b/wire/peer_wiregen.h