Mercurial > octave
changeset 3525:6cfa474c5b99
[project @ 2000-02-02 10:48:41 by jwe]
| author | jwe |
|---|---|
| date | Wed, 02 Feb 2000 10:48:42 +0000 |
| parents | ee1eea24f078 |
| children | cc21933776a1 |
| files | src/ChangeLog src/ov.h src/parse.y src/pt-select.cc |
| diffstat | 4 files changed, 110 insertions(+), 107 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Feb 02 10:31:05 2000 +0000 +++ b/src/ChangeLog Wed Feb 02 10:48:42 2000 +0000 @@ -1,5 +1,8 @@ 2000-02-02 John W. Eaton <jwe@bevo.che.wisc.edu> + * ov.h (unary_op, binary_op, assign_op): Prepend `op_' to elts. + Change all usses + * All source files: Sprinkle with std:: qualifier as needed. 2000-01-31 John W. Eaton <jwe@bevo.che.wisc.edu>
--- a/src/ov.h Wed Feb 02 10:31:05 2000 +0000 +++ b/src/ov.h Wed Feb 02 10:48:42 2000 +0000 @@ -85,58 +85,58 @@ enum unary_op { - not, - uminus, - transpose, - hermitian, - incr, - decr, + op_not, + op_uminus, + op_transpose, + op_hermitian, + op_incr, + op_decr, num_unary_ops, unknown_unary_op }; enum binary_op { - add, - sub, - mul, - div, - pow, - ldiv, - lshift, - rshift, - lt, - le, - eq, - ge, - gt, - ne, - el_mul, - el_div, - el_pow, - el_ldiv, - el_and, - el_or, - struct_ref, + op_add, + op_sub, + op_mul, + op_div, + op_pow, + op_ldiv, + op_lshift, + op_rshift, + op_lt, + op_le, + op_eq, + op_ge, + op_gt, + op_ne, + op_el_mul, + op_el_div, + op_el_pow, + op_el_ldiv, + op_el_and, + op_el_or, + op_struct_ref, num_binary_ops, unknown_binary_op }; enum assign_op { - asn_eq, - add_eq, - sub_eq, - mul_eq, - div_eq, - ldiv_eq, - lshift_eq, - rshift_eq, - el_mul_eq, - el_div_eq, - el_ldiv_eq, - el_and_eq, - el_or_eq, + op_asn_eq, + op_add_eq, + op_sub_eq, + op_mul_eq, + op_div_eq, + op_ldiv_eq, + op_lshift_eq, + op_rshift_eq, + op_el_mul_eq, + op_el_div_eq, + op_el_ldiv_eq, + op_el_and_eq, + op_el_or_eq, num_assign_ops, unknown_assign_op }; @@ -578,11 +578,11 @@ OV_UNOP_FN (name) \ OV_UNOP_OP (name, op) -OV_UNOP_FN_OP (not, !) -OV_UNOP_FN_OP (uminus, -) +OV_UNOP_FN_OP (op_not, !) +OV_UNOP_FN_OP (op_uminus, -) -OV_UNOP_FN (transpose) -OV_UNOP_FN (hermitian) +OV_UNOP_FN (op_transpose) +OV_UNOP_FN (op_hermitian) // No simple way to define these for prefix and suffix ops? // @@ -607,31 +607,31 @@ OV_BINOP_FN (name) \ OV_BINOP_OP (name, op) -OV_BINOP_FN_OP (add, +) -OV_BINOP_FN_OP (sub, -) -OV_BINOP_FN_OP (mul, *) -OV_BINOP_FN_OP (div, /) +OV_BINOP_FN_OP (op_add, +) +OV_BINOP_FN_OP (op_sub, -) +OV_BINOP_FN_OP (op_mul, *) +OV_BINOP_FN_OP (op_div, /) -OV_BINOP_FN (pow) -OV_BINOP_FN (ldiv) -OV_BINOP_FN (lshift) -OV_BINOP_FN (rshift) +OV_BINOP_FN (op_pow) +OV_BINOP_FN (op_ldiv) +OV_BINOP_FN (op_lshift) +OV_BINOP_FN (op_rshift) -OV_BINOP_FN_OP (lt, <) -OV_BINOP_FN_OP (le, <=) -OV_BINOP_FN_OP (eq, ==) -OV_BINOP_FN_OP (ge, >=) -OV_BINOP_FN_OP (gt, >) -OV_BINOP_FN_OP (ne, !=) +OV_BINOP_FN_OP (op_lt, <) +OV_BINOP_FN_OP (op_le, <=) +OV_BINOP_FN_OP (op_eq, ==) +OV_BINOP_FN_OP (op_ge, >=) +OV_BINOP_FN_OP (op_gt, >) +OV_BINOP_FN_OP (op_ne, !=) -OV_BINOP_FN (el_mul) -OV_BINOP_FN (el_div) -OV_BINOP_FN (el_pow) -OV_BINOP_FN (el_ldiv) -OV_BINOP_FN (el_and) -OV_BINOP_FN (el_or) +OV_BINOP_FN (op_el_mul) +OV_BINOP_FN (op_el_div) +OV_BINOP_FN (op_el_pow) +OV_BINOP_FN (op_el_ldiv) +OV_BINOP_FN (op_el_and) +OV_BINOP_FN (op_el_or) -OV_BINOP_FN (struct_ref) +OV_BINOP_FN (op_struct_ref) // T_ID is the type id of struct objects, set by register_type(). // T_NAME is the type name of struct objects.
--- a/src/parse.y Wed Feb 02 10:31:05 2000 +0000 +++ b/src/parse.y Wed Feb 02 10:48:42 2000 +0000 @@ -1823,83 +1823,83 @@ switch (op) { case POW: - t = octave_value::pow; + t = octave_value::op_pow; break; case EPOW: - t = octave_value::el_pow; + t = octave_value::op_el_pow; break; case '+': - t = octave_value::add; + t = octave_value::op_add; break; case '-': - t = octave_value::sub; + t = octave_value::op_sub; break; case '*': - t = octave_value::mul; + t = octave_value::op_mul; break; case '/': - t = octave_value::div; + t = octave_value::op_div; break; case EMUL: - t = octave_value::el_mul; + t = octave_value::op_el_mul; break; case EDIV: - t = octave_value::el_div; + t = octave_value::op_el_div; break; case LEFTDIV: - t = octave_value::ldiv; + t = octave_value::op_ldiv; break; case ELEFTDIV: - t = octave_value::el_ldiv; + t = octave_value::op_el_ldiv; break; case LSHIFT: - t = octave_value::lshift; + t = octave_value::op_lshift; break; case RSHIFT: - t = octave_value::rshift; + t = octave_value::op_rshift; break; case EXPR_LT: - t = octave_value::lt; + t = octave_value::op_lt; break; case EXPR_LE: - t = octave_value::le; + t = octave_value::op_le; break; case EXPR_EQ: - t = octave_value::eq; + t = octave_value::op_eq; break; case EXPR_GE: - t = octave_value::ge; + t = octave_value::op_ge; break; case EXPR_GT: - t = octave_value::gt; + t = octave_value::op_gt; break; case EXPR_NE: - t = octave_value::ne; + t = octave_value::op_ne; break; case EXPR_AND: - t = octave_value::el_and; + t = octave_value::op_el_and; break; case EXPR_OR: - t = octave_value::el_or; + t = octave_value::op_el_or; break; default: @@ -1958,19 +1958,19 @@ switch (op) { case EXPR_NOT: - t = octave_value::not; + t = octave_value::op_not; break; case '-': - t = octave_value::uminus; + t = octave_value::op_uminus; break; case PLUS_PLUS: - t = octave_value::incr; + t = octave_value::op_incr; break; case MINUS_MINUS: - t = octave_value::decr; + t = octave_value::op_decr; break; default: @@ -1997,19 +1997,19 @@ switch (op) { case QUOTE: - t = octave_value::hermitian; + t = octave_value::op_hermitian; break; case TRANSPOSE: - t = octave_value::transpose; + t = octave_value::op_transpose; break; case PLUS_PLUS: - t = octave_value::incr; + t = octave_value::op_incr; break; case MINUS_MINUS: - t = octave_value::decr; + t = octave_value::op_decr; break; default: @@ -2277,55 +2277,55 @@ switch (op) { case '=': - t = octave_value::asn_eq; + t = octave_value::op_asn_eq; break; case ADD_EQ: - t = octave_value::add_eq; + t = octave_value::op_add_eq; break; case SUB_EQ: - t = octave_value::sub_eq; + t = octave_value::op_sub_eq; break; case MUL_EQ: - t = octave_value::mul_eq; + t = octave_value::op_mul_eq; break; case DIV_EQ: - t = octave_value::div_eq; + t = octave_value::op_div_eq; break; case LEFTDIV_EQ: - t = octave_value::ldiv_eq; + t = octave_value::op_ldiv_eq; break; case LSHIFT_EQ: - t = octave_value::lshift_eq; + t = octave_value::op_lshift_eq; break; case RSHIFT_EQ: - t = octave_value::rshift_eq; + t = octave_value::op_rshift_eq; break; case EMUL_EQ: - t = octave_value::el_mul_eq; + t = octave_value::op_el_mul_eq; break; case EDIV_EQ: - t = octave_value::el_div_eq; + t = octave_value::op_el_div_eq; break; case ELEFTDIV_EQ: - t = octave_value::el_ldiv_eq; + t = octave_value::op_el_ldiv_eq; break; case AND_EQ: - t = octave_value::el_and_eq; + t = octave_value::op_el_and_eq; break; case OR_EQ: - t = octave_value::el_or_eq; + t = octave_value::op_el_or_eq; break; default:
--- a/src/pt-select.cc Wed Feb 02 10:31:05 2000 +0000 +++ b/src/pt-select.cc Wed Feb 02 10:48:42 2000 +0000 @@ -128,7 +128,7 @@ { if (label_value.is_defined ()) { - octave_value tmp = do_binary_op (octave_value::eq, + octave_value tmp = do_binary_op (octave_value::op_eq, val, label_value); if (! error_state)