@@ -413,12 +413,12 @@ enum {
413
413
REBVAL * val ;
414
414
REBVAL * ret ;
415
415
REBCNT sym ;
416
- REBVAL recover = * D_ARG (AM_CATCH_RECOVER );
416
+ REBVAL recover = * D_ARG (ARG_CATCH_RECOVER );
417
417
REBVAL * last_result = Get_System (SYS_STATE , STATE_LAST_RESULT );
418
418
REBOOL quit ;
419
419
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 )));
422
422
ret = DS_NEXT ;
423
423
if (quit ) {
424
424
// We are here because of a QUIT or HALT condition.
@@ -437,20 +437,20 @@ enum {
437
437
* DS_RETURN = * ret ;
438
438
return R_RET ;
439
439
}
440
- if (!D_REF (AM_CATCH_NAME )) return R_TOS1 ;
440
+ if (!D_REF (ARG_CATCH_NAME )) return R_TOS1 ;
441
441
} else {
442
442
// Evaluate the block:
443
- ret = DO_BLK (D_ARG (AM_CATCH_BLOCK ));
443
+ ret = DO_BLK (D_ARG (ARG_CATCH_BLOCK ));
444
444
}
445
445
446
446
// If it is a throw, process it:
447
447
if (IS_ERROR (ret ) && VAL_ERR_NUM (ret ) == RE_THROW ) {
448
448
449
449
// If a named throw, then check it:
450
- if (D_REF (AM_CATCH_NAME )) { // /name
450
+ if (D_REF (ARG_CATCH_NAME )) { // /name
451
451
452
452
sym = VAL_ERR_SYM (ret );
453
- val = D_ARG (AM_CATCH_WORD ); // name symbol
453
+ val = D_ARG (ARG_CATCH_WORD ); // name symbol
454
454
455
455
// If name is the same word:
456
456
if (IS_WORD (val ) && sym == VAL_WORD_CANON (val )) goto got_err ;
0 commit comments