Skip to content

Commit 6e00115

Browse files
committed
FIX: using wrong constants
related to: Oldes/Rebol-issues#2549
1 parent 2bbd3eb commit 6e00115

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/core/n-control.c

+7-7
Original file line numberDiff line numberDiff line change
@@ -413,12 +413,12 @@ enum {
413413
REBVAL *val;
414414
REBVAL *ret;
415415
REBCNT sym;
416-
REBVAL recover = *D_ARG(AM_CATCH_RECOVER);
416+
REBVAL recover = *D_ARG(ARG_CATCH_RECOVER);
417417
REBVAL *last_result = Get_System(SYS_STATE, STATE_LAST_RESULT);
418418
REBOOL quit;
419419

420-
if (D_REF(AM_CATCH_QUIT)) { //QUIT
421-
quit = Try_Block_Halt(VAL_SERIES(D_ARG(AM_CATCH_BLOCK)), VAL_INDEX(D_ARG(AM_CATCH_BLOCK)));
420+
if (D_REF(ARG_CATCH_QUIT)) { //QUIT
421+
quit = Try_Block_Halt(VAL_SERIES(D_ARG(ARG_CATCH_BLOCK)), VAL_INDEX(D_ARG(ARG_CATCH_BLOCK)));
422422
ret = DS_NEXT;
423423
if (quit) {
424424
// We are here because of a QUIT or HALT condition.
@@ -437,20 +437,20 @@ enum {
437437
*DS_RETURN = *ret;
438438
return R_RET;
439439
}
440-
if (!D_REF(AM_CATCH_NAME)) return R_TOS1;
440+
if (!D_REF(ARG_CATCH_NAME)) return R_TOS1;
441441
} else {
442442
// Evaluate the block:
443-
ret = DO_BLK(D_ARG(AM_CATCH_BLOCK));
443+
ret = DO_BLK(D_ARG(ARG_CATCH_BLOCK));
444444
}
445445

446446
// If it is a throw, process it:
447447
if (IS_ERROR(ret) && VAL_ERR_NUM(ret) == RE_THROW) {
448448

449449
// If a named throw, then check it:
450-
if (D_REF(AM_CATCH_NAME)) { // /name
450+
if (D_REF(ARG_CATCH_NAME)) { // /name
451451

452452
sym = VAL_ERR_SYM(ret);
453-
val = D_ARG(AM_CATCH_WORD); // name symbol
453+
val = D_ARG(ARG_CATCH_WORD); // name symbol
454454

455455
// If name is the same word:
456456
if (IS_WORD(val) && sym == VAL_WORD_CANON(val)) goto got_err;

0 commit comments

Comments
 (0)