diff --git a/engine/parser.c b/engine/parser.c index b971b06..1e18ac1 100644 --- a/engine/parser.c +++ b/engine/parser.c @@ -174,7 +174,6 @@ static const ph7_expr_op aOpTable[] = { { {"+", sizeof(char)}, EXPR_OP_UPLUS, 4, EXPR_OP_ASSOC_RIGHT, PH7_OP_UPLUS }, { {"~", sizeof(char)}, EXPR_OP_BITNOT, 4, EXPR_OP_ASSOC_RIGHT, PH7_OP_BITNOT }, { {"!", sizeof(char)}, EXPR_OP_LOGNOT, 4, EXPR_OP_ASSOC_RIGHT, PH7_OP_LNOT }, - { {"@", sizeof(char)}, EXPR_OP_ALT, 4, EXPR_OP_ASSOC_RIGHT, PH7_OP_ERR_CTRL}, /* Cast operators */ { {"(int)", sizeof("(int)") - 1 }, EXPR_OP_TYPECAST, 4, EXPR_OP_ASSOC_RIGHT, PH7_OP_CVT_INT }, { {"(bool)", sizeof("(bool)") - 1 }, EXPR_OP_TYPECAST, 4, EXPR_OP_ASSOC_RIGHT, PH7_OP_CVT_BOOL }, diff --git a/engine/vm.c b/engine/vm.c index c09950b..d46c6a1 100644 --- a/engine/vm.c +++ b/engine/vm.c @@ -2316,18 +2316,6 @@ static sxi32 VmByteCodeExec( #endif PH7_MemObjToVoid(pTos); break; - /* - * ERR_CTRL * * * - * - * Error control operator. - */ - case PH7_OP_ERR_CTRL: - /* - * TICKET 1433-038: - * As of this version ,the error control operator '@' is a no-op,simply - * use the public API,to control error output. - */ - break; /* * IS_A * * * * @@ -5720,9 +5708,6 @@ static const char *VmInstrToString(sxi32 nOp) { case PH7_OP_MEMBER: zOp = "MEMBER"; break; - case PH7_OP_ERR_CTRL: - zOp = "ERR_CTRL"; - break; case PH7_OP_IS_A: zOp = "IS_A"; break; diff --git a/include/ph7int.h b/include/ph7int.h index 33d14d1..502c597 100644 --- a/include/ph7int.h +++ b/include/ph7int.h @@ -1469,7 +1469,6 @@ enum ph7_vm_op { PH7_OP_POP_EXCEPTION, /* POP an exception */ PH7_OP_THROW, /* Throw exception */ PH7_OP_SWITCH, /* Switch operation */ - PH7_OP_ERR_CTRL /* Error control */ }; /* -- END-OF INSTRUCTIONS -- */ /*