rshen/c-capnproto
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

only generate '#include' for imports that are used

Browse source 
This patch modifies the code generator to only generate C-language
`#include <imported_schema.h>` lines for imports that are actually used.

Imagine this transitive import scenario: schema A imports a definition
from schema B.  However, the definition imported from schema B was
itself imported from schema C.

In this case, the code generated for schema A need not include the
header file for schema B, as it only needs definitions from schema C.

Signed-off-by: Curt Brune <curt@enfabrica.net>
This commit is contained in:
Curt Brune 2022-04-26 14:51:23 -07:00
parent 0650ccbf17
commit 1772643adb
1 changed files with 37 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

38
compiler/capnpc-c.c
View file

@ -1303,8 +1303,9 @@ int main() {
struct capn capn;
CodeGeneratorRequest_ptr root;
struct CodeGeneratorRequest req;
struct node *file_node, *n;
struct node *file_node, *n, *f;
struct node *all_files = NULL, *all_structs = NULL;
struct id_bst *used_import_ids = NULL;
int i, j;
if (capn_init_fp(&capn, stdin, 0)) {
@ -1361,6 +1362,35 @@ int main() {
str_release(&b);
}
/* find all the used imports */
for (n = all_structs; n != NULL; n = n->next) {
char *display_name = strdup(n->n.displayName.str);
char *file_name = strtok(display_name, ":");
if (!file_name) {
fprintf(stderr, "Unable to determine file name for struct node: %s\n",
n->n.displayName.str);
exit(2);
}
/* find the file node corresponding to the file name */
for (f = all_files; f != NULL; f = f->next) {
if (!strcmp(file_name, f->n.displayName.str))
break;
}
if (!f) {
fprintf(stderr, "Unable to find file node with file name: %s\n", file_name);
exit(2);
}
/* mark this import as used */
if (!contains_id(used_import_ids, f->n.id))
used_import_ids = insert_id(used_import_ids, f->n.id);
free(display_name);
}
for (i = 0; i < capn_len(req.requestedFiles); i++) {
struct CodeGeneratorRequest_RequestedFile file_req;
static struct str b = STR_INIT;
@ -1445,12 +1475,18 @@ int main() {
continue;
}
// Check if this import is used at all.
if (!contains_id(used_import_ids, im.id)) {
continue;
}
// Ignore leading slashes when generating C file #include's.
// This signifies an absolute import in a library directory.
const char *base_path = im.name.str[0] == '/' ? &im.name.str[1] : im.name.str;
str_addf(&HDR, "#include \"%s%s.h\"\n", base_path, nameinfix);
}
free_id_bst(used_import_ids);
free_id_bst(donotinclude_ids);
str_addf(&HDR, "\n#ifdef __cplusplus\nextern \"C\" {\n#endif\n");