Skip to content

Commit dba2ecd

Browse files
infradiginfradig
authored
Merge pull request #972 from jgarte/rename-ensure
Rename ensure Macro
2 parents 20c681a + 09f7ff0 commit dba2ecd

10 files changed

Lines changed: 52 additions & 52 deletions

File tree

‎src/bif_threads.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ static int new_thread(prolog *pl)
173173
void thread_initialize(prolog *pl)
174174
{
175175
int n = new_thread(pl);
176-
ensure(n >= 0);
176+
ENSURE(n >= 0);
177177
thread *t = &pl->threads[n];
178178
if (!t->alias) t->alias = sl_create((void*)fake_strcmp, (void*)keyfree, NULL);
179179
sl_app(t->alias, strdup("main"), NULL);
@@ -540,7 +540,7 @@ static void do_unlock_all(prolog *pl)
540540
static void *start_routine_thread(thread *t)
541541
{
542542
prolog *pl = pl_create();
543-
ensure(pl);
543+
ENSURE(pl);
544544
pl->my_chan = t->chan;
545545
pl_consult(pl, t->filename);
546546
t->is_active = false;
@@ -853,7 +853,7 @@ bool do_signal(query *q, void *thread_ptr)
853853
unshare_cells(c, c->num_cells);
854854
free(m);
855855
cell *tmp = prepare_call(q, CALL_NOSKIP, c, q->st.cur_ctx, 1);
856-
ensure(tmp);
856+
ENSURE(tmp);
857857
pl_idx num_cells = c->num_cells;
858858
make_call(q, tmp+num_cells);
859859
q->st.instr = tmp;

‎src/history.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ char *history_readline_eol(prolog *pl, const char *prompt, char eol)
7474
if (cmd) {
7575
size_t n = strlen(cmd) + strlen(line);
7676
cmd = realloc(cmd, n+1);
77-
ensure(cmd);
77+
ENSURE(cmd);
7878
strcat(cmd, line);
7979
} else {
8080
cmd = strdup(line);
@@ -108,7 +108,7 @@ char *history_readline_eol(prolog *pl, const char *prompt, char eol)
108108

109109
if (ch == 0) {
110110
cmd = realloc(cmd, strlen(cmd)+1+1);
111-
ensure(cmd);
111+
ENSURE(cmd);
112112
strcat(cmd, "\n");
113113
prompt = "";
114114
goto LOOP;
@@ -332,7 +332,7 @@ char *history_readline_eol(prolog *pl, const char *prompt, char eol)
332332
if (cmd) {
333333
size_t n = strlen(cmd) + strlen(line);
334334
cmd = realloc(cmd, n+1);
335-
ensure(cmd);
335+
ENSURE(cmd);
336336
strcat(cmd, line);
337337
} else {
338338
cmd = strdup(line);
@@ -357,7 +357,7 @@ char *history_readline_eol(prolog *pl, const char *prompt, char eol)
357357

358358
if (ch == 0) {
359359
cmd = realloc(cmd, strlen(cmd)+1+1);
360-
ensure(cmd);
360+
ENSURE(cmd);
361361
strcat(cmd, "\n");
362362
prompt = "";
363363
goto LOOP;

‎src/internal.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1076,5 +1076,5 @@ inline static void predicate_delink(predicate *pr, rule *r)
10761076
if (pr->tail == r) pr->tail = r->prev;
10771077
}
10781078

1079-
#define ensure(cond, ...) if (!(cond)) { printf("Error: no memory %s %d\n", __FILE__, __LINE__); abort(); }
1079+
#define ENSURE(cond, ...) if (!(cond)) { printf("Error: no memory %s %d\n", __FILE__, __LINE__); abort(); }
10801080

‎src/module.c‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ static const char *set_known(module *m, const char *filename)
131131
}
132132

133133
ptr = malloc(sizeof(loaded_file));
134-
ensure(ptr);
134+
ENSURE(ptr);
135135
ptr->next = m->loaded_files;
136136
ptr->orig_filename = strdup(filename);
137137
ptr->filename = strdup(filename);
@@ -155,7 +155,7 @@ static const char *set_loaded(module *m, const char *filename, const char *orig_
155155
}
156156

157157
ptr = malloc(sizeof(loaded_file));
158-
ensure(ptr);
158+
ENSURE(ptr);
159159
ptr->next = m->loaded_files;
160160
ptr->orig_filename = strdup(orig_filename);
161161
ptr->filename = strdup(filename);
@@ -365,7 +365,7 @@ predicate *create_predicate(module *m, cell *c, bool *created)
365365
}
366366

367367
predicate *pr = calloc(1, sizeof(predicate));
368-
ensure(pr);
368+
ENSURE(pr);
369369
list_push_back(&m->predicates, pr);
370370

371371
if (created)
@@ -476,7 +476,7 @@ void create_goal_expansion(module *m, cell *c)
476476
return;
477477

478478
pi *g = calloc(1, sizeof(pi));
479-
ensure(g);
479+
ENSURE(g);
480480
g->prev = m->gex_tail;
481481

482482
if (m->gex_tail)
@@ -788,7 +788,7 @@ void set_discontiguous_in_db(module *m, const char *name, unsigned arity)
788788
cell tmp = (cell){0};
789789
tmp.tag = TAG_INTERNED;
790790
tmp.val_off = new_atom(m->pl, name);
791-
ensure(tmp.val_off != ERR_IDX);
791+
ENSURE(tmp.val_off != ERR_IDX);
792792
tmp.arity = arity;
793793
predicate *pr = find_predicate(m, &tmp);
794794
if (!pr) pr = create_predicate(m, &tmp, NULL);
@@ -805,7 +805,7 @@ void set_multifile_in_db(module *m, const char *name, pl_idx arity)
805805
cell tmp = (cell){0};
806806
tmp.tag = TAG_INTERNED;
807807
tmp.val_off = new_atom(m->pl, name);
808-
ensure(tmp.val_off != ERR_IDX);
808+
ENSURE(tmp.val_off != ERR_IDX);
809809
tmp.arity = arity;
810810
predicate *pr = find_predicate(m, &tmp);
811811
if (!pr) pr = create_predicate(m, &tmp, NULL);
@@ -822,7 +822,7 @@ void set_dynamic_in_db(module *m, const char *name, unsigned arity)
822822
cell tmp = (cell){0};
823823
tmp.tag = TAG_INTERNED;
824824
tmp.val_off = new_atom(m->pl, name);
825-
ensure(tmp.val_off != ERR_IDX);
825+
ENSURE(tmp.val_off != ERR_IDX);
826826
tmp.arity = arity;
827827
predicate *pr = find_predicate(m, &tmp);
828828
if (!pr) pr = create_predicate(m, &tmp, NULL);
@@ -841,7 +841,7 @@ void set_meta_predicate_in_db(module *m, cell *c)
841841
cell tmp = (cell){0};
842842
tmp.tag = TAG_INTERNED;
843843
tmp.val_off = new_atom(m->pl, name);
844-
ensure(tmp.val_off != ERR_IDX);
844+
ENSURE(tmp.val_off != ERR_IDX);
845845
tmp.arity = arity;
846846
predicate *pr = find_predicate(m, &tmp);
847847
if (!pr) pr = create_predicate(m, &tmp, NULL);
@@ -946,7 +946,7 @@ static bool do_use_module(module *curr_m, cell *c, module **mptr)
946946
continue;
947947

948948
char *src = malloc(*lib->len+1);
949-
ensure(src);
949+
ENSURE(src);
950950
memcpy(src, lib->start, *lib->len);
951951
src[*lib->len] = '\0';
952952
SB(s1);
@@ -978,7 +978,7 @@ static bool do_use_module(module *curr_m, cell *c, module **mptr)
978978
continue;
979979

980980
char *src = malloc(*lib->len+1);
981-
ensure(src);
981+
ENSURE(src);
982982
memcpy(src, lib->start, *lib->len);
983983
src[*lib->len] = '\0';
984984
SB(s1);
@@ -1274,7 +1274,7 @@ static bool set_op_internal(module *m, const char *name, unsigned specifier, uns
12741274

12751275
sl_done(iter);
12761276
op_table *tmp = malloc(sizeof(op_table));
1277-
ensure(tmp);
1277+
ENSURE(tmp);
12781278
tmp->name = set_known(m, name);
12791279
tmp->priority = priority;
12801280
tmp->specifier = specifier;
@@ -1945,7 +1945,7 @@ static rule *assert_begin(module *m, unsigned num_vars, cell *p1, bool consultin
19451945

19461946
size_t dbe_size = sizeof(rule) + (sizeof(cell) * (p1->num_cells+1));
19471947
rule *r = calloc(1, dbe_size);
1948-
ensure(r);
1948+
ENSURE(r);
19491949
copy_cells(r->cl.cells, p1, p1->num_cells);
19501950
r->cl.cells[p1->num_cells] = (cell){0};
19511951
r->cl.cells[p1->num_cells].tag = TAG_END;
@@ -1979,11 +1979,11 @@ static void assert_commit(module *m, rule *r, predicate *pr, bool append)
19791979
return;
19801980

19811981
pr->idx1 = sl_create(index_cmpkey, NULL, m);
1982-
ensure(pr->idx1);
1982+
ENSURE(pr->idx1);
19831983

19841984
if (pr->key.arity > 1) {
19851985
pr->idx2 = sl_create(index_cmpkey, NULL, m);
1986-
ensure(pr->idx2);
1986+
ENSURE(pr->idx2);
19871987
}
19881988

19891989
for (rule *cl2 = pr->head; cl2; cl2 = cl2->next) {
@@ -2206,15 +2206,15 @@ bool unload_file(module *m, const char *filename)
22062206
{
22072207
size_t len = strlen(filename);
22082208
char *tmpbuf = malloc(len + 20);
2209-
ensure(tmpbuf);
2209+
ENSURE(tmpbuf);
22102210
memcpy(tmpbuf, filename, len+1);
22112211

22122212
if (tmpbuf[0] == '~') {
22132213
const char *ptr = getenv("HOME");
22142214

22152215
if (ptr) {
22162216
tmpbuf = realloc(tmpbuf, strlen(ptr) + 10 + strlen(filename) + 20);
2217-
ensure(tmpbuf);
2217+
ENSURE(tmpbuf);
22182218
strcpy(tmpbuf, ptr);
22192219
strcat(tmpbuf, filename+1);
22202220
convert_path(tmpbuf);
@@ -2482,7 +2482,7 @@ module *load_file(module *m, const char *filename, bool including, bool init)
24822482

24832483
if ((st.st_mode & S_IFMT) == S_IFDIR) {
24842484
char *tmpbuf = malloc(strlen(orig_filename)+20);
2485-
ensure(tmpbuf);
2485+
ENSURE(tmpbuf);
24862486
strcpy(tmpbuf, orig_filename);
24872487
strcat(tmpbuf, ".pl");
24882488
m = load_file(m, tmpbuf, including, init);
@@ -2604,7 +2604,7 @@ void module_duplicate(prolog *pl, module *m, const char *name, unsigned arity)
26042604
module *module_create(prolog *pl, const char *name)
26052605
{
26062606
module *m = calloc(1, sizeof(module));
2607-
ensure(m);
2607+
ENSURE(m);
26082608

26092609
m->pl = pl;
26102610
m->filename = set_known(m, name);
@@ -2622,7 +2622,7 @@ module *module_create(prolog *pl, const char *name)
26222622
if (strcmp(name, "system")) {
26232623
for (const op_table *ptr = g_ops; ptr->name; ptr++) {
26242624
op_table *tmp = malloc(sizeof(op_table));
2625-
ensure(tmp);
2625+
ENSURE(tmp);
26262626
memcpy(tmp, ptr, sizeof(op_table));
26272627
sl_app(m->defops, tmp->name, tmp);
26282628
}

‎src/network.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ int net_getline(char **lineptr, size_t *n, stream *str)
425425
if (str->ssl) {
426426
if (!*lineptr) {
427427
*lineptr = malloc(*n=1024);
428-
ensure(*lineptr);
428+
ENSURE(*lineptr);
429429
}
430430

431431
char *dst = *lineptr;
@@ -452,7 +452,7 @@ int net_getline(char **lineptr, size_t *n, stream *str)
452452
size_t savelen = dst - *lineptr;
453453
*n *= 2;
454454
*lineptr = realloc(*lineptr, *n);
455-
ensure(*lineptr);
455+
ENSURE(*lineptr);
456456
dst = *lineptr + savelen;
457457
dstlen = *n - savelen;
458458
}

‎src/parser.c‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ bool is_graphic(int ch)
2727
char *slicedup(const char *s, size_t n)
2828
{
2929
char *ptr = malloc(n+1);
30-
ensure (ptr);
30+
ENSURE (ptr);
3131
memcpy(ptr, s, n);
3232
ptr[n] = '\0';
3333
return ptr;
@@ -342,7 +342,7 @@ static bool make_room(parser *p, unsigned num)
342342
pl_idx num_cells = (p->cl->num_allocated_cells + num) * 3 / 2;
343343

344344
clause *cl = realloc(p->cl, sizeof(clause)+(sizeof(cell)*num_cells));
345-
ensure(cl);
345+
ENSURE(cl);
346346
p->cl = cl;
347347
p->cl->num_allocated_cells = num_cells;
348348
}
@@ -395,12 +395,12 @@ void parser_destroy(parser *p)
395395
parser *parser_create(module *m)
396396
{
397397
parser *p = calloc(1, sizeof(parser));
398-
ensure(p);
398+
ENSURE(p);
399399
p->pl = m->pl;
400400
p->m = m;
401401
pl_idx num_cells = INITIAL_NBR_CELLS;
402402
p->cl = calloc(1, sizeof(clause)+(sizeof(cell)*num_cells));
403-
ensure(p->cl, free(p));
403+
ENSURE(p->cl, free(p));
404404
p->cl->num_allocated_cells = num_cells;
405405
p->start_term = true;
406406
p->flags = m->flags;
@@ -431,7 +431,7 @@ static void consultall(parser *p, cell *l)
431431
char *relative_to(const char *basefile, const char *relfile)
432432
{
433433
char *tmpbuf = malloc(strlen(basefile) + strlen(relfile) + 256);
434-
ensure(tmpbuf);
434+
ENSURE(tmpbuf);
435435
char *ptr = tmpbuf;
436436

437437
if (!strncmp(relfile, "../", 3) || !strchr(relfile, '/')) {
@@ -754,7 +754,7 @@ static bool directives(parser *p, cell *d)
754754
q.st.m = p->m;
755755
char *dst = print_term_to_strbuf(&q, p1, p1_ctx, 0);
756756
builtins *ptr = calloc(1, sizeof(builtins));
757-
ensure(ptr);
757+
ENSURE(ptr);
758758
ptr->name = strdup(C_STR(p, p1));
759759
ptr->arity = p1->arity;
760760
ptr->m = p->m;
@@ -1592,7 +1592,7 @@ void assign_vars(parser *p, unsigned start, bool rebase)
15921592
}
15931593

15941594
cell *c = make_a_cell(p);
1595-
ensure(c);
1595+
ENSURE(c);
15961596
c->tag = TAG_END;
15971597
c->num_cells = 1;
15981598
}
@@ -2868,7 +2868,7 @@ static bool parse_number(parser *p, const char **srcptr, bool neg)
28682868

28692869
if (mp_int_to_int(&v2, &val) == MP_RANGE) {
28702870
p->v.val_bigint = malloc(sizeof(bigint));
2871-
ensure(p->v.val_bigint);
2871+
ENSURE(p->v.val_bigint);
28722872
p->v.val_bigint->refcnt = 1;
28732873
mp_int_init_copy(&p->v.val_bigint->ival, &v2);
28742874
if (neg) p->v.val_bigint->ival.sign = MP_NEG;
@@ -2890,7 +2890,7 @@ static bool parse_number(parser *p, const char **srcptr, bool neg)
28902890

28912891
if (mp_int_to_int(&v2, &val) == MP_RANGE) {
28922892
p->v.val_bigint = malloc(sizeof(bigint));
2893-
ensure(p->v.val_bigint);
2893+
ENSURE(p->v.val_bigint);
28942894
p->v.val_bigint->refcnt = 1;
28952895
mp_int_init_copy(&p->v.val_bigint->ival, &v2);
28962896
if (neg) p->v.val_bigint->ival.sign = MP_NEG;
@@ -2912,7 +2912,7 @@ static bool parse_number(parser *p, const char **srcptr, bool neg)
29122912

29132913
if (mp_int_to_int(&v2, &val) == MP_RANGE) {
29142914
p->v.val_bigint = malloc(sizeof(bigint));
2915-
ensure(p->v.val_bigint);
2915+
ENSURE(p->v.val_bigint);
29162916
p->v.val_bigint->refcnt = 1;
29172917
mp_int_init_copy(&p->v.val_bigint->ival, &v2);
29182918
if (neg) p->v.val_bigint->ival.sign = MP_NEG;
@@ -2977,7 +2977,7 @@ static bool parse_number(parser *p, const char **srcptr, bool neg)
29772977

29782978
if (mp_int_to_int(&v2, &val) == MP_RANGE) {
29792979
p->v.val_bigint = malloc(sizeof(bigint));
2980-
ensure(p->v.val_bigint);
2980+
ENSURE(p->v.val_bigint);
29812981
p->v.val_bigint->refcnt = 1;
29822982
mp_int_init_copy(&p->v.val_bigint->ival, &v2);
29832983
if (neg) p->v.val_bigint->ival.sign = MP_NEG;
@@ -3859,7 +3859,7 @@ unsigned tokenize(parser *p, bool is_arg_processing, bool is_consing)
38593859
if (!p->quote_char && !SB_strcmp(p->token, "{")) {
38603860
save_idx = p->cl->cidx;
38613861
cell *c = make_interned(p, g_braces_s);
3862-
ensure(c);
3862+
ENSURE(c);
38633863
c->arity = 1;
38643864
p->start_term = true;
38653865
p->nesting_braces++;
@@ -4317,7 +4317,7 @@ unsigned tokenize(parser *p, bool is_arg_processing, bool is_consing)
43174317

43184318
if (!p->is_number_chars) {
43194319
c->val_off = new_atom(p->pl, SB_cstr(p->token));
4320-
ensure(c->val_off != ERR_IDX);
4320+
ENSURE(c->val_off != ERR_IDX);
43214321
}
43224322
} else {
43234323
c->tag = TAG_CSTR;

0 commit comments

Comments
 (0)