--- parser3/src/include/Attic/code.h 2001/03/06 12:00:43 1.10 +++ parser3/src/include/Attic/code.h 2001/03/10 15:17:44 1.18 @@ -1,5 +1,5 @@ /* - $Id: code.h,v 1.10 2001/03/06 12:00:43 paf Exp $ + $Id: code.h,v 1.18 2001/03/10 15:17:44 paf Exp $ */ #ifndef CODE_H @@ -10,12 +10,13 @@ enum OPCODE { // literals - OP_STRING, OP_CODE, OP_CLASS, + OP_VALUE, OP_CODE__STORE_PARAM, // actions OP_WITH_SELF, OP_WITH_ROOT, OP_WITH_READ, OP_WITH_WRITE, - OP_CONSTRUCT, - OP_WRITE, + OP_GET_CLASS, + OP_CONSTRUCT_VALUE, OP_CONSTRUCT_EXPR, + OP_WRITE, OP_STRING__WRITE, OP_GET_ELEMENT, OP_GET_ELEMENT__WRITE, OP_CREATE_EWPOOL, OP_REDUCE_EWPOOL, OP_CREATE_RWPOOL, OP_REDUCE_RWPOOL, @@ -27,13 +28,12 @@ enum OPCODE { // expression ops: unary OP_NEG, OP_INV, OP_NOT, OP_DEF, OP_IN, OP_FEXISTS, // expression ops: binary - OP_SUB OP_ADD OP_MUL OP_DIV OP_MOD, - OP_BIN_AND, OP_BIN_OR, - OP_LOG_AND, OP_LOG_OR, + OP_SUB, OP_ADD, OP_MUL, OP_DIV, OP_MOD, + OP_BIN_AND, OP_BIN_OR, OP_BIN_XOR, + OP_LOG_AND, OP_LOG_OR, OP_LOG_XOR, OP_NUM_LT, OP_NUM_GT, OP_NUM_LE, OP_NUM_GE, OP_NUM_EQ, OP_NUM_NE, - OP_STR_LT, OP_STR_GT, OP_STR_LE, OP_STR_GE, OP_STR_EQ, OP_STR_NE, - OP_XOR -; + OP_STR_LT, OP_STR_GT, OP_STR_LE, OP_STR_GE, OP_STR_EQ, OP_STR_NE +}; union Operation { void *cast; // casting helper