--- a/src/OPERATORS/op-i16-i16.cc	Mon Jun 14 19:33:53 2004 +0000
+++ b/src/OPERATORS/op-i16-i16.cc	Thu Jun 17 04:14:36 2004 +0000
@@ -37,99 +37,14 @@
 #include "xdiv.h"
 #include "xpow.h"
 
-// matrix unary ops.
-
-DEFNDUNOP_OP (not, int16_matrix, int16_array, !)
-DEFNDUNOP_OP (uminus, int16_matrix, int16_array, -)
-
-DEFUNOP (transpose, int16_matrix)
-{
-  CAST_UNOP_ARG (const octave_int16_matrix&);
-
-  if (v.ndims () > 2)
-    {
-      error ("transpose not defined for N-d objects");
-      return octave_value ();
-    }
-  else
-    return octave_value (v.int16_array_value().transpose ());
-}
-
-//DEFNCUNOP_METHOD (incr, int16_matrix, increment)
-//DEFNCUNOP_METHOD (decr, int16_matrix, decrement)
-
-// matrix by matrix ops.
-
-DEFNDBINOP_OP (add, int16_matrix, int16_matrix, int16_array, int16_array, +)
-DEFNDBINOP_OP (sub, int16_matrix, int16_matrix, int16_array, int16_array, -)
-
-// DEFBINOP_OP (mul, int16_matrix, int16_matrix, *)
-// DEFBINOP_FN (div, int16_matrix, int16_matrix, xdiv)
+#include "op-int.h"
 
-DEFBINOPX (pow, int16_matrix, int16_matrix)
-{
-  error ("can't do A ^ B for A and B both matrices");
-  return octave_value ();
-}
-
-//DEFBINOP_FN (ldiv, int16_matrix, int16_matrix, xleftdiv)
-
-DEFNDBINOP_FN (lt, int16_matrix, int16_matrix, int16_array, int16_array, mx_el_lt)
-DEFNDBINOP_FN (le, int16_matrix, int16_matrix, int16_array, int16_array, mx_el_le)
-DEFNDBINOP_FN (eq, int16_matrix, int16_matrix, int16_array, int16_array, mx_el_eq)
-DEFNDBINOP_FN (ge, int16_matrix, int16_matrix, int16_array, int16_array, mx_el_ge)
-DEFNDBINOP_FN (gt, int16_matrix, int16_matrix, int16_array, int16_array, mx_el_gt)
-DEFNDBINOP_FN (ne, int16_matrix, int16_matrix, int16_array, int16_array, mx_el_ne)
-
-DEFNDBINOP_FN (el_mul, int16_matrix, int16_matrix, int16_array, int16_array, product)
-
-DEFNDBINOP_FN (el_div, int16_matrix, int16_matrix, int16_array, int16_array, quotient)
-
-//DEFNDBINOP_FN (el_pow, int16_matrix, int16_matrix, int16_array, int16_array, elem_xpow)
-
-//DEFBINOP (el_ldiv, int16_matrix, int16_matrix)
-//{
-//  CAST_BINOP_ARGS (const octave_matrix&, const octave_matrix&);
-//
-//  return octave_value (quotient (v2.array_value (), v1.array_value ()));
-//}
-
-DEFNDBINOP_FN (el_and, int16_matrix, int16_matrix, int16_array, int16_array, mx_el_and)
-DEFNDBINOP_FN (el_or,  int16_matrix, int16_matrix, int16_array, int16_array, mx_el_or)
-
-DEFNDASSIGNOP_FN (assign, int16_matrix, int16_matrix, int16_array, assign)
+OCTAVE_INT_OPS (int16)
 
 void
 install_i16_i16_ops (void)
 {
-  INSTALL_UNOP (op_not, octave_int16_matrix, not);
-  INSTALL_UNOP (op_uminus, octave_int16_matrix, uminus);
-  INSTALL_UNOP (op_transpose, octave_int16_matrix, transpose);
-  INSTALL_UNOP (op_hermitian, octave_int16_matrix, transpose);
-
-  //  INSTALL_NCUNOP (op_incr, octave_int16_matrix, incr);
-  //  INSTALL_NCUNOP (op_decr, octave_int16_matrix, decr);
-
-  INSTALL_BINOP (op_add, octave_int16_matrix, octave_int16_matrix, add);
-  INSTALL_BINOP (op_sub, octave_int16_matrix, octave_int16_matrix, sub);
-  //  INSTALL_BINOP (op_mul, octave_int16_matrix, octave_int16_matrix, mul);
-  //  INSTALL_BINOP (op_div, octave_int16_matrix, octave_int16_matrix, div);
-  INSTALL_BINOP (op_pow, octave_int16_matrix, octave_int16_matrix, pow);
-  //  INSTALL_BINOP (op_ldiv, octave_int16_matrix, octave_int16_matrix, ldiv);
-  INSTALL_BINOP (op_lt, octave_int16_matrix, octave_int16_matrix, lt);
-  INSTALL_BINOP (op_le, octave_int16_matrix, octave_int16_matrix, le);
-  INSTALL_BINOP (op_eq, octave_int16_matrix, octave_int16_matrix, eq);
-  INSTALL_BINOP (op_ge, octave_int16_matrix, octave_int16_matrix, ge);
-  INSTALL_BINOP (op_gt, octave_int16_matrix, octave_int16_matrix, gt);
-  INSTALL_BINOP (op_ne, octave_int16_matrix, octave_int16_matrix, ne);
-  INSTALL_BINOP (op_el_mul, octave_int16_matrix, octave_int16_matrix, el_mul);
-  INSTALL_BINOP (op_el_div, octave_int16_matrix, octave_int16_matrix, el_div);
-  //  INSTALL_BINOP (op_el_pow, octave_int16_matrix, octave_int16_matrix, el_pow);
-  //  INSTALL_BINOP (op_el_ldiv, octave_int16_matrix, octave_int16_matrix, el_ldiv);
-  INSTALL_BINOP (op_el_and, octave_int16_matrix, octave_int16_matrix, el_and);
-  INSTALL_BINOP (op_el_or, octave_int16_matrix, octave_int16_matrix, el_or);
-
-  INSTALL_ASSIGNOP (op_asn_eq, octave_int16_matrix, octave_int16_matrix, assign);
+  OCTAVE_INSTALL_INT_OPS (int16);
 }
 
 /*