|
40 | 40 | cbm_registry_add_type(reg, rt); \ |
41 | 41 | } while (0) |
42 | 42 |
|
43 | | -/* Register an instance method on receiver type `recv_` returning `ret_`. */ |
44 | | -#define REG_METHOD(recv_, name_, ret_) \ |
45 | | - do { \ |
46 | | - memset(&rf, 0, sizeof(rf)); \ |
47 | | - rf.min_params = -1; \ |
48 | | - rf.qualified_name = cbm_arena_sprintf(arena, "%s.%s", (recv_), (name_)); \ |
49 | | - rf.short_name = (name_); \ |
50 | | - rf.receiver_type = (recv_); \ |
51 | | - { \ |
52 | | - const CBMType **rets = (const CBMType **)cbm_arena_alloc(arena, 2 * sizeof(*rets)); \ |
53 | | - rets[0] = (ret_); \ |
54 | | - rets[1] = NULL; \ |
55 | | - rf.signature = cbm_type_func(arena, NULL, NULL, rets); \ |
56 | | - } \ |
57 | | - cbm_registry_add_func(reg, rf); \ |
| 43 | +/* Signature `() -> ret`. Every seed allocation can fail (arena exhausted): |
| 44 | + * a NULL return vector is left out, so the signature types as unknown (the |
| 45 | + * same fallback ruby_register_method uses) instead of being written through. */ |
| 46 | +static const CBMType *ruby_seed_signature(CBMArena *arena, const CBMType *ret) { |
| 47 | + const CBMType **rets = (const CBMType **)cbm_arena_alloc(arena, 2 * sizeof(*rets)); |
| 48 | + if (rets) { |
| 49 | + rets[0] = ret; |
| 50 | + rets[1] = NULL; |
| 51 | + } |
| 52 | + return cbm_type_func(arena, NULL, NULL, rets); |
| 53 | +} |
| 54 | + |
| 55 | +/* Register an instance method on receiver type `recv_` returning `ret_`. |
| 56 | + * An entry whose formatted QN came back NULL is not registered: a NULL QN |
| 57 | + * would reach strcmp in finalize and in every later lookup. */ |
| 58 | +#define REG_METHOD(recv_, name_, ret_) \ |
| 59 | + do { \ |
| 60 | + memset(&rf, 0, sizeof(rf)); \ |
| 61 | + rf.min_params = -1; \ |
| 62 | + rf.qualified_name = cbm_arena_sprintf(arena, "%s.%s", (recv_), (name_)); \ |
| 63 | + if (!rf.qualified_name) \ |
| 64 | + break; \ |
| 65 | + rf.short_name = (name_); \ |
| 66 | + rf.receiver_type = (recv_); \ |
| 67 | + rf.signature = ruby_seed_signature(arena, (ret_)); \ |
| 68 | + cbm_registry_add_func(reg, rf); \ |
58 | 69 | } while (0) |
59 | 70 |
|
60 | 71 | /* Register a singleton (class-side) method: receiver key "<qn>.self" |
61 | | - * matches ruby_lookup_singleton_method's keying convention. */ |
62 | | -#define REG_SMETHOD(recv_, name_, ret_) \ |
63 | | - do { \ |
64 | | - memset(&rf, 0, sizeof(rf)); \ |
65 | | - rf.min_params = -1; \ |
66 | | - rf.qualified_name = cbm_arena_sprintf(arena, "%s.%s", (recv_), (name_)); \ |
67 | | - rf.short_name = (name_); \ |
68 | | - rf.receiver_type = cbm_arena_sprintf(arena, "%s.self", (recv_)); \ |
69 | | - { \ |
70 | | - const CBMType **rets = (const CBMType **)cbm_arena_alloc(arena, 2 * sizeof(*rets)); \ |
71 | | - rets[0] = (ret_); \ |
72 | | - rets[1] = NULL; \ |
73 | | - rf.signature = cbm_type_func(arena, NULL, NULL, rets); \ |
74 | | - } \ |
75 | | - cbm_registry_add_func(reg, rf); \ |
| 72 | + * matches ruby_lookup_singleton_method's keying convention. Skipped when |
| 73 | + * either formatted name came back NULL (see REG_METHOD). */ |
| 74 | +#define REG_SMETHOD(recv_, name_, ret_) \ |
| 75 | + do { \ |
| 76 | + memset(&rf, 0, sizeof(rf)); \ |
| 77 | + rf.min_params = -1; \ |
| 78 | + rf.qualified_name = cbm_arena_sprintf(arena, "%s.%s", (recv_), (name_)); \ |
| 79 | + rf.receiver_type = cbm_arena_sprintf(arena, "%s.self", (recv_)); \ |
| 80 | + if (!rf.qualified_name || !rf.receiver_type) \ |
| 81 | + break; \ |
| 82 | + rf.short_name = (name_); \ |
| 83 | + rf.signature = ruby_seed_signature(arena, (ret_)); \ |
| 84 | + cbm_registry_add_func(reg, rf); \ |
76 | 85 | } while (0) |
77 | 86 |
|
78 | 87 | /* Register a global (Kernel) built-in function returning `ret_`. */ |
79 | | -#define REG_BUILTIN(name_, ret_) \ |
80 | | - do { \ |
81 | | - memset(&rf, 0, sizeof(rf)); \ |
82 | | - rf.min_params = -1; \ |
83 | | - rf.qualified_name = (name_); \ |
84 | | - rf.short_name = (name_); \ |
85 | | - { \ |
86 | | - const CBMType **rets = (const CBMType **)cbm_arena_alloc(arena, 2 * sizeof(*rets)); \ |
87 | | - rets[0] = (ret_); \ |
88 | | - rets[1] = NULL; \ |
89 | | - rf.signature = cbm_type_func(arena, NULL, NULL, rets); \ |
90 | | - } \ |
91 | | - cbm_registry_add_func(reg, rf); \ |
| 88 | +#define REG_BUILTIN(name_, ret_) \ |
| 89 | + do { \ |
| 90 | + memset(&rf, 0, sizeof(rf)); \ |
| 91 | + rf.min_params = -1; \ |
| 92 | + rf.qualified_name = (name_); \ |
| 93 | + rf.short_name = (name_); \ |
| 94 | + rf.signature = ruby_seed_signature(arena, (ret_)); \ |
| 95 | + cbm_registry_add_func(reg, rf); \ |
92 | 96 | } while (0) |
93 | 97 |
|
94 | 98 | void cbm_ruby_stdlib_register(CBMTypeRegistry *reg, CBMArena *arena) { |
|
0 commit comments