Skip to content

Commit bc073fc

Browse files
committed
Improve cxx port.
1 parent 922cf7a commit bc073fc

File tree

5 files changed

+220
-101
lines changed

5 files changed

+220
-101
lines changed

source/loader/source/loader_host.c

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -169,18 +169,15 @@ int loader_host_register(loader_impl host, context ctx, const char *name, loader
169169

170170
signature s = function_signature(f);
171171

172-
if (arg_size > 0)
173-
{
174-
size_t iterator;
172+
size_t iterator;
175173

176-
for (iterator = 0; iterator < arg_size; ++iterator)
177-
{
178-
static const char empty_argument_name[] = "";
174+
for (iterator = 0; iterator < arg_size; ++iterator)
175+
{
176+
static const char empty_argument_name[] = "";
179177

180-
type t = loader_impl_type(host, type_id_name(args_type_id[iterator]));
178+
type t = loader_impl_type(host, type_id_name(args_type_id[iterator]));
181179

182-
signature_set(s, iterator, empty_argument_name, t);
183-
}
180+
signature_set(s, iterator, empty_argument_name, t);
184181
}
185182

186183
type t = loader_impl_type(host, type_id_name(return_type));

source/metacall/source/metacall.c

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2186,9 +2186,12 @@ type_id *metacall_type_ids(void *args[], size_t size)
21862186
{
21872187
ids = (type_id *)malloc(sizeof(type_id) * size);
21882188

2189-
for (size_t iterator = 0; iterator < size; ++iterator)
2189+
if (ids != NULL)
21902190
{
2191-
ids[iterator] = metacall_value_id(args[iterator]);
2191+
for (size_t iterator = 0; iterator < size; ++iterator)
2192+
{
2193+
ids[iterator] = metacall_value_id(args[iterator]);
2194+
}
21922195
}
21932196
}
21942197

@@ -2228,9 +2231,12 @@ void *metacallt_object(void *obj, const char *name, const enum metacall_value_id
22282231
{
22292232
ids = (type_id *)malloc(sizeof(type_id) * size);
22302233

2231-
for (size_t iterator = 0; iterator < size; ++iterator)
2234+
if (ids != NULL)
22322235
{
2233-
ids[iterator] = metacall_value_id(args[iterator]);
2236+
for (size_t iterator = 0; iterator < size; ++iterator)
2237+
{
2238+
ids[iterator] = metacall_value_id(args[iterator]);
2239+
}
22342240
}
22352241
}
22362242

0 commit comments

Comments
 (0)