Nico Williams
1cf6515c06
Close #1885, #2140, #2011, #2220, #2485, #2073 Rename the FORK_OPT opcode to TRY_BEGIN, add a TRY_END opcode, and wrap errors when raising through a TRY_END so that they will not be caught by the matching TRY_BEGIN. Now a `try exp catch handler` expression generates code like: TRY_BEGIN handler <exp> TRY_END JUMP past_handler handler: <handler> past_handler: ... On backtrack through TRY_BEGIN it just backtracks. If anything past the whole thing raises when <exp> produced a value, then the TRY_END will catch the error, wrap it in another, and backtrack. The TRY_BEGIN will see a wrapped error and then it will unwrap and re-raise the error. If <exp> raises, then TRY_BEGIN will catch the error and jump to the handler, but the TRY_BEGIN will not stack_save() in that case, so on raise/backtrack the TRY_BEGIN will not execute again (nor will the TRY_END).
50 lines
1.2 KiB
C
50 lines
1.2 KiB
C
OP(LOADK, CONSTANT, 1, 1)
|
|
OP(DUP, NONE, 1, 2)
|
|
OP(DUPN, NONE, 1, 2)
|
|
OP(DUP2, NONE, 2, 3)
|
|
OP(PUSHK_UNDER, CONSTANT, 1, 2)
|
|
OP(POP, NONE, 1, 0)
|
|
OP(LOADV, VARIABLE, 1, 1)
|
|
OP(LOADVN, VARIABLE, 1, 1)
|
|
OP(STOREV, VARIABLE, 1, 0)
|
|
OP(STORE_GLOBAL, GLOBAL, 0, 0)
|
|
OP(INDEX, NONE, 2, 1)
|
|
OP(INDEX_OPT, NONE, 2, 1)
|
|
OP(EACH, NONE, 1, 1)
|
|
OP(EACH_OPT, NONE, 1, 1)
|
|
OP(FORK, BRANCH, 0, 0)
|
|
OP(TRY_BEGIN, BRANCH, 0, 0)
|
|
OP(TRY_END, NONE, 0, 0)
|
|
OP(JUMP, BRANCH, 0, 0)
|
|
OP(JUMP_F,BRANCH, 1, 0)
|
|
OP(BACKTRACK, NONE, 0, 0)
|
|
OP(APPEND, VARIABLE,1, 0)
|
|
OP(INSERT, NONE, 4, 2)
|
|
OP(RANGE, VARIABLE, 1, 1)
|
|
|
|
OP(SUBEXP_BEGIN, NONE, 1, 2)
|
|
OP(SUBEXP_END, NONE, 2, 2)
|
|
|
|
OP(PATH_BEGIN, NONE, 1, 2)
|
|
OP(PATH_END, NONE, 2, 1)
|
|
|
|
OP(CALL_BUILTIN, CFUNC, -1, 1)
|
|
|
|
OP(CALL_JQ, UFUNC, 1, 1)
|
|
OP(RET, NONE, 1, 1)
|
|
OP(TAIL_CALL_JQ, UFUNC, 1, 1)
|
|
|
|
OP(CLOSURE_PARAM, DEFINITION, 0, 0)
|
|
OP(CLOSURE_REF, CLOSURE_REF_IMM, 0, 0)
|
|
OP(CLOSURE_CREATE, DEFINITION, 0, 0)
|
|
OP(CLOSURE_CREATE_C, DEFINITION, 0, 0)
|
|
|
|
OP(TOP, NONE, 0, 0)
|
|
OP(CLOSURE_PARAM_REGULAR, DEFINITION, 0, 0)
|
|
OP(DEPS, CONSTANT, 0, 0)
|
|
OP(MODULEMETA, CONSTANT, 0, 0)
|
|
OP(GENLABEL, NONE, 0, 1)
|
|
|
|
OP(DESTRUCTURE_ALT, BRANCH, 0, 0)
|
|
OP(STOREVN, VARIABLE, 1, 0)
|