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

Merge pull request #52 from cbrune/curt/namespace

Browse source
This commit is contained in:
David Lamparter 2023-04-23 14:11:13 +02:00 • committed by GitHub
commit 0653675ef4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
compiler/c.capnp
View file

@ -46,3 +46,6 @@ annotation donotinclude @0x8c99797357b357e9 (file): UInt64;
annotation typedefto @0xcefaf27713042144 (struct, enum): Text; annotation typedefto @0xcefaf27713042144 (struct, enum): Text;
# generate a typedef for the annotated struct or enum declaration # generate a typedef for the annotated struct or enum declaration
annotation namespace @0xf2c035025fec7c2b (file): Text;
# prefix structs with a name space string

37
compiler/capnpc-c.c
View file

@ -147,8 +147,9 @@ static void free_id_bst(struct id_bst * bst)
* set node->name. * set node->name.
* It also builds up the list of nodes within a file (file_nodes and * It also builds up the list of nodes within a file (file_nodes and
* next_file_node). */ * next_file_node). */
static void resolve_names(struct str *b, struct node *n, capn_text name, struct node *file) { static void resolve_names(struct str *b, struct node *n, capn_text name, struct node *file, const char *namespace) {
int i, sz = b->len; int i, sz = b->len;
str_add(b, namespace, -1);
str_add(b, name.str, name.len); str_add(b, name.str, name.len);
str_add(&n->name, b->str, b->len); str_add(&n->name, b->str, b->len);
str_add(b, "_", 1); str_add(b, "_", 1);
@ -158,14 +159,14 @@ static void resolve_names(struct str *b, struct node *n, capn_text name, struct
get_Node_NestedNode(&nest, n->n.nestedNodes, i); get_Node_NestedNode(&nest, n->n.nestedNodes, i);
struct node *nn = find_node(nest.id); struct node *nn = find_node(nest.id);
if (nn != NULL) { if (nn != NULL) {
resolve_names(b, nn, nest.name, file); resolve_names(b, nn, nest.name, file, namespace);
} }
} }
if (n->n.which == Node__struct) { if (n->n.which == Node__struct) {
for (i = capn_len(n->n._struct.fields)-1; i >= 0; i--) { for (i = capn_len(n->n._struct.fields)-1; i >= 0; i--) {
if (n->fields[i].group) { if (n->fields[i].group) {
resolve_names(b, n->fields[i].group, n->fields[i].f.name, file); resolve_names(b, n->fields[i].group, n->fields[i].f.name, file, namespace);
} }
} }
} }
@ -1301,6 +1302,8 @@ static void declare(struct node *file_node, const char *format, int num) {
} }
} }
#define ANNOTATION_NAMESPACE 0xf2c035025fec7c2bUL
int main() { int main() {
struct capn capn; struct capn capn;
CodeGeneratorRequest_ptr root; CodeGeneratorRequest_ptr root;
@ -1350,13 +1353,39 @@ int main() {
for (n = all_files; n != NULL; n = n->next) { for (n = all_files; n != NULL; n = n->next) {
struct str b = STR_INIT; struct str b = STR_INIT;
const char *namespace = NULL;
/* apply name space if present */
for (j = capn_len(n->n.annotations)-1; j >= 0; j--) {
struct Annotation a;
struct Value v;
get_Annotation(&a, n->n.annotations, j);
read_Value(&v, a.value);
if (a.id == ANNOTATION_NAMESPACE) {
if (v.which != Value_text) {
fprintf(stderr, "%s: schema breakage on $C::namespace annotation\n",
n->n.displayName.str);
exit(2);
}
if (namespace) {
fprintf(stderr, "%s: $C::namespace annotation appears more than once.\n",
n->n.displayName.str);
exit(2);
}
namespace = v.text.str ? v.text.str : "";
}
}
if (!namespace)
namespace = "";
for (i = capn_len(n->n.nestedNodes)-1; i >= 0; i--) { for (i = capn_len(n->n.nestedNodes)-1; i >= 0; i--) {
struct Node_NestedNode nest; struct Node_NestedNode nest;
get_Node_NestedNode(&nest, n->n.nestedNodes, i); get_Node_NestedNode(&nest, n->n.nestedNodes, i);
struct node *nn = find_node_mayfail(nest.id); struct node *nn = find_node_mayfail(nest.id);
if (nn) { if (nn) {
resolve_names(&b, nn, nest.name, n); resolve_names(&b, nn, nest.name, n, namespace);
} }
} }