Mercurial > octave
changeset 3538:0ff7323dab8b
[project @ 2000-02-02 12:36:25 by jwe]
line wrap: on
line diff
--- a/src/DLD-FUNCTIONS/qz.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/DLD-FUNCTIONS/qz.cc Wed Feb 02 12:36:37 2000 +0000 @@ -151,7 +151,7 @@ retval = (fabs (p) < 1 ? 1 : -1); #ifdef DEBUG - std::cout << "qz: fin: retval=" << retval << endl; + std::cout << "qz: fin: retval=" << retval << std::endl; #endif return retval; @@ -240,7 +240,7 @@ int nargin = args.length (); #ifdef DEBUG - std::cout << "qz: nargin = " << nargin << ", nargout = " << nargout << endl; + std::cout << "qz: nargin = " << nargin << ", nargout = " << nargout << std::endl; #endif if (nargin < 2 || nargin > 3 || nargout > 7) @@ -255,7 +255,7 @@ } #ifdef DEBUG - std::cout << "qz: determine ordering option" << endl; + std::cout << "qz: determine ordering option" << std::endl; #endif // Determine ordering option @@ -287,8 +287,8 @@ F77_FCN (xdlamch, XDLAMCH) ("S", safmin, 1L); #ifdef DEBUG_EIG - std::cout << "qz: initial value of safmin=" << setiosflags (ios::scientific) - << safmin << endl; + std::cout << "qz: initial value of safmin=" << setiosflags (std::ios::scientific) + << safmin << std::endl; #endif // some machines (e.g., DEC alpha) get safmin = 0; @@ -296,20 +296,20 @@ if (safmin == 0) { #ifdef DEBUG_EIG - std::cout << "qz: DANGER WILL ROBINSON: safmin is 0!" << endl; + std::cout << "qz: DANGER WILL ROBINSON: safmin is 0!" << std::endl; #endif F77_FCN (xdlamch, XDLAMCH) ("E", safmin, 1L); #ifdef DEBUG_EIG - std::cout << "qz: safmin set to " << setiosflags (ios::scientific) - << safmin << endl; + std::cout << "qz: safmin set to " << setiosflags (std::ios::scientific) + << safmin << std::endl; #endif } } #ifdef DEBUG - std::cout << "qz: check argument 1" << endl; + std::cout << "qz: check argument 1" << std::endl; #endif // Argument 1: check if it's o.k. dimensioned @@ -317,7 +317,7 @@ #ifdef DEBUG std::cout << "argument 1 dimensions: (" << nn << "," << args(0).columns () << ")" - << endl; + << std::endl; #endif int arg_is_empty = empty_arg ("qz", nn, args(0).columns ()); @@ -351,7 +351,7 @@ return retval; #ifdef DEBUG - std::cout << "qz: check argument 2" << endl; + std::cout << "qz: check argument 2" << std::endl; #endif // Extract argument 2 (bb, or cbb if complex) @@ -412,7 +412,7 @@ { #ifdef DEBUG if (compq == 'V') - std::cout << "qz: performing balancing; QQ=" << endl << QQ << endl; + std::cout << "qz: performing balancing; QQ=" << std::endl << QQ << std::endl; #endif F77_XFCN (dggbal, DGGBAL, @@ -440,7 +440,7 @@ #ifdef DEBUG if (compq == 'V') - std::cout << "qz: balancing done; QQ=" << endl << QQ << endl; + std::cout << "qz: balancing done; QQ=" << std::endl << QQ << std::endl; #endif if (f77_exception_encountered) @@ -460,7 +460,7 @@ #ifdef DEBUG if (compz == 'V') - std::cout << "qz: balancing done; ZZ=" << endl << ZZ << endl; + std::cout << "qz: balancing done; ZZ=" << std::endl << ZZ << std::endl; #endif if (f77_exception_encountered) @@ -494,41 +494,41 @@ else // real matrices case { #ifdef DEBUG - std::cout << "qz: peforming qr decomposition of bb" << endl; + std::cout << "qz: peforming qr decomposition of bb" << std::endl; #endif // compute the QR factorization of bb QR bqr (bb); #ifdef DEBUG - std::cout << "qz: qr (bb) done; now peforming qz decomposition" << endl; + std::cout << "qz: qr (bb) done; now peforming qz decomposition" << std::endl; #endif bb = bqr.R (); #ifdef DEBUG - std::cout << "qz: extracted bb" << endl; + std::cout << "qz: extracted bb" << std::endl; #endif aa = (bqr.Q ()).transpose ()*aa; #ifdef DEBUG - std::cout << "qz: updated aa " << endl; - std::cout << "bqr.Q () = " << endl << bqr.Q () << endl; + std::cout << "qz: updated aa " << std::endl; + std::cout << "bqr.Q () = " << std::endl << bqr.Q () << std::endl; if (compq == 'V') - std::cout << "QQ =" << QQ << endl; + std::cout << "QQ =" << QQ << std::endl; #endif if (compq == 'V') QQ = QQ*bqr.Q (); #ifdef DEBUG - std::cout << "qz: precursors done..." << endl; + std::cout << "qz: precursors done..." << std::endl; #endif #ifdef DEBUG - std::cout << "qz: compq = " << compq << ", compz = " << compz << endl; + std::cout << "qz: compq = " << compq << ", compz = " << compz << std::endl; #endif // reduce to generalized hessenberg form @@ -574,7 +574,7 @@ else { #ifdef DEBUG_SORT - std::cout << "qz: ordering eigenvalues: ord_job = " << ord_job[0] << endl; + std::cout << "qz: ordering eigenvalues: ord_job = " << ord_job[0] << std::endl; #endif // declared static to avoid vfork/long jump compiler complaints @@ -616,23 +616,23 @@ double eps = DBL_EPSILON*inf_norm*nn; #ifdef DEBUG_SORT - std::cout << "qz: calling dsubsp: aa=" << endl; + std::cout << "qz: calling dsubsp: aa=" << std::endl; octave_print_internal (std::cout, aa, 0); - std::cout << endl << "bb=" << endl; + std::cout << std::endl << "bb=" << std::endl; octave_print_internal (std::cout, bb, 0); if (compz == 'V') { - std::cout << endl << "ZZ=" << endl; + std::cout << std::endl << "ZZ=" << std::endl; octave_print_internal (std::cout, ZZ, 0); } - std::cout << endl; - std::cout << "alphar = " << endl; + std::cout << std::endl; + std::cout << "alphar = " << std::endl; octave_print_internal (std::cout, (Matrix) alphar, 0); - std::cout << endl << "alphai = " << endl; + std::cout << std::endl << "alphai = " << std::endl; octave_print_internal (std::cout, (Matrix) alphai, 0); - std::cout << endl << "beta = " << endl; + std::cout << std::endl << "beta = " << std::endl; octave_print_internal (std::cout, (Matrix) betar, 0); - std::cout << endl; + std::cout << std::endl; #endif F77_XFCN (dsubsp, DSUBSP, @@ -640,16 +640,16 @@ ZZ.fortran_vec(), sort_test, eps, ndim, fail, ind)); #ifdef DEBUG - std::cout << "qz: back from dsubsp: aa=" << endl; + std::cout << "qz: back from dsubsp: aa=" << std::endl; octave_print_internal (std::cout, aa, 0); - std::cout << endl << "bb=" << endl; + std::cout << std::endl << "bb=" << std::endl; octave_print_internal (std::cout, bb, 0); if (compz == 'V') { - std::cout << endl << "ZZ=" << endl; + std::cout << std::endl << "ZZ=" << std::endl; octave_print_internal (std::cout, ZZ, 0); } - std::cout << endl; + std::cout << std::endl; #endif // manually update alphar, alphai, betar @@ -659,7 +659,7 @@ while (jj < nn) { #ifdef DEBUG_EIG - std::cout << "computing gen eig #" << jj << endl; + std::cout << "computing gen eig #" << jj << std::endl; #endif static int zcnt; // number of zeros in this block @@ -673,10 +673,10 @@ if (zcnt == 1) // real zero { #ifdef DEBUG_EIG - std::cout << " single gen eig:" << endl; - std::cout << " alphar(" << jj << ") = " << aa(jj,jj) << endl; - std::cout << " betar( " << jj << ") = " << bb(jj,jj) << endl; - std::cout << " alphai(" << jj << ") = 0" << endl; + std::cout << " single gen eig:" << std::endl; + std::cout << " alphar(" << jj << ") = " << aa(jj,jj) << std::endl; + std::cout << " betar( " << jj << ") = " << bb(jj,jj) << std::endl; + std::cout << " alphai(" << jj << ") = 0" << std::endl; #endif alphar(jj) = aa(jj,jj); @@ -687,18 +687,18 @@ { // complex conjugate pair #ifdef DEBUG_EIG - std::cout << "qz: calling dlag2:" << endl; + std::cout << "qz: calling dlag2:" << std::endl; std::cout << "safmin=" - << setiosflags (ios::scientific) << safmin << endl; + << setiosflags (std::ios::scientific) << safmin << std::endl; for (int idr = jj; idr <= jj+1; idr++) { for (int idc = jj; idc <= jj+1; idc++) { std::cout << "aa(" << idr << "," << idc << ")=" - << aa(idr,idc) << endl; + << aa(idr,idc) << std::endl; std::cout << "bb(" << idr << "," << idc << ")=" - << bb(idr,idc) << endl; + << bb(idr,idc) << std::endl; } } #endif @@ -710,9 +710,9 @@ #ifdef DEBUG_EIG std::cout << "dlag2 returns: scale1=" << scale1 - << "\tscale2=" << scale2 << endl + << "\tscale2=" << scale2 << std::endl << "\twr1=" << wr1 << "\twr2=" << wr2 - << "\twi=" << wi << endl; + << "\twi=" << wi << std::endl; #endif // just to be safe, check if it's a real pair @@ -738,25 +738,25 @@ } #ifdef DEBUG_SORT - std::cout << "qz: back from dsubsp: aa=" << endl; + std::cout << "qz: back from dsubsp: aa=" << std::endl; octave_print_internal (std::cout, aa, 0); - std::cout << endl << "bb=" << endl; + std::cout << std::endl << "bb=" << std::endl; octave_print_internal (std::cout, bb, 0); if (compz == 'V') { - std::cout << endl << "ZZ=" << endl; + std::cout << std::endl << "ZZ=" << std::endl; octave_print_internal (std::cout, ZZ, 0); } - std::cout << endl << "qz: ndim=" << ndim << endl - << "fail=" << fail << endl; - std::cout << "alphar = " << endl; + std::cout << std::endl << "qz: ndim=" << ndim << std::endl + << "fail=" << fail << std::endl; + std::cout << "alphar = " << std::endl; octave_print_internal (std::cout, (Matrix) alphar, 0); - std::cout << endl << "alphai = " << endl; + std::cout << std::endl << "alphai = " << std::endl; octave_print_internal (std::cout, (Matrix) alphai, 0); - std::cout << endl << "beta = " << endl; + std::cout << std::endl << "beta = " << std::endl; octave_print_internal (std::cout, (Matrix) betar, 0); - std::cout << endl; + std::cout << std::endl; #endif } } @@ -774,7 +774,7 @@ else { #ifdef DEBUG - std::cout << "qz: computing generalized eigenvalues" << endl; + std::cout << "qz: computing generalized eigenvalues" << std::endl; #endif // return finite generalized eigenvalues @@ -809,7 +809,7 @@ else { #ifdef DEBUG - std::cout << "qz: computing generalized eigenvectors" << endl; + std::cout << "qz: computing generalized eigenvectors" << std::endl; #endif VL = QQ; @@ -889,9 +889,9 @@ if (nargin == 3) { #ifdef DEBUG - std::cout << "qz: sort: retval(3) = gev = " << endl; + std::cout << "qz: sort: retval(3) = gev = " << std::endl; octave_print_internal (std::cout, gev); - std::cout << endl; + std::cout << std::endl; #endif retval(3) = gev; } @@ -906,11 +906,11 @@ case 2: #ifdef DEBUG - std::cout << "qz: retval (1) = bb = " << endl; + std::cout << "qz: retval (1) = bb = " << std::endl; octave_print_internal (std::cout, bb, 0); - std::cout << endl << "qz: retval(0) = aa = " <<endl; + std::cout << std::endl << "qz: retval(0) = aa = " <<std::endl; octave_print_internal (std::cout, aa, 0); - std::cout << endl; + std::cout << std::endl; #endif retval(1) = bb; retval(0) = aa; @@ -919,7 +919,7 @@ case 1: case 0: #ifdef DEBUG - std::cout << "qz: retval(0) = gev = " << gev << endl; + std::cout << "qz: retval(0) = gev = " << gev << std::endl; #endif retval(0) = gev; break; @@ -930,7 +930,7 @@ } #ifdef DEBUG - std::cout << "qz: exiting (at long last)" << endl; + std::cout << "qz: exiting (at long last)" << std::endl; #endif return retval;
--- a/src/OPERATORS/op-b-b.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-b-b.cc Wed Feb 02 12:36:37 2000 +0000 @@ -52,12 +52,12 @@ void install_b_b_ops (void) { - INSTALL_UNOP (not, octave_bool, not); - INSTALL_UNOP (transpose, octave_bool, transpose); - INSTALL_UNOP (hermitian, octave_bool, hermitian); + INSTALL_UNOP (op_not, octave_bool, not); + INSTALL_UNOP (op_transpose, octave_bool, transpose); + INSTALL_UNOP (op_hermitian, octave_bool, hermitian); - INSTALL_BINOP (eq, octave_bool, octave_bool, eq); - INSTALL_BINOP (ne, octave_bool, octave_bool, ne); + INSTALL_BINOP (op_eq, octave_bool, octave_bool, eq); + INSTALL_BINOP (op_ne, octave_bool, octave_bool, ne); } /*
--- a/src/OPERATORS/op-bm-bm.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-bm-bm.cc Wed Feb 02 12:36:37 2000 +0000 @@ -55,12 +55,12 @@ void install_bm_bm_ops (void) { - INSTALL_UNOP (not, octave_bool_matrix, not); - INSTALL_UNOP (transpose, octave_bool_matrix, transpose); - INSTALL_UNOP (hermitian, octave_bool_matrix, transpose); + INSTALL_UNOP (op_not, octave_bool_matrix, not); + INSTALL_UNOP (op_transpose, octave_bool_matrix, transpose); + INSTALL_UNOP (op_hermitian, octave_bool_matrix, transpose); - INSTALL_BINOP (eq, octave_bool_matrix, octave_bool_matrix, eq); - INSTALL_BINOP (ne, octave_bool_matrix, octave_bool_matrix, ne); + INSTALL_BINOP (op_eq, octave_bool_matrix, octave_bool_matrix, eq); + INSTALL_BINOP (op_ne, octave_bool_matrix, octave_bool_matrix, ne); } /*
--- a/src/OPERATORS/op-chm.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-chm.cc Wed Feb 02 12:36:37 2000 +0000 @@ -46,8 +46,8 @@ void install_chm_ops (void) { - INSTALL_UNOP (transpose, octave_char_matrix, transpose); - INSTALL_UNOP (hermitian, octave_char_matrix, transpose); + INSTALL_UNOP (op_transpose, octave_char_matrix, transpose); + INSTALL_UNOP (op_hermitian, octave_char_matrix, transpose); } /*
--- a/src/OPERATORS/op-cm-cm.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-cm-cm.cc Wed Feb 02 12:36:37 2000 +0000 @@ -100,34 +100,34 @@ void install_cm_cm_ops (void) { - INSTALL_UNOP (not, octave_complex_matrix, not); - INSTALL_UNOP (uminus, octave_complex_matrix, uminus); - INSTALL_UNOP (transpose, octave_complex_matrix, transpose); - INSTALL_UNOP (hermitian, octave_complex_matrix, hermitian); + INSTALL_UNOP (op_not, octave_complex_matrix, not); + INSTALL_UNOP (op_uminus, octave_complex_matrix, uminus); + INSTALL_UNOP (op_transpose, octave_complex_matrix, transpose); + INSTALL_UNOP (op_hermitian, octave_complex_matrix, hermitian); - INSTALL_NCUNOP (incr, octave_complex_matrix, incr); - INSTALL_NCUNOP (decr, octave_complex_matrix, decr); + INSTALL_NCUNOP (op_incr, octave_complex_matrix, incr); + INSTALL_NCUNOP (op_decr, octave_complex_matrix, decr); - INSTALL_BINOP (add, octave_complex_matrix, octave_complex_matrix, add); - INSTALL_BINOP (sub, octave_complex_matrix, octave_complex_matrix, sub); - INSTALL_BINOP (mul, octave_complex_matrix, octave_complex_matrix, mul); - INSTALL_BINOP (div, octave_complex_matrix, octave_complex_matrix, div); - INSTALL_BINOP (pow, octave_complex_matrix, octave_complex_matrix, pow); - INSTALL_BINOP (ldiv, octave_complex_matrix, octave_complex_matrix, ldiv); - INSTALL_BINOP (lt, octave_complex_matrix, octave_complex_matrix, lt); - INSTALL_BINOP (le, octave_complex_matrix, octave_complex_matrix, le); - INSTALL_BINOP (eq, octave_complex_matrix, octave_complex_matrix, eq); - INSTALL_BINOP (ge, octave_complex_matrix, octave_complex_matrix, ge); - INSTALL_BINOP (gt, octave_complex_matrix, octave_complex_matrix, gt); - INSTALL_BINOP (ne, octave_complex_matrix, octave_complex_matrix, ne); - INSTALL_BINOP (el_mul, octave_complex_matrix, octave_complex_matrix, el_mul); - INSTALL_BINOP (el_div, octave_complex_matrix, octave_complex_matrix, el_div); - INSTALL_BINOP (el_pow, octave_complex_matrix, octave_complex_matrix, el_pow); - INSTALL_BINOP (el_ldiv, octave_complex_matrix, octave_complex_matrix, el_ldiv); - INSTALL_BINOP (el_and, octave_complex_matrix, octave_complex_matrix, el_and); - INSTALL_BINOP (el_or, octave_complex_matrix, octave_complex_matrix, el_or); + INSTALL_BINOP (op_add, octave_complex_matrix, octave_complex_matrix, add); + INSTALL_BINOP (op_sub, octave_complex_matrix, octave_complex_matrix, sub); + INSTALL_BINOP (op_mul, octave_complex_matrix, octave_complex_matrix, mul); + INSTALL_BINOP (op_div, octave_complex_matrix, octave_complex_matrix, div); + INSTALL_BINOP (op_pow, octave_complex_matrix, octave_complex_matrix, pow); + INSTALL_BINOP (op_ldiv, octave_complex_matrix, octave_complex_matrix, ldiv); + INSTALL_BINOP (op_lt, octave_complex_matrix, octave_complex_matrix, lt); + INSTALL_BINOP (op_le, octave_complex_matrix, octave_complex_matrix, le); + INSTALL_BINOP (op_eq, octave_complex_matrix, octave_complex_matrix, eq); + INSTALL_BINOP (op_ge, octave_complex_matrix, octave_complex_matrix, ge); + INSTALL_BINOP (op_gt, octave_complex_matrix, octave_complex_matrix, gt); + INSTALL_BINOP (op_ne, octave_complex_matrix, octave_complex_matrix, ne); + INSTALL_BINOP (op_el_mul, octave_complex_matrix, octave_complex_matrix, el_mul); + INSTALL_BINOP (op_el_div, octave_complex_matrix, octave_complex_matrix, el_div); + INSTALL_BINOP (op_el_pow, octave_complex_matrix, octave_complex_matrix, el_pow); + INSTALL_BINOP (op_el_ldiv, octave_complex_matrix, octave_complex_matrix, el_ldiv); + INSTALL_BINOP (op_el_and, octave_complex_matrix, octave_complex_matrix, el_and); + INSTALL_BINOP (op_el_or, octave_complex_matrix, octave_complex_matrix, el_or); - INSTALL_ASSIGNOP (asn_eq, octave_complex_matrix, octave_complex_matrix, assign); + INSTALL_ASSIGNOP (op_asn_eq, octave_complex_matrix, octave_complex_matrix, assign); } /*
--- a/src/OPERATORS/op-cm-cs.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-cm-cs.cc Wed Feb 02 12:36:37 2000 +0000 @@ -100,26 +100,26 @@ void install_cm_cs_ops (void) { - INSTALL_BINOP (add, octave_complex_matrix, octave_complex, add); - INSTALL_BINOP (sub, octave_complex_matrix, octave_complex, sub); - INSTALL_BINOP (mul, octave_complex_matrix, octave_complex, mul); - INSTALL_BINOP (div, octave_complex_matrix, octave_complex, div); - INSTALL_BINOP (pow, octave_complex_matrix, octave_complex, pow); - INSTALL_BINOP (ldiv, octave_complex_matrix, octave_complex, ldiv); - INSTALL_BINOP (lt, octave_complex_matrix, octave_complex, lt); - INSTALL_BINOP (le, octave_complex_matrix, octave_complex, le); - INSTALL_BINOP (eq, octave_complex_matrix, octave_complex, eq); - INSTALL_BINOP (ge, octave_complex_matrix, octave_complex, ge); - INSTALL_BINOP (gt, octave_complex_matrix, octave_complex, gt); - INSTALL_BINOP (ne, octave_complex_matrix, octave_complex, ne); - INSTALL_BINOP (el_mul, octave_complex_matrix, octave_complex, el_mul); - INSTALL_BINOP (el_div, octave_complex_matrix, octave_complex, el_div); - INSTALL_BINOP (el_pow, octave_complex_matrix, octave_complex, el_pow); - INSTALL_BINOP (el_ldiv, octave_complex_matrix, octave_complex, el_ldiv); - INSTALL_BINOP (el_and, octave_complex_matrix, octave_complex, el_and); - INSTALL_BINOP (el_or, octave_complex_matrix, octave_complex, el_or); + INSTALL_BINOP (op_add, octave_complex_matrix, octave_complex, add); + INSTALL_BINOP (op_sub, octave_complex_matrix, octave_complex, sub); + INSTALL_BINOP (op_mul, octave_complex_matrix, octave_complex, mul); + INSTALL_BINOP (op_div, octave_complex_matrix, octave_complex, div); + INSTALL_BINOP (op_pow, octave_complex_matrix, octave_complex, pow); + INSTALL_BINOP (op_ldiv, octave_complex_matrix, octave_complex, ldiv); + INSTALL_BINOP (op_lt, octave_complex_matrix, octave_complex, lt); + INSTALL_BINOP (op_le, octave_complex_matrix, octave_complex, le); + INSTALL_BINOP (op_eq, octave_complex_matrix, octave_complex, eq); + INSTALL_BINOP (op_ge, octave_complex_matrix, octave_complex, ge); + INSTALL_BINOP (op_gt, octave_complex_matrix, octave_complex, gt); + INSTALL_BINOP (op_ne, octave_complex_matrix, octave_complex, ne); + INSTALL_BINOP (op_el_mul, octave_complex_matrix, octave_complex, el_mul); + INSTALL_BINOP (op_el_div, octave_complex_matrix, octave_complex, el_div); + INSTALL_BINOP (op_el_pow, octave_complex_matrix, octave_complex, el_pow); + INSTALL_BINOP (op_el_ldiv, octave_complex_matrix, octave_complex, el_ldiv); + INSTALL_BINOP (op_el_and, octave_complex_matrix, octave_complex, el_and); + INSTALL_BINOP (op_el_or, octave_complex_matrix, octave_complex, el_or); - INSTALL_ASSIGNOP (asn_eq, octave_complex_matrix, octave_complex, assign); + INSTALL_ASSIGNOP (op_asn_eq, octave_complex_matrix, octave_complex, assign); } /*
--- a/src/OPERATORS/op-cm-m.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-cm-m.cc Wed Feb 02 12:36:37 2000 +0000 @@ -87,26 +87,26 @@ void install_cm_m_ops (void) { - INSTALL_BINOP (add, octave_complex_matrix, octave_matrix, add); - INSTALL_BINOP (sub, octave_complex_matrix, octave_matrix, sub); - INSTALL_BINOP (mul, octave_complex_matrix, octave_matrix, mul); - INSTALL_BINOP (div, octave_complex_matrix, octave_matrix, div); - INSTALL_BINOP (pow, octave_complex_matrix, octave_matrix, pow); - INSTALL_BINOP (ldiv, octave_complex_matrix, octave_matrix, ldiv); - INSTALL_BINOP (lt, octave_complex_matrix, octave_matrix, lt); - INSTALL_BINOP (le, octave_complex_matrix, octave_matrix, le); - INSTALL_BINOP (eq, octave_complex_matrix, octave_matrix, eq); - INSTALL_BINOP (ge, octave_complex_matrix, octave_matrix, ge); - INSTALL_BINOP (gt, octave_complex_matrix, octave_matrix, gt); - INSTALL_BINOP (ne, octave_complex_matrix, octave_matrix, ne); - INSTALL_BINOP (el_mul, octave_complex_matrix, octave_matrix, el_mul); - INSTALL_BINOP (el_div, octave_complex_matrix, octave_matrix, el_div); - INSTALL_BINOP (el_pow, octave_complex_matrix, octave_matrix, el_pow); - INSTALL_BINOP (el_ldiv, octave_complex_matrix, octave_matrix, el_ldiv); - INSTALL_BINOP (el_and, octave_complex_matrix, octave_matrix, el_and); - INSTALL_BINOP (el_or, octave_complex_matrix, octave_matrix, el_or); + INSTALL_BINOP (op_add, octave_complex_matrix, octave_matrix, add); + INSTALL_BINOP (op_sub, octave_complex_matrix, octave_matrix, sub); + INSTALL_BINOP (op_mul, octave_complex_matrix, octave_matrix, mul); + INSTALL_BINOP (op_div, octave_complex_matrix, octave_matrix, div); + INSTALL_BINOP (op_pow, octave_complex_matrix, octave_matrix, pow); + INSTALL_BINOP (op_ldiv, octave_complex_matrix, octave_matrix, ldiv); + INSTALL_BINOP (op_lt, octave_complex_matrix, octave_matrix, lt); + INSTALL_BINOP (op_le, octave_complex_matrix, octave_matrix, le); + INSTALL_BINOP (op_eq, octave_complex_matrix, octave_matrix, eq); + INSTALL_BINOP (op_ge, octave_complex_matrix, octave_matrix, ge); + INSTALL_BINOP (op_gt, octave_complex_matrix, octave_matrix, gt); + INSTALL_BINOP (op_ne, octave_complex_matrix, octave_matrix, ne); + INSTALL_BINOP (op_el_mul, octave_complex_matrix, octave_matrix, el_mul); + INSTALL_BINOP (op_el_div, octave_complex_matrix, octave_matrix, el_div); + INSTALL_BINOP (op_el_pow, octave_complex_matrix, octave_matrix, el_pow); + INSTALL_BINOP (op_el_ldiv, octave_complex_matrix, octave_matrix, el_ldiv); + INSTALL_BINOP (op_el_and, octave_complex_matrix, octave_matrix, el_and); + INSTALL_BINOP (op_el_or, octave_complex_matrix, octave_matrix, el_or); - INSTALL_ASSIGNOP (asn_eq, octave_complex_matrix, octave_matrix, assign); + INSTALL_ASSIGNOP (op_asn_eq, octave_complex_matrix, octave_matrix, assign); } /*
--- a/src/OPERATORS/op-cm-s.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-cm-s.cc Wed Feb 02 12:36:37 2000 +0000 @@ -102,26 +102,26 @@ void install_cm_s_ops (void) { - INSTALL_BINOP (add, octave_complex_matrix, octave_scalar, add); - INSTALL_BINOP (sub, octave_complex_matrix, octave_scalar, sub); - INSTALL_BINOP (mul, octave_complex_matrix, octave_scalar, mul); - INSTALL_BINOP (div, octave_complex_matrix, octave_scalar, div); - INSTALL_BINOP (pow, octave_complex_matrix, octave_scalar, pow); - INSTALL_BINOP (ldiv, octave_complex_matrix, octave_scalar, ldiv); - INSTALL_BINOP (lt, octave_complex_matrix, octave_scalar, lt); - INSTALL_BINOP (le, octave_complex_matrix, octave_scalar, le); - INSTALL_BINOP (eq, octave_complex_matrix, octave_scalar, eq); - INSTALL_BINOP (ge, octave_complex_matrix, octave_scalar, ge); - INSTALL_BINOP (gt, octave_complex_matrix, octave_scalar, gt); - INSTALL_BINOP (ne, octave_complex_matrix, octave_scalar, ne); - INSTALL_BINOP (el_mul, octave_complex_matrix, octave_scalar, el_mul); - INSTALL_BINOP (el_div, octave_complex_matrix, octave_scalar, el_div); - INSTALL_BINOP (el_pow, octave_complex_matrix, octave_scalar, el_pow); - INSTALL_BINOP (el_ldiv, octave_complex_matrix, octave_scalar, el_ldiv); - INSTALL_BINOP (el_and, octave_complex_matrix, octave_scalar, el_and); - INSTALL_BINOP (el_or, octave_complex_matrix, octave_scalar, el_or); + INSTALL_BINOP (op_add, octave_complex_matrix, octave_scalar, add); + INSTALL_BINOP (op_sub, octave_complex_matrix, octave_scalar, sub); + INSTALL_BINOP (op_mul, octave_complex_matrix, octave_scalar, mul); + INSTALL_BINOP (op_div, octave_complex_matrix, octave_scalar, div); + INSTALL_BINOP (op_pow, octave_complex_matrix, octave_scalar, pow); + INSTALL_BINOP (op_ldiv, octave_complex_matrix, octave_scalar, ldiv); + INSTALL_BINOP (op_lt, octave_complex_matrix, octave_scalar, lt); + INSTALL_BINOP (op_le, octave_complex_matrix, octave_scalar, le); + INSTALL_BINOP (op_eq, octave_complex_matrix, octave_scalar, eq); + INSTALL_BINOP (op_ge, octave_complex_matrix, octave_scalar, ge); + INSTALL_BINOP (op_gt, octave_complex_matrix, octave_scalar, gt); + INSTALL_BINOP (op_ne, octave_complex_matrix, octave_scalar, ne); + INSTALL_BINOP (op_el_mul, octave_complex_matrix, octave_scalar, el_mul); + INSTALL_BINOP (op_el_div, octave_complex_matrix, octave_scalar, el_div); + INSTALL_BINOP (op_el_pow, octave_complex_matrix, octave_scalar, el_pow); + INSTALL_BINOP (op_el_ldiv, octave_complex_matrix, octave_scalar, el_ldiv); + INSTALL_BINOP (op_el_and, octave_complex_matrix, octave_scalar, el_and); + INSTALL_BINOP (op_el_or, octave_complex_matrix, octave_scalar, el_or); - INSTALL_ASSIGNOP (asn_eq, octave_complex_matrix, octave_scalar, assign); + INSTALL_ASSIGNOP (op_asn_eq, octave_complex_matrix, octave_scalar, assign); } /*
--- a/src/OPERATORS/op-cs-cm.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-cs-cm.cc Wed Feb 02 12:36:37 2000 +0000 @@ -98,28 +98,28 @@ void install_cs_cm_ops (void) { - INSTALL_BINOP (add, octave_complex, octave_complex_matrix, add); - INSTALL_BINOP (sub, octave_complex, octave_complex_matrix, sub); - INSTALL_BINOP (mul, octave_complex, octave_complex_matrix, mul); - INSTALL_BINOP (div, octave_complex, octave_complex_matrix, div); - INSTALL_BINOP (pow, octave_complex, octave_complex_matrix, pow); - INSTALL_BINOP (ldiv, octave_complex, octave_complex_matrix, ldiv); - INSTALL_BINOP (lt, octave_complex, octave_complex_matrix, lt); - INSTALL_BINOP (le, octave_complex, octave_complex_matrix, le); - INSTALL_BINOP (eq, octave_complex, octave_complex_matrix, eq); - INSTALL_BINOP (ge, octave_complex, octave_complex_matrix, ge); - INSTALL_BINOP (gt, octave_complex, octave_complex_matrix, gt); - INSTALL_BINOP (ne, octave_complex, octave_complex_matrix, ne); - INSTALL_BINOP (el_mul, octave_complex, octave_complex_matrix, el_mul); - INSTALL_BINOP (el_div, octave_complex, octave_complex_matrix, el_div); - INSTALL_BINOP (el_pow, octave_complex, octave_complex_matrix, el_pow); - INSTALL_BINOP (el_ldiv, octave_complex, octave_complex_matrix, el_ldiv); - INSTALL_BINOP (el_and, octave_complex, octave_complex_matrix, el_and); - INSTALL_BINOP (el_or, octave_complex, octave_complex_matrix, el_or); + INSTALL_BINOP (op_add, octave_complex, octave_complex_matrix, add); + INSTALL_BINOP (op_sub, octave_complex, octave_complex_matrix, sub); + INSTALL_BINOP (op_mul, octave_complex, octave_complex_matrix, mul); + INSTALL_BINOP (op_div, octave_complex, octave_complex_matrix, div); + INSTALL_BINOP (op_pow, octave_complex, octave_complex_matrix, pow); + INSTALL_BINOP (op_ldiv, octave_complex, octave_complex_matrix, ldiv); + INSTALL_BINOP (op_lt, octave_complex, octave_complex_matrix, lt); + INSTALL_BINOP (op_le, octave_complex, octave_complex_matrix, le); + INSTALL_BINOP (op_eq, octave_complex, octave_complex_matrix, eq); + INSTALL_BINOP (op_ge, octave_complex, octave_complex_matrix, ge); + INSTALL_BINOP (op_gt, octave_complex, octave_complex_matrix, gt); + INSTALL_BINOP (op_ne, octave_complex, octave_complex_matrix, ne); + INSTALL_BINOP (op_el_mul, octave_complex, octave_complex_matrix, el_mul); + INSTALL_BINOP (op_el_div, octave_complex, octave_complex_matrix, el_div); + INSTALL_BINOP (op_el_pow, octave_complex, octave_complex_matrix, el_pow); + INSTALL_BINOP (op_el_ldiv, octave_complex, octave_complex_matrix, el_ldiv); + INSTALL_BINOP (op_el_and, octave_complex, octave_complex_matrix, el_and); + INSTALL_BINOP (op_el_or, octave_complex, octave_complex_matrix, el_or); INSTALL_ASSIGNCONV (octave_complex, octave_complex_matrix, octave_complex_matrix); - INSTALL_WIDENOP (octave_complex, octave_complex_matrix, complex_matrix_conv); + INSTALL_WIDENOP (op_octave_complex, octave_complex_matrix, complex_matrix_conv); } /*
--- a/src/OPERATORS/op-cs-cs.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-cs-cs.cc Wed Feb 02 12:36:37 2000 +0000 @@ -185,36 +185,36 @@ void install_cs_cs_ops (void) { - INSTALL_UNOP (not, octave_complex, not); - INSTALL_UNOP (uminus, octave_complex, uminus); - INSTALL_UNOP (transpose, octave_complex, transpose); - INSTALL_UNOP (hermitian, octave_complex, hermitian); + INSTALL_UNOP (op_not, octave_complex, not); + INSTALL_UNOP (op_uminus, octave_complex, uminus); + INSTALL_UNOP (op_transpose, octave_complex, transpose); + INSTALL_UNOP (op_hermitian, octave_complex, hermitian); - INSTALL_NCUNOP (incr, octave_complex, incr); - INSTALL_NCUNOP (decr, octave_complex, decr); + INSTALL_NCUNOP (op_incr, octave_complex, incr); + INSTALL_NCUNOP (op_decr, octave_complex, decr); - INSTALL_BINOP (add, octave_complex, octave_complex, add); - INSTALL_BINOP (sub, octave_complex, octave_complex, sub); - INSTALL_BINOP (mul, octave_complex, octave_complex, mul); - INSTALL_BINOP (div, octave_complex, octave_complex, div); - INSTALL_BINOP (pow, octave_complex, octave_complex, pow); - INSTALL_BINOP (ldiv, octave_complex, octave_complex, ldiv); - INSTALL_BINOP (lt, octave_complex, octave_complex, lt); - INSTALL_BINOP (le, octave_complex, octave_complex, le); - INSTALL_BINOP (eq, octave_complex, octave_complex, eq); - INSTALL_BINOP (ge, octave_complex, octave_complex, ge); - INSTALL_BINOP (gt, octave_complex, octave_complex, gt); - INSTALL_BINOP (ne, octave_complex, octave_complex, ne); - INSTALL_BINOP (el_mul, octave_complex, octave_complex, el_mul); - INSTALL_BINOP (el_div, octave_complex, octave_complex, el_div); - INSTALL_BINOP (el_pow, octave_complex, octave_complex, el_pow); - INSTALL_BINOP (el_ldiv, octave_complex, octave_complex, el_ldiv); - INSTALL_BINOP (el_and, octave_complex, octave_complex, el_and); - INSTALL_BINOP (el_or, octave_complex, octave_complex, el_or); + INSTALL_BINOP (op_add, octave_complex, octave_complex, add); + INSTALL_BINOP (op_sub, octave_complex, octave_complex, sub); + INSTALL_BINOP (op_mul, octave_complex, octave_complex, mul); + INSTALL_BINOP (op_div, octave_complex, octave_complex, div); + INSTALL_BINOP (op_pow, octave_complex, octave_complex, pow); + INSTALL_BINOP (op_ldiv, octave_complex, octave_complex, ldiv); + INSTALL_BINOP (op_lt, octave_complex, octave_complex, lt); + INSTALL_BINOP (op_le, octave_complex, octave_complex, le); + INSTALL_BINOP (op_eq, octave_complex, octave_complex, eq); + INSTALL_BINOP (op_ge, octave_complex, octave_complex, ge); + INSTALL_BINOP (op_gt, octave_complex, octave_complex, gt); + INSTALL_BINOP (op_ne, octave_complex, octave_complex, ne); + INSTALL_BINOP (op_el_mul, octave_complex, octave_complex, el_mul); + INSTALL_BINOP (op_el_div, octave_complex, octave_complex, el_div); + INSTALL_BINOP (op_el_pow, octave_complex, octave_complex, el_pow); + INSTALL_BINOP (op_el_ldiv, octave_complex, octave_complex, el_ldiv); + INSTALL_BINOP (op_el_and, octave_complex, octave_complex, el_and); + INSTALL_BINOP (op_el_or, octave_complex, octave_complex, el_or); INSTALL_ASSIGNCONV (octave_complex, octave_complex, octave_complex_matrix); - INSTALL_WIDENOP (octave_complex, octave_complex_matrix, complex_matrix_conv); + INSTALL_WIDENOP (op_octave_complex, octave_complex_matrix, complex_matrix_conv); } /*
--- a/src/OPERATORS/op-cs-m.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-cs-m.cc Wed Feb 02 12:36:37 2000 +0000 @@ -102,28 +102,28 @@ void install_cs_m_ops (void) { - INSTALL_BINOP (add, octave_complex, octave_matrix, add); - INSTALL_BINOP (sub, octave_complex, octave_matrix, sub); - INSTALL_BINOP (mul, octave_complex, octave_matrix, mul); - INSTALL_BINOP (div, octave_complex, octave_matrix, div); - INSTALL_BINOP (pow, octave_complex, octave_matrix, pow); - INSTALL_BINOP (ldiv, octave_complex, octave_matrix, ldiv); - INSTALL_BINOP (lt, octave_complex, octave_matrix, lt); - INSTALL_BINOP (le, octave_complex, octave_matrix, le); - INSTALL_BINOP (eq, octave_complex, octave_matrix, eq); - INSTALL_BINOP (ge, octave_complex, octave_matrix, ge); - INSTALL_BINOP (gt, octave_complex, octave_matrix, gt); - INSTALL_BINOP (ne, octave_complex, octave_matrix, ne); - INSTALL_BINOP (el_mul, octave_complex, octave_matrix, el_mul); - INSTALL_BINOP (el_div, octave_complex, octave_matrix, el_div); - INSTALL_BINOP (el_pow, octave_complex, octave_matrix, el_pow); - INSTALL_BINOP (el_ldiv, octave_complex, octave_matrix, el_ldiv); - INSTALL_BINOP (el_and, octave_complex, octave_matrix, el_and); - INSTALL_BINOP (el_or, octave_complex, octave_matrix, el_or); + INSTALL_BINOP (op_add, octave_complex, octave_matrix, add); + INSTALL_BINOP (op_sub, octave_complex, octave_matrix, sub); + INSTALL_BINOP (op_mul, octave_complex, octave_matrix, mul); + INSTALL_BINOP (op_div, octave_complex, octave_matrix, div); + INSTALL_BINOP (op_pow, octave_complex, octave_matrix, pow); + INSTALL_BINOP (op_ldiv, octave_complex, octave_matrix, ldiv); + INSTALL_BINOP (op_lt, octave_complex, octave_matrix, lt); + INSTALL_BINOP (op_le, octave_complex, octave_matrix, le); + INSTALL_BINOP (op_eq, octave_complex, octave_matrix, eq); + INSTALL_BINOP (op_ge, octave_complex, octave_matrix, ge); + INSTALL_BINOP (op_gt, octave_complex, octave_matrix, gt); + INSTALL_BINOP (op_ne, octave_complex, octave_matrix, ne); + INSTALL_BINOP (op_el_mul, octave_complex, octave_matrix, el_mul); + INSTALL_BINOP (op_el_div, octave_complex, octave_matrix, el_div); + INSTALL_BINOP (op_el_pow, octave_complex, octave_matrix, el_pow); + INSTALL_BINOP (op_el_ldiv, octave_complex, octave_matrix, el_ldiv); + INSTALL_BINOP (op_el_and, octave_complex, octave_matrix, el_and); + INSTALL_BINOP (op_el_or, octave_complex, octave_matrix, el_or); INSTALL_ASSIGNCONV (octave_complex, octave_matrix, octave_complex_matrix); - INSTALL_WIDENOP (octave_complex, octave_complex_matrix, complex_matrix_conv); + INSTALL_WIDENOP (op_octave_complex, octave_complex_matrix, complex_matrix_conv); } /*
--- a/src/OPERATORS/op-cs-s.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-cs-s.cc Wed Feb 02 12:36:37 2000 +0000 @@ -164,28 +164,28 @@ void install_cs_s_ops (void) { - INSTALL_BINOP (add, octave_complex, octave_scalar, add); - INSTALL_BINOP (sub, octave_complex, octave_scalar, sub); - INSTALL_BINOP (mul, octave_complex, octave_scalar, mul); - INSTALL_BINOP (div, octave_complex, octave_scalar, div); - INSTALL_BINOP (pow, octave_complex, octave_scalar, pow); - INSTALL_BINOP (ldiv, octave_complex, octave_scalar, ldiv); - INSTALL_BINOP (lt, octave_complex, octave_scalar, lt); - INSTALL_BINOP (le, octave_complex, octave_scalar, le); - INSTALL_BINOP (eq, octave_complex, octave_scalar, eq); - INSTALL_BINOP (ge, octave_complex, octave_scalar, ge); - INSTALL_BINOP (gt, octave_complex, octave_scalar, gt); - INSTALL_BINOP (ne, octave_complex, octave_scalar, ne); - INSTALL_BINOP (el_mul, octave_complex, octave_scalar, el_mul); - INSTALL_BINOP (el_div, octave_complex, octave_scalar, el_div); - INSTALL_BINOP (el_pow, octave_complex, octave_scalar, el_pow); - INSTALL_BINOP (el_ldiv, octave_complex, octave_scalar, el_ldiv); - INSTALL_BINOP (el_and, octave_complex, octave_scalar, el_and); - INSTALL_BINOP (el_or, octave_complex, octave_scalar, el_or); + INSTALL_BINOP (op_add, octave_complex, octave_scalar, add); + INSTALL_BINOP (op_sub, octave_complex, octave_scalar, sub); + INSTALL_BINOP (op_mul, octave_complex, octave_scalar, mul); + INSTALL_BINOP (op_div, octave_complex, octave_scalar, div); + INSTALL_BINOP (op_pow, octave_complex, octave_scalar, pow); + INSTALL_BINOP (op_ldiv, octave_complex, octave_scalar, ldiv); + INSTALL_BINOP (op_lt, octave_complex, octave_scalar, lt); + INSTALL_BINOP (op_le, octave_complex, octave_scalar, le); + INSTALL_BINOP (op_eq, octave_complex, octave_scalar, eq); + INSTALL_BINOP (op_ge, octave_complex, octave_scalar, ge); + INSTALL_BINOP (op_gt, octave_complex, octave_scalar, gt); + INSTALL_BINOP (op_ne, octave_complex, octave_scalar, ne); + INSTALL_BINOP (op_el_mul, octave_complex, octave_scalar, el_mul); + INSTALL_BINOP (op_el_div, octave_complex, octave_scalar, el_div); + INSTALL_BINOP (op_el_pow, octave_complex, octave_scalar, el_pow); + INSTALL_BINOP (op_el_ldiv, octave_complex, octave_scalar, el_ldiv); + INSTALL_BINOP (op_el_and, octave_complex, octave_scalar, el_and); + INSTALL_BINOP (op_el_or, octave_complex, octave_scalar, el_or); INSTALL_ASSIGNCONV (octave_complex, octave_scalar, octave_complex_matrix); - INSTALL_WIDENOP (octave_complex, octave_complex_matrix, complex_matrix_conv); + INSTALL_WIDENOP (op_octave_complex, octave_complex_matrix, complex_matrix_conv); } /*
--- a/src/OPERATORS/op-fil-b.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-fil-b.cc Wed Feb 02 12:36:37 2000 +0000 @@ -68,7 +68,7 @@ void install_fil_b_ops (void) { - INSTALL_BINOP (lshift, octave_file, octave_bool, lshift); + INSTALL_BINOP (op_lshift, octave_file, octave_bool, lshift); } /*
--- a/src/OPERATORS/op-fil-bm.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-fil-bm.cc Wed Feb 02 12:36:37 2000 +0000 @@ -68,7 +68,7 @@ void install_fil_bm_ops (void) { - INSTALL_BINOP (lshift, octave_file, octave_bool_matrix, lshift); + INSTALL_BINOP (op_lshift, octave_file, octave_bool_matrix, lshift); } /*
--- a/src/OPERATORS/op-fil-cm.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-fil-cm.cc Wed Feb 02 12:36:37 2000 +0000 @@ -68,7 +68,7 @@ void install_fil_cm_ops (void) { - INSTALL_BINOP (lshift, octave_file, octave_complex_matrix, lshift); + INSTALL_BINOP (op_lshift, octave_file, octave_complex_matrix, lshift); } /*
--- a/src/OPERATORS/op-fil-cs.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-fil-cs.cc Wed Feb 02 12:36:37 2000 +0000 @@ -68,7 +68,7 @@ void install_fil_cs_ops (void) { - INSTALL_BINOP (lshift, octave_file, octave_complex, lshift); + INSTALL_BINOP (op_lshift, octave_file, octave_complex, lshift); } /*
--- a/src/OPERATORS/op-fil-lis.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-fil-lis.cc Wed Feb 02 12:36:37 2000 +0000 @@ -68,7 +68,7 @@ void install_fil_lis_ops (void) { - INSTALL_BINOP (lshift, octave_file, octave_list, lshift); + INSTALL_BINOP (op_lshift, octave_file, octave_list, lshift); } /*
--- a/src/OPERATORS/op-fil-m.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-fil-m.cc Wed Feb 02 12:36:37 2000 +0000 @@ -68,7 +68,7 @@ void install_fil_m_ops (void) { - INSTALL_BINOP (lshift, octave_file, octave_matrix, lshift); + INSTALL_BINOP (op_lshift, octave_file, octave_matrix, lshift); } /*
--- a/src/OPERATORS/op-fil-rec.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-fil-rec.cc Wed Feb 02 12:36:37 2000 +0000 @@ -68,7 +68,7 @@ void install_fil_rec_ops (void) { - INSTALL_BINOP (lshift, octave_file, octave_struct, lshift); + INSTALL_BINOP (op_lshift, octave_file, octave_struct, lshift); } /*
--- a/src/OPERATORS/op-fil-s.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-fil-s.cc Wed Feb 02 12:36:37 2000 +0000 @@ -68,7 +68,7 @@ void install_fil_s_ops (void) { - INSTALL_BINOP (lshift, octave_file, octave_scalar, lshift); + INSTALL_BINOP (op_lshift, octave_file, octave_scalar, lshift); } /*
--- a/src/OPERATORS/op-fil-str.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-fil-str.cc Wed Feb 02 12:36:37 2000 +0000 @@ -68,7 +68,7 @@ void install_fil_str_ops (void) { - INSTALL_BINOP (lshift, octave_file, octave_char_matrix_str, lshift); + INSTALL_BINOP (op_lshift, octave_file, octave_char_matrix_str, lshift); } /*
--- a/src/OPERATORS/op-list.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-list.cc Wed Feb 02 12:36:37 2000 +0000 @@ -41,7 +41,7 @@ void install_list_ops (void) { - INSTALL_ASSIGNANYOP (asn_eq, octave_list, assign); + INSTALL_ASSIGNANYOP (op_asn_eq, octave_list, assign); } /*
--- a/src/OPERATORS/op-m-cm.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-m-cm.cc Wed Feb 02 12:36:37 2000 +0000 @@ -92,28 +92,28 @@ void install_m_cm_ops (void) { - INSTALL_BINOP (add, octave_matrix, octave_complex_matrix, add); - INSTALL_BINOP (sub, octave_matrix, octave_complex_matrix, sub); - INSTALL_BINOP (mul, octave_matrix, octave_complex_matrix, mul); - INSTALL_BINOP (div, octave_matrix, octave_complex_matrix, div); - INSTALL_BINOP (pow, octave_matrix, octave_complex_matrix, pow); - INSTALL_BINOP (ldiv, octave_matrix, octave_complex_matrix, ldiv); - INSTALL_BINOP (lt, octave_matrix, octave_complex_matrix, lt); - INSTALL_BINOP (le, octave_matrix, octave_complex_matrix, le); - INSTALL_BINOP (eq, octave_matrix, octave_complex_matrix, eq); - INSTALL_BINOP (ge, octave_matrix, octave_complex_matrix, ge); - INSTALL_BINOP (gt, octave_matrix, octave_complex_matrix, gt); - INSTALL_BINOP (ne, octave_matrix, octave_complex_matrix, ne); - INSTALL_BINOP (el_mul, octave_matrix, octave_complex_matrix, el_mul); - INSTALL_BINOP (el_div, octave_matrix, octave_complex_matrix, el_div); - INSTALL_BINOP (el_pow, octave_matrix, octave_complex_matrix, el_pow); - INSTALL_BINOP (el_ldiv, octave_matrix, octave_complex_matrix, el_ldiv); - INSTALL_BINOP (el_and, octave_matrix, octave_complex_matrix, el_and); - INSTALL_BINOP (el_or, octave_matrix, octave_complex_matrix, el_or); + INSTALL_BINOP (op_add, octave_matrix, octave_complex_matrix, add); + INSTALL_BINOP (op_sub, octave_matrix, octave_complex_matrix, sub); + INSTALL_BINOP (op_mul, octave_matrix, octave_complex_matrix, mul); + INSTALL_BINOP (op_div, octave_matrix, octave_complex_matrix, div); + INSTALL_BINOP (op_pow, octave_matrix, octave_complex_matrix, pow); + INSTALL_BINOP (op_ldiv, octave_matrix, octave_complex_matrix, ldiv); + INSTALL_BINOP (op_lt, octave_matrix, octave_complex_matrix, lt); + INSTALL_BINOP (op_le, octave_matrix, octave_complex_matrix, le); + INSTALL_BINOP (op_eq, octave_matrix, octave_complex_matrix, eq); + INSTALL_BINOP (op_ge, octave_matrix, octave_complex_matrix, ge); + INSTALL_BINOP (op_gt, octave_matrix, octave_complex_matrix, gt); + INSTALL_BINOP (op_ne, octave_matrix, octave_complex_matrix, ne); + INSTALL_BINOP (op_el_mul, octave_matrix, octave_complex_matrix, el_mul); + INSTALL_BINOP (op_el_div, octave_matrix, octave_complex_matrix, el_div); + INSTALL_BINOP (op_el_pow, octave_matrix, octave_complex_matrix, el_pow); + INSTALL_BINOP (op_el_ldiv, octave_matrix, octave_complex_matrix, el_ldiv); + INSTALL_BINOP (op_el_and, octave_matrix, octave_complex_matrix, el_and); + INSTALL_BINOP (op_el_or, octave_matrix, octave_complex_matrix, el_or); INSTALL_ASSIGNCONV (octave_matrix, octave_complex_matrix, octave_complex_matrix); - INSTALL_WIDENOP (octave_matrix, octave_complex_matrix, complex_matrix_conv); + INSTALL_WIDENOP (op_octave_matrix, octave_complex_matrix, complex_matrix_conv); } /*
--- a/src/OPERATORS/op-m-cs.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-m-cs.cc Wed Feb 02 12:36:37 2000 +0000 @@ -109,28 +109,28 @@ void install_m_cs_ops (void) { - INSTALL_BINOP (add, octave_matrix, octave_complex, add); - INSTALL_BINOP (sub, octave_matrix, octave_complex, sub); - INSTALL_BINOP (mul, octave_matrix, octave_complex, mul); - INSTALL_BINOP (div, octave_matrix, octave_complex, div); - INSTALL_BINOP (pow, octave_matrix, octave_complex, pow); - INSTALL_BINOP (ldiv, octave_matrix, octave_complex, ldiv); - INSTALL_BINOP (lt, octave_matrix, octave_complex, lt); - INSTALL_BINOP (le, octave_matrix, octave_complex, le); - INSTALL_BINOP (eq, octave_matrix, octave_complex, eq); - INSTALL_BINOP (ge, octave_matrix, octave_complex, ge); - INSTALL_BINOP (gt, octave_matrix, octave_complex, gt); - INSTALL_BINOP (ne, octave_matrix, octave_complex, ne); - INSTALL_BINOP (el_mul, octave_matrix, octave_complex, el_mul); - INSTALL_BINOP (el_div, octave_matrix, octave_complex, el_div); - INSTALL_BINOP (el_pow, octave_matrix, octave_complex, el_pow); - INSTALL_BINOP (el_ldiv, octave_matrix, octave_complex, el_ldiv); - INSTALL_BINOP (el_and, octave_matrix, octave_complex, el_and); - INSTALL_BINOP (el_or, octave_matrix, octave_complex, el_or); + INSTALL_BINOP (op_add, octave_matrix, octave_complex, add); + INSTALL_BINOP (op_sub, octave_matrix, octave_complex, sub); + INSTALL_BINOP (op_mul, octave_matrix, octave_complex, mul); + INSTALL_BINOP (op_div, octave_matrix, octave_complex, div); + INSTALL_BINOP (op_pow, octave_matrix, octave_complex, pow); + INSTALL_BINOP (op_ldiv, octave_matrix, octave_complex, ldiv); + INSTALL_BINOP (op_lt, octave_matrix, octave_complex, lt); + INSTALL_BINOP (op_le, octave_matrix, octave_complex, le); + INSTALL_BINOP (op_eq, octave_matrix, octave_complex, eq); + INSTALL_BINOP (op_ge, octave_matrix, octave_complex, ge); + INSTALL_BINOP (op_gt, octave_matrix, octave_complex, gt); + INSTALL_BINOP (op_ne, octave_matrix, octave_complex, ne); + INSTALL_BINOP (op_el_mul, octave_matrix, octave_complex, el_mul); + INSTALL_BINOP (op_el_div, octave_matrix, octave_complex, el_div); + INSTALL_BINOP (op_el_pow, octave_matrix, octave_complex, el_pow); + INSTALL_BINOP (op_el_ldiv, octave_matrix, octave_complex, el_ldiv); + INSTALL_BINOP (op_el_and, octave_matrix, octave_complex, el_and); + INSTALL_BINOP (op_el_or, octave_matrix, octave_complex, el_or); INSTALL_ASSIGNCONV (octave_matrix, octave_complex, octave_complex_matrix); - INSTALL_WIDENOP (octave_matrix, octave_complex_matrix, complex_matrix_conv); + INSTALL_WIDENOP (op_octave_matrix, octave_complex_matrix, complex_matrix_conv); } /*
--- a/src/OPERATORS/op-m-m.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-m-m.cc Wed Feb 02 12:36:37 2000 +0000 @@ -98,34 +98,34 @@ void install_m_m_ops (void) { - INSTALL_UNOP (not, octave_matrix, not); - INSTALL_UNOP (uminus, octave_matrix, uminus); - INSTALL_UNOP (transpose, octave_matrix, transpose); - INSTALL_UNOP (hermitian, octave_matrix, transpose); + INSTALL_UNOP (op_not, octave_matrix, not); + INSTALL_UNOP (op_uminus, octave_matrix, uminus); + INSTALL_UNOP (op_transpose, octave_matrix, transpose); + INSTALL_UNOP (op_hermitian, octave_matrix, transpose); - INSTALL_NCUNOP (incr, octave_matrix, incr); - INSTALL_NCUNOP (decr, octave_matrix, decr); + INSTALL_NCUNOP (op_incr, octave_matrix, incr); + INSTALL_NCUNOP (op_decr, octave_matrix, decr); - INSTALL_BINOP (add, octave_matrix, octave_matrix, add); - INSTALL_BINOP (sub, octave_matrix, octave_matrix, sub); - INSTALL_BINOP (mul, octave_matrix, octave_matrix, mul); - INSTALL_BINOP (div, octave_matrix, octave_matrix, div); - INSTALL_BINOP (pow, octave_matrix, octave_matrix, pow); - INSTALL_BINOP (ldiv, octave_matrix, octave_matrix, ldiv); - INSTALL_BINOP (lt, octave_matrix, octave_matrix, lt); - INSTALL_BINOP (le, octave_matrix, octave_matrix, le); - INSTALL_BINOP (eq, octave_matrix, octave_matrix, eq); - INSTALL_BINOP (ge, octave_matrix, octave_matrix, ge); - INSTALL_BINOP (gt, octave_matrix, octave_matrix, gt); - INSTALL_BINOP (ne, octave_matrix, octave_matrix, ne); - INSTALL_BINOP (el_mul, octave_matrix, octave_matrix, el_mul); - INSTALL_BINOP (el_div, octave_matrix, octave_matrix, el_div); - INSTALL_BINOP (el_pow, octave_matrix, octave_matrix, el_pow); - INSTALL_BINOP (el_ldiv, octave_matrix, octave_matrix, el_ldiv); - INSTALL_BINOP (el_and, octave_matrix, octave_matrix, el_and); - INSTALL_BINOP (el_or, octave_matrix, octave_matrix, el_or); + INSTALL_BINOP (op_add, octave_matrix, octave_matrix, add); + INSTALL_BINOP (op_sub, octave_matrix, octave_matrix, sub); + INSTALL_BINOP (op_mul, octave_matrix, octave_matrix, mul); + INSTALL_BINOP (op_div, octave_matrix, octave_matrix, div); + INSTALL_BINOP (op_pow, octave_matrix, octave_matrix, pow); + INSTALL_BINOP (op_ldiv, octave_matrix, octave_matrix, ldiv); + INSTALL_BINOP (op_lt, octave_matrix, octave_matrix, lt); + INSTALL_BINOP (op_le, octave_matrix, octave_matrix, le); + INSTALL_BINOP (op_eq, octave_matrix, octave_matrix, eq); + INSTALL_BINOP (op_ge, octave_matrix, octave_matrix, ge); + INSTALL_BINOP (op_gt, octave_matrix, octave_matrix, gt); + INSTALL_BINOP (op_ne, octave_matrix, octave_matrix, ne); + INSTALL_BINOP (op_el_mul, octave_matrix, octave_matrix, el_mul); + INSTALL_BINOP (op_el_div, octave_matrix, octave_matrix, el_div); + INSTALL_BINOP (op_el_pow, octave_matrix, octave_matrix, el_pow); + INSTALL_BINOP (op_el_ldiv, octave_matrix, octave_matrix, el_ldiv); + INSTALL_BINOP (op_el_and, octave_matrix, octave_matrix, el_and); + INSTALL_BINOP (op_el_or, octave_matrix, octave_matrix, el_or); - INSTALL_ASSIGNOP (asn_eq, octave_matrix, octave_matrix, assign); + INSTALL_ASSIGNOP (op_asn_eq, octave_matrix, octave_matrix, assign); } /*
--- a/src/OPERATORS/op-m-s.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-m-s.cc Wed Feb 02 12:36:37 2000 +0000 @@ -100,26 +100,26 @@ void install_m_s_ops (void) { - INSTALL_BINOP (add, octave_matrix, octave_scalar, add); - INSTALL_BINOP (sub, octave_matrix, octave_scalar, sub); - INSTALL_BINOP (mul, octave_matrix, octave_scalar, mul); - INSTALL_BINOP (div, octave_matrix, octave_scalar, div); - INSTALL_BINOP (pow, octave_matrix, octave_scalar, pow); - INSTALL_BINOP (ldiv, octave_matrix, octave_scalar, ldiv); - INSTALL_BINOP (lt, octave_matrix, octave_scalar, lt); - INSTALL_BINOP (le, octave_matrix, octave_scalar, le); - INSTALL_BINOP (eq, octave_matrix, octave_scalar, eq); - INSTALL_BINOP (ge, octave_matrix, octave_scalar, ge); - INSTALL_BINOP (gt, octave_matrix, octave_scalar, gt); - INSTALL_BINOP (ne, octave_matrix, octave_scalar, ne); - INSTALL_BINOP (el_mul, octave_matrix, octave_scalar, el_mul); - INSTALL_BINOP (el_div, octave_matrix, octave_scalar, el_div); - INSTALL_BINOP (el_pow, octave_matrix, octave_scalar, el_pow); - INSTALL_BINOP (el_ldiv, octave_matrix, octave_scalar, el_ldiv); - INSTALL_BINOP (el_and, octave_matrix, octave_scalar, el_and); - INSTALL_BINOP (el_or, octave_matrix, octave_scalar, el_or); + INSTALL_BINOP (op_add, octave_matrix, octave_scalar, add); + INSTALL_BINOP (op_sub, octave_matrix, octave_scalar, sub); + INSTALL_BINOP (op_mul, octave_matrix, octave_scalar, mul); + INSTALL_BINOP (op_div, octave_matrix, octave_scalar, div); + INSTALL_BINOP (op_pow, octave_matrix, octave_scalar, pow); + INSTALL_BINOP (op_ldiv, octave_matrix, octave_scalar, ldiv); + INSTALL_BINOP (op_lt, octave_matrix, octave_scalar, lt); + INSTALL_BINOP (op_le, octave_matrix, octave_scalar, le); + INSTALL_BINOP (op_eq, octave_matrix, octave_scalar, eq); + INSTALL_BINOP (op_ge, octave_matrix, octave_scalar, ge); + INSTALL_BINOP (op_gt, octave_matrix, octave_scalar, gt); + INSTALL_BINOP (op_ne, octave_matrix, octave_scalar, ne); + INSTALL_BINOP (op_el_mul, octave_matrix, octave_scalar, el_mul); + INSTALL_BINOP (op_el_div, octave_matrix, octave_scalar, el_div); + INSTALL_BINOP (op_el_pow, octave_matrix, octave_scalar, el_pow); + INSTALL_BINOP (op_el_ldiv, octave_matrix, octave_scalar, el_ldiv); + INSTALL_BINOP (op_el_and, octave_matrix, octave_scalar, el_and); + INSTALL_BINOP (op_el_or, octave_matrix, octave_scalar, el_or); - INSTALL_ASSIGNOP (asn_eq, octave_matrix, octave_scalar, assign); + INSTALL_ASSIGNOP (op_asn_eq, octave_matrix, octave_scalar, assign); } /*
--- a/src/OPERATORS/op-range.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-range.cc Wed Feb 02 12:36:37 2000 +0000 @@ -55,10 +55,10 @@ void install_range_ops (void) { - INSTALL_UNOP (not, octave_range, not); - INSTALL_UNOP (uminus, octave_range, uminus); - INSTALL_UNOP (transpose, octave_range, transpose); - INSTALL_UNOP (hermitian, octave_range, transpose); + INSTALL_UNOP (op_not, octave_range, not); + INSTALL_UNOP (op_uminus, octave_range, uminus); + INSTALL_UNOP (op_transpose, octave_range, transpose); + INSTALL_UNOP (op_hermitian, octave_range, transpose); } /*
--- a/src/OPERATORS/op-s-cm.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-s-cm.cc Wed Feb 02 12:36:37 2000 +0000 @@ -112,28 +112,28 @@ void install_s_cm_ops (void) { - INSTALL_BINOP (add, octave_scalar, octave_complex_matrix, add); - INSTALL_BINOP (sub, octave_scalar, octave_complex_matrix, sub); - INSTALL_BINOP (mul, octave_scalar, octave_complex_matrix, mul); - INSTALL_BINOP (div, octave_scalar, octave_complex_matrix, div); - INSTALL_BINOP (pow, octave_scalar, octave_complex_matrix, pow); - INSTALL_BINOP (ldiv, octave_scalar, octave_complex_matrix, ldiv); - INSTALL_BINOP (lt, octave_scalar, octave_complex_matrix, lt); - INSTALL_BINOP (le, octave_scalar, octave_complex_matrix, le); - INSTALL_BINOP (eq, octave_scalar, octave_complex_matrix, eq); - INSTALL_BINOP (ge, octave_scalar, octave_complex_matrix, ge); - INSTALL_BINOP (gt, octave_scalar, octave_complex_matrix, gt); - INSTALL_BINOP (ne, octave_scalar, octave_complex_matrix, ne); - INSTALL_BINOP (el_mul, octave_scalar, octave_complex_matrix, el_mul); - INSTALL_BINOP (el_div, octave_scalar, octave_complex_matrix, el_div); - INSTALL_BINOP (el_pow, octave_scalar, octave_complex_matrix, el_pow); - INSTALL_BINOP (el_ldiv, octave_scalar, octave_complex_matrix, el_ldiv); - INSTALL_BINOP (el_and, octave_scalar, octave_complex_matrix, el_and); - INSTALL_BINOP (el_or, octave_scalar, octave_complex_matrix, el_or); + INSTALL_BINOP (op_add, octave_scalar, octave_complex_matrix, add); + INSTALL_BINOP (op_sub, octave_scalar, octave_complex_matrix, sub); + INSTALL_BINOP (op_mul, octave_scalar, octave_complex_matrix, mul); + INSTALL_BINOP (op_div, octave_scalar, octave_complex_matrix, div); + INSTALL_BINOP (op_pow, octave_scalar, octave_complex_matrix, pow); + INSTALL_BINOP (op_ldiv, octave_scalar, octave_complex_matrix, ldiv); + INSTALL_BINOP (op_lt, octave_scalar, octave_complex_matrix, lt); + INSTALL_BINOP (op_le, octave_scalar, octave_complex_matrix, le); + INSTALL_BINOP (op_eq, octave_scalar, octave_complex_matrix, eq); + INSTALL_BINOP (op_ge, octave_scalar, octave_complex_matrix, ge); + INSTALL_BINOP (op_gt, octave_scalar, octave_complex_matrix, gt); + INSTALL_BINOP (op_ne, octave_scalar, octave_complex_matrix, ne); + INSTALL_BINOP (op_el_mul, octave_scalar, octave_complex_matrix, el_mul); + INSTALL_BINOP (op_el_div, octave_scalar, octave_complex_matrix, el_div); + INSTALL_BINOP (op_el_pow, octave_scalar, octave_complex_matrix, el_pow); + INSTALL_BINOP (op_el_ldiv, octave_scalar, octave_complex_matrix, el_ldiv); + INSTALL_BINOP (op_el_and, octave_scalar, octave_complex_matrix, el_and); + INSTALL_BINOP (op_el_or, octave_scalar, octave_complex_matrix, el_or); INSTALL_ASSIGNCONV (octave_scalar, octave_complex_matrix, octave_complex_matrix); - INSTALL_WIDENOP (octave_scalar, octave_complex_matrix, complex_matrix_conv); + INSTALL_WIDENOP (op_octave_scalar, octave_complex_matrix, complex_matrix_conv); } /*
--- a/src/OPERATORS/op-s-cs.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-s-cs.cc Wed Feb 02 12:36:37 2000 +0000 @@ -164,28 +164,28 @@ void install_s_cs_ops (void) { - INSTALL_BINOP (add, octave_scalar, octave_complex, add); - INSTALL_BINOP (sub, octave_scalar, octave_complex, sub); - INSTALL_BINOP (mul, octave_scalar, octave_complex, mul); - INSTALL_BINOP (div, octave_scalar, octave_complex, div); - INSTALL_BINOP (pow, octave_scalar, octave_complex, pow); - INSTALL_BINOP (ldiv, octave_scalar, octave_complex, ldiv); - INSTALL_BINOP (lt, octave_scalar, octave_complex, lt); - INSTALL_BINOP (le, octave_scalar, octave_complex, le); - INSTALL_BINOP (eq, octave_scalar, octave_complex, eq); - INSTALL_BINOP (ge, octave_scalar, octave_complex, ge); - INSTALL_BINOP (gt, octave_scalar, octave_complex, gt); - INSTALL_BINOP (ne, octave_scalar, octave_complex, ne); - INSTALL_BINOP (el_mul, octave_scalar, octave_complex, el_mul); - INSTALL_BINOP (el_div, octave_scalar, octave_complex, el_div); - INSTALL_BINOP (el_pow, octave_scalar, octave_complex, el_pow); - INSTALL_BINOP (el_ldiv, octave_scalar, octave_complex, el_ldiv); - INSTALL_BINOP (el_and, octave_scalar, octave_complex, el_and); - INSTALL_BINOP (el_or, octave_scalar, octave_complex, el_or); + INSTALL_BINOP (op_add, octave_scalar, octave_complex, add); + INSTALL_BINOP (op_sub, octave_scalar, octave_complex, sub); + INSTALL_BINOP (op_mul, octave_scalar, octave_complex, mul); + INSTALL_BINOP (op_div, octave_scalar, octave_complex, div); + INSTALL_BINOP (op_pow, octave_scalar, octave_complex, pow); + INSTALL_BINOP (op_ldiv, octave_scalar, octave_complex, ldiv); + INSTALL_BINOP (op_lt, octave_scalar, octave_complex, lt); + INSTALL_BINOP (op_le, octave_scalar, octave_complex, le); + INSTALL_BINOP (op_eq, octave_scalar, octave_complex, eq); + INSTALL_BINOP (op_ge, octave_scalar, octave_complex, ge); + INSTALL_BINOP (op_gt, octave_scalar, octave_complex, gt); + INSTALL_BINOP (op_ne, octave_scalar, octave_complex, ne); + INSTALL_BINOP (op_el_mul, octave_scalar, octave_complex, el_mul); + INSTALL_BINOP (op_el_div, octave_scalar, octave_complex, el_div); + INSTALL_BINOP (op_el_pow, octave_scalar, octave_complex, el_pow); + INSTALL_BINOP (op_el_ldiv, octave_scalar, octave_complex, el_ldiv); + INSTALL_BINOP (op_el_and, octave_scalar, octave_complex, el_and); + INSTALL_BINOP (op_el_or, octave_scalar, octave_complex, el_or); INSTALL_ASSIGNCONV (octave_scalar, octave_complex, octave_complex_matrix); - INSTALL_WIDENOP (octave_scalar, octave_complex_matrix, complex_matrix_conv); + INSTALL_WIDENOP (op_octave_scalar, octave_complex_matrix, complex_matrix_conv); } /*
--- a/src/OPERATORS/op-s-m.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-s-m.cc Wed Feb 02 12:36:37 2000 +0000 @@ -98,28 +98,28 @@ void install_s_m_ops (void) { - INSTALL_BINOP (add, octave_scalar, octave_matrix, add); - INSTALL_BINOP (sub, octave_scalar, octave_matrix, sub); - INSTALL_BINOP (mul, octave_scalar, octave_matrix, mul); - INSTALL_BINOP (div, octave_scalar, octave_matrix, div); - INSTALL_BINOP (pow, octave_scalar, octave_matrix, pow); - INSTALL_BINOP (ldiv, octave_scalar, octave_matrix, ldiv); - INSTALL_BINOP (lt, octave_scalar, octave_matrix, lt); - INSTALL_BINOP (le, octave_scalar, octave_matrix, le); - INSTALL_BINOP (eq, octave_scalar, octave_matrix, eq); - INSTALL_BINOP (ge, octave_scalar, octave_matrix, ge); - INSTALL_BINOP (gt, octave_scalar, octave_matrix, gt); - INSTALL_BINOP (ne, octave_scalar, octave_matrix, ne); - INSTALL_BINOP (el_mul, octave_scalar, octave_matrix, el_mul); - INSTALL_BINOP (el_div, octave_scalar, octave_matrix, el_div); - INSTALL_BINOP (el_pow, octave_scalar, octave_matrix, el_pow); - INSTALL_BINOP (el_ldiv, octave_scalar, octave_matrix, el_ldiv); - INSTALL_BINOP (el_and, octave_scalar, octave_matrix, el_and); - INSTALL_BINOP (el_or, octave_scalar, octave_matrix, el_or); + INSTALL_BINOP (op_add, octave_scalar, octave_matrix, add); + INSTALL_BINOP (op_sub, octave_scalar, octave_matrix, sub); + INSTALL_BINOP (op_mul, octave_scalar, octave_matrix, mul); + INSTALL_BINOP (op_div, octave_scalar, octave_matrix, div); + INSTALL_BINOP (op_pow, octave_scalar, octave_matrix, pow); + INSTALL_BINOP (op_ldiv, octave_scalar, octave_matrix, ldiv); + INSTALL_BINOP (op_lt, octave_scalar, octave_matrix, lt); + INSTALL_BINOP (op_le, octave_scalar, octave_matrix, le); + INSTALL_BINOP (op_eq, octave_scalar, octave_matrix, eq); + INSTALL_BINOP (op_ge, octave_scalar, octave_matrix, ge); + INSTALL_BINOP (op_gt, octave_scalar, octave_matrix, gt); + INSTALL_BINOP (op_ne, octave_scalar, octave_matrix, ne); + INSTALL_BINOP (op_el_mul, octave_scalar, octave_matrix, el_mul); + INSTALL_BINOP (op_el_div, octave_scalar, octave_matrix, el_div); + INSTALL_BINOP (op_el_pow, octave_scalar, octave_matrix, el_pow); + INSTALL_BINOP (op_el_ldiv, octave_scalar, octave_matrix, el_ldiv); + INSTALL_BINOP (op_el_and, octave_scalar, octave_matrix, el_and); + INSTALL_BINOP (op_el_or, octave_scalar, octave_matrix, el_or); INSTALL_ASSIGNCONV (octave_scalar, octave_matrix, octave_matrix); - INSTALL_WIDENOP (octave_scalar, octave_matrix, matrix_conv); + INSTALL_WIDENOP (op_octave_scalar, octave_matrix, matrix_conv); } /*
--- a/src/OPERATORS/op-s-s.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-s-s.cc Wed Feb 02 12:36:37 2000 +0000 @@ -142,36 +142,36 @@ void install_s_s_ops (void) { - INSTALL_UNOP (not, octave_scalar, not); - INSTALL_UNOP (uminus, octave_scalar, uminus); - INSTALL_UNOP (transpose, octave_scalar, transpose); - INSTALL_UNOP (hermitian, octave_scalar, hermitian); + INSTALL_UNOP (op_not, octave_scalar, not); + INSTALL_UNOP (op_uminus, octave_scalar, uminus); + INSTALL_UNOP (op_transpose, octave_scalar, transpose); + INSTALL_UNOP (op_hermitian, octave_scalar, hermitian); - INSTALL_NCUNOP (incr, octave_scalar, incr); - INSTALL_NCUNOP (decr, octave_scalar, decr); + INSTALL_NCUNOP (op_incr, octave_scalar, incr); + INSTALL_NCUNOP (op_decr, octave_scalar, decr); - INSTALL_BINOP (add, octave_scalar, octave_scalar, add); - INSTALL_BINOP (sub, octave_scalar, octave_scalar, sub); - INSTALL_BINOP (mul, octave_scalar, octave_scalar, mul); - INSTALL_BINOP (div, octave_scalar, octave_scalar, div); - INSTALL_BINOP (pow, octave_scalar, octave_scalar, pow); - INSTALL_BINOP (ldiv, octave_scalar, octave_scalar, ldiv); - INSTALL_BINOP (lt, octave_scalar, octave_scalar, lt); - INSTALL_BINOP (le, octave_scalar, octave_scalar, le); - INSTALL_BINOP (eq, octave_scalar, octave_scalar, eq); - INSTALL_BINOP (ge, octave_scalar, octave_scalar, ge); - INSTALL_BINOP (gt, octave_scalar, octave_scalar, gt); - INSTALL_BINOP (ne, octave_scalar, octave_scalar, ne); - INSTALL_BINOP (el_mul, octave_scalar, octave_scalar, el_mul); - INSTALL_BINOP (el_div, octave_scalar, octave_scalar, el_div); - INSTALL_BINOP (el_pow, octave_scalar, octave_scalar, el_pow); - INSTALL_BINOP (el_ldiv, octave_scalar, octave_scalar, el_ldiv); - INSTALL_BINOP (el_and, octave_scalar, octave_scalar, el_and); - INSTALL_BINOP (el_or, octave_scalar, octave_scalar, el_or); + INSTALL_BINOP (op_add, octave_scalar, octave_scalar, add); + INSTALL_BINOP (op_sub, octave_scalar, octave_scalar, sub); + INSTALL_BINOP (op_mul, octave_scalar, octave_scalar, mul); + INSTALL_BINOP (op_div, octave_scalar, octave_scalar, div); + INSTALL_BINOP (op_pow, octave_scalar, octave_scalar, pow); + INSTALL_BINOP (op_ldiv, octave_scalar, octave_scalar, ldiv); + INSTALL_BINOP (op_lt, octave_scalar, octave_scalar, lt); + INSTALL_BINOP (op_le, octave_scalar, octave_scalar, le); + INSTALL_BINOP (op_eq, octave_scalar, octave_scalar, eq); + INSTALL_BINOP (op_ge, octave_scalar, octave_scalar, ge); + INSTALL_BINOP (op_gt, octave_scalar, octave_scalar, gt); + INSTALL_BINOP (op_ne, octave_scalar, octave_scalar, ne); + INSTALL_BINOP (op_el_mul, octave_scalar, octave_scalar, el_mul); + INSTALL_BINOP (op_el_div, octave_scalar, octave_scalar, el_div); + INSTALL_BINOP (op_el_pow, octave_scalar, octave_scalar, el_pow); + INSTALL_BINOP (op_el_ldiv, octave_scalar, octave_scalar, el_ldiv); + INSTALL_BINOP (op_el_and, octave_scalar, octave_scalar, el_and); + INSTALL_BINOP (op_el_or, octave_scalar, octave_scalar, el_or); INSTALL_ASSIGNCONV (octave_scalar, octave_scalar, octave_matrix); - INSTALL_WIDENOP (octave_scalar, octave_matrix, matrix_conv); + INSTALL_WIDENOP (op_octave_scalar, octave_matrix, matrix_conv); } /*
--- a/src/OPERATORS/op-str-str.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/OPERATORS/op-str-str.cc Wed Feb 02 12:36:37 2000 +0000 @@ -113,13 +113,13 @@ void install_str_str_ops (void) { - INSTALL_UNOP (transpose, octave_char_matrix_str, transpose); - INSTALL_UNOP (hermitian, octave_char_matrix_str, transpose); + INSTALL_UNOP (op_transpose, octave_char_matrix_str, transpose); + INSTALL_UNOP (op_hermitian, octave_char_matrix_str, transpose); - INSTALL_BINOP (eq, octave_char_matrix_str, octave_char_matrix_str, eq); - INSTALL_BINOP (ne, octave_char_matrix_str, octave_char_matrix_str, ne); + INSTALL_BINOP (op_eq, octave_char_matrix_str, octave_char_matrix_str, eq); + INSTALL_BINOP (op_ne, octave_char_matrix_str, octave_char_matrix_str, ne); - INSTALL_ASSIGNOP (asn_eq, octave_char_matrix_str, octave_char_matrix_str, assign); + INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_str, octave_char_matrix_str, assign); } /*
--- a/src/dirfns.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/dirfns.cc Wed Feb 02 12:36:37 2000 +0000 @@ -173,7 +173,7 @@ for (int i = 1; i < argc; i++) ls_buf << file_ops::tilde_expand (argv[i]) << " "; - ls_buf << ends; + ls_buf << std::ends; char *ls_command = ls_buf.str (); iprocstream *cmd = new iprocstream (ls_command);
--- a/src/error.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/error.cc Wed Feb 02 12:36:37 2000 +0000 @@ -75,8 +75,8 @@ octave_diary.vform (fmt, args); std::cerr.vform (fmt, args); - octave_diary << endl; - std::cerr << endl; + octave_diary << std::endl; + std::cerr << std::endl; } static void @@ -93,7 +93,7 @@ if (name) output_buf << name << ": "; output_buf.vform (fmt, args); - output_buf << endl << ends; + output_buf << std::endl << std::ends; char *msg = output_buf.str (); @@ -399,7 +399,7 @@ { if (error_message_buffer) { - *error_message_buffer << ends; + *error_message_buffer << std::ends; char *error_text = error_message_buffer->str ();
--- a/src/help.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/help.cc Wed Feb 02 12:36:37 2000 +0000 @@ -521,7 +521,7 @@ if (nm.length () > 0) cmd_buf << " --index-search " << nm; - cmd_buf << ends; + cmd_buf << std::ends; cmd_str = cmd_buf.str (); @@ -621,7 +621,7 @@ << " --force" << " --output " << tmp_file_name << " > /dev/null 2>&1" - << ends; + << std::ends; char *cmd = buf.str (); @@ -813,7 +813,7 @@ if (! ff.empty ()) { - std::ifstream fs (ff.c_str (), ios::in); + std::ifstream fs (ff.c_str (), std::ios::in); if (fs) { @@ -899,7 +899,7 @@ if (nargout == 0) { - output_buf << ends; + output_buf << std::ends; char *s = output_buf.str ();
--- a/src/lex.l Wed Feb 02 12:06:05 2000 +0000 +++ b/src/lex.l Wed Feb 02 12:36:37 2000 +0000 @@ -1641,7 +1641,7 @@ return false; cleanup: - buf << ends; + buf << std::ends; char *s = buf.str (); if (s) { @@ -1751,7 +1751,7 @@ else { unput (c); - buf << ends; + buf << std::ends; char *t = buf.str (); std::string s = do_string_escapes (t); delete [] t;
--- a/src/load-save.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/load-save.cc Wed Feb 02 12:36:37 2000 +0000 @@ -297,7 +297,7 @@ while (is.get (c) && isalpha (c)) buf << c; - buf << ends; + buf << std::ends; char *tmp = buf.str (); int match = (strncmp (tmp, keyword, strlen (keyword)) == 0); delete [] tmp; @@ -314,7 +314,7 @@ while (is.get (c) && c != '\n') value << c; } - value << ends; + value << std::ends; retval = value.str (); break; } @@ -365,7 +365,7 @@ while (is.get (c) && isalpha (c)) buf << c; - buf << ends; + buf << std::ends; char *tmp = buf.str (); int match = (strncmp (tmp, keyword, strlen (keyword)) == 0); delete [] tmp; @@ -1036,7 +1036,7 @@ error ("load: file `%s' seems to be empty!", filename.c_str ()); is.clear (); - is.seekg (pos, ios::beg); + is.seekg (pos, std::ios::beg); } // Extract a matrix from a file of numbers only. @@ -1082,7 +1082,7 @@ Matrix tmp (nr, nc); if (nr < 1 || nc < 1) - is.clear (ios::badbit); + is.clear (std::ios::badbit); else { double d; @@ -1515,7 +1515,7 @@ retval = LS_BINARY; else { - file.seekg (0, ios::beg); + file.seekg (0, std::ios::beg); FOUR_BYTE_INT mopt, nr, nc, imag, len; @@ -1526,7 +1526,7 @@ else { file.clear (); - file.seekg (0, ios::beg); + file.seekg (0, std::ios::beg); char *tmp = extract_keyword (file, "name"); @@ -1631,9 +1631,9 @@ << "==== ==== ==== ====\n"; output_buf - << setiosflags (ios::left) + << setiosflags (std::ios::left) << setw (16) << tc.type_name () . c_str () - << setiosflags (ios::right) + << setiosflags (std::ios::right) << setw (7) << tc.rows () << setw (7) << tc.columns () << " "; @@ -1672,7 +1672,7 @@ if (list_only && count) { - output_buf << ends; + output_buf << std::ends; char *msg = output_buf.str (); @@ -1825,9 +1825,9 @@ { i++; - unsigned mode = ios::in; + unsigned mode = std::ios::in; if (format == LS_BINARY || format == LS_MAT_BINARY) - mode |= ios::bin; + mode |= std::ios::bin; std::ifstream file (fname.c_str (), mode); @@ -2539,9 +2539,9 @@ load_save_format format = get_default_save_format (); - unsigned mode = ios::out|ios::trunc; + unsigned mode = std::ios::out|std::ios::trunc; if (format == LS_BINARY || format == LS_MAT_BINARY) - mode |= ios::bin; + mode |= std::ios::bin; std::ofstream file (fname, mode); @@ -2706,18 +2706,18 @@ i++; - unsigned mode = ios::out; + unsigned mode = std::ios::out; if (format == LS_BINARY || format == LS_MAT_BINARY) - mode |= ios::bin; - - mode |= append ? ios::ate : ios::trunc; + mode |= std::ios::bin; + + mode |= append ? std::ios::ate : std::ios::trunc; std::ofstream file (fname.c_str (), mode); if (file) { bool write_header_info - = ((file.rdbuf ())->seekoff (0, ios::cur) == 0); + = ((file.rdbuf ())->seekoff (0, std::ios::cur) == 0); save_vars (argv, i, argc, file, save_builtins, format, save_as_floats, write_header_info);
--- a/src/oct-stream.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/oct-stream.cc Wed Feb 02 12:36:37 2000 +0000 @@ -249,7 +249,7 @@ { if (buf) { - *buf << ends; + *buf << std::ends; char *text = buf->str (); @@ -644,7 +644,7 @@ { if (buf) { - *buf << ends; + *buf << std::ends; char *text = buf->str (); @@ -936,7 +936,7 @@ } else { - buf << ends; + buf << std::ends; char *tmp = buf.str (); retval = tmp; delete [] tmp; @@ -1092,12 +1092,12 @@ } \ \ if (i != n) \ - is.setstate (ios::failbit); \ + is.setstate (std::ios::failbit); \ } \ while (0) #define BEGIN_C_CONVERSION() \ - is.unsetf (ios::skipws); \ + is.unsetf (std::ios::skipws); \ \ int width = elt->width ? elt->width : 1; \ \ @@ -1146,7 +1146,7 @@ if (isspace (c)) \ is.putback (c); \ \ - buf << ends; \ + buf << std::ends; \ \ tmp = buf.str (); \ } \ @@ -1193,12 +1193,12 @@ if (c != EOF) \ is.putback (c); \ \ - buf << ends; \ + buf << std::ends; \ \ tmp = buf.str (); \ \ if (strlen (tmp) == 0) \ - is.setstate (ios::failbit); \ + is.setstate (std::ios::failbit); \ } \ } \ while (0) @@ -1323,7 +1323,7 @@ const scanf_format_elt *elt = fmt_list.first (); - ios::fmtflags flags = is.flags (); + std::ios::fmtflags flags = is.flags (); for (;;) { @@ -1508,8 +1508,8 @@ // If it looks like we have a matching failure, then // reset the failbit in the stream state. - if (is.rdstate () & ios::failbit) - is.clear (is.rdstate () & (~ios::failbit)); + if (is.rdstate () & std::ios::failbit) + is.clear (is.rdstate () & (~std::ios::failbit)); // XXX FIXME XXX -- is this the right thing to do? @@ -1586,8 +1586,8 @@ // If it looks like we have a matching failure, then // reset the failbit in the stream state. - if (is.rdstate () & ios::failbit) - is.clear (is.rdstate () & (~ios::failbit)); + if (is.rdstate () & std::ios::failbit) + is.clear (is.rdstate () & (~std::ios::failbit)); else error ("fscanf: read error"); @@ -1640,7 +1640,7 @@ { std::istream& is = *isp; - ios::fmtflags flags = is.flags (); + std::ios::fmtflags flags = is.flags (); if (elt) { @@ -2367,7 +2367,7 @@ int octave_base_stream::rewind (void) { - return seek (0, ios::beg); + return seek (0, std::ios::beg); } // Return current error message for this stream. @@ -2509,7 +2509,7 @@ } int -octave_stream::seek (streamoff offset, ios::seek_dir origin) +octave_stream::seek (streamoff offset, std::ios::seek_dir origin) { int retval = -1; @@ -2531,18 +2531,18 @@ if (! conv_err) { - ios::seek_dir origin = ios::beg; + std::ios::seek_dir origin = std::ios::beg; if (tc_origin.is_string ()) { std::string xorigin = tc_origin.string_value (); if (xorigin == "bof") - origin = ios::beg; + origin = std::ios::beg; else if (xorigin == "cof") - origin = ios::cur; + origin = std::ios::cur; else if (xorigin == "eof") - origin = ios::end; + origin = std::ios::end; else conv_err = -1; } @@ -2553,11 +2553,11 @@ if (! conv_err) { if (xorigin == -1) - origin = ios::beg; + origin = std::ios::beg; else if (xorigin == 0) - origin = ios::cur; + origin = std::ios::cur; else if (xorigin == 1) - origin = ios::end; + origin = std::ios::end; else conv_err = -1; } @@ -2764,53 +2764,53 @@ switch (mode) { - case ios::in: + case std::ios::in: retval = "r"; break; - case ios::out: - case ios::out | ios::trunc: + case std::ios::out: + case std::ios::out | std::ios::trunc: retval = "w"; break; - case ios::out | ios::app: + case std::ios::out | std::ios::app: retval = "a"; break; - case ios::in | ios::out: + case std::ios::in | std::ios::out: retval = "r+"; break; - case ios::in | ios::out | ios::trunc: + case std::ios::in | std::ios::out | std::ios::trunc: retval = "w+"; break; - case ios::in | ios::out | ios::app: + case std::ios::in | std::ios::out | std::ios::app: retval = "a+"; break; - case ios::in | ios::bin: + case std::ios::in | std::ios::bin: retval = "rb"; break; - case ios::out | ios::bin: - case ios::out | ios::trunc | ios::bin: + case std::ios::out | std::ios::bin: + case std::ios::out | std::ios::trunc | std::ios::bin: retval = "wb"; break; - case ios::out | ios::app | ios::bin: + case std::ios::out | std::ios::app | std::ios::bin: retval = "ab"; break; - case ios::in | ios::out | ios::bin: + case std::ios::in | std::ios::out | std::ios::bin: retval = "r+b"; break; - case ios::in | ios::out | ios::trunc | ios::bin: + case std::ios::in | std::ios::out | std::ios::trunc | std::ios::bin: retval = "w+b"; break; - case ios::in | ios::out | ios::app | ios::bin: + case std::ios::in | std::ios::out | std::ios::app | std::ios::bin: retval = "a+b"; break; @@ -3107,16 +3107,16 @@ std::string name = os.name (); buf << " " - << setiosflags (ios::right) + << setiosflags (std::ios::right) << setw (4) << i << " " - << setiosflags (ios::left) + << setiosflags (std::ios::left) << setw (3) << mode.c_str () << " " << setw (9) << arch.c_str () << " " << name << "\n"; } } - buf << "\n" << ends; + buf << "\n" << std::ends; char *tmp = buf.str ();
--- a/src/oct-strstrm.h Wed Feb 02 12:06:05 2000 +0000 +++ b/src/oct-strstrm.h Wed Feb 02 12:36:37 2000 +0000 @@ -33,14 +33,14 @@ { public: - octave_base_strstream (ios::openmode arg_md = ios::out, + octave_base_strstream (std::ios::openmode arg_md = std::ios::out, oct_mach_info::float_format flt_fmt = oct_mach_info::native) : octave_base_stream (arg_md, flt_fmt) { } // Position a stream at OFFSET relative to ORIGIN. - int seek (streamoff offset, ios::seek_dir origin); + int seek (streamoff offset, std::ios::seek_dir origin); // Return current stream position. @@ -75,23 +75,23 @@ public: octave_istrstream (const char *data, - ios::openmode arg_md = ios::out, + std::ios::openmode arg_md = std::ios::out, oct_mach_info::float_format flt_fmt = oct_mach_info::native) : octave_base_strstream (arg_md, flt_fmt), is (data) { } octave_istrstream (const std::string& data, - ios::openmode arg_md = ios::out, + std::ios::openmode arg_md = std::ios::out, oct_mach_info::float_format flt_fmt = oct_mach_info::native) : octave_base_strstream (arg_md, flt_fmt), is (data.c_str ()) { } static octave_stream - create (const char *data, ios::openmode arg_md = ios::out, + create (const char *data, std::ios::openmode arg_md = std::ios::out, oct_mach_info::float_format flt_fmt = oct_mach_info::native); static octave_stream - create (const std::string& data, ios::openmode arg_md = ios::out, + create (const std::string& data, std::ios::openmode arg_md = std::ios::out, oct_mach_info::float_format flt_fmt = oct_mach_info::native); // Return non-zero if EOF has been reached on this stream. @@ -128,13 +128,13 @@ { public: - octave_ostrstream (ios::openmode arg_md = ios::out, + octave_ostrstream (std::ios::openmode arg_md = std::ios::out, oct_mach_info::float_format flt_fmt = oct_mach_info::native) : octave_base_strstream (arg_md, flt_fmt) { } static octave_stream - create (ios::openmode arg_md = ios::out, + create (std::ios::openmode arg_md = std::ios::out, oct_mach_info::float_format flt_fmt = oct_mach_info::native); // Return non-zero if EOF has been reached on this stream. @@ -147,7 +147,7 @@ std::string str (void) { - os << ends; + os << std::ends; char *tmp = os.str (); std::string retval = tmp; delete [] tmp;
--- a/src/octave.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/octave.cc Wed Feb 02 12:36:37 2000 +0000 @@ -489,7 +489,7 @@ initialize_command_input (); if (! inhibit_startup_message) - std::cout << OCTAVE_STARTUP_MESSAGE "\n" << endl; + std::cout << OCTAVE_STARTUP_MESSAGE "\n" << std::endl; if (traditional) maximum_braindamage (); @@ -499,7 +499,7 @@ command_history::read (false); if (! inhibit_startup_message && reading_startup_message_printed) - std::cout << endl; + std::cout << std::endl; // Avoid counting commands executed from startup files.
--- a/src/ov-cell.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/ov-cell.cc Wed Feb 02 12:36:37 2000 +0000 @@ -135,7 +135,7 @@ for (int i = 0; i < nr; i++) { std::ostrstream buf; - buf << "[" << i+1 << "," << j+1 << "]" << ends; + buf << "[" << i+1 << "," << j+1 << "]" << std::ends; const char *nm = buf.str (); octave_value val = cell_val(i,j);
--- a/src/ov-list.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/ov-list.cc Wed Feb 02 12:36:37 2000 +0000 @@ -106,7 +106,7 @@ for (int i = 0; i < n; i++) { std::ostrstream buf; - buf << "[" << i+1 << "]" << ends; + buf << "[" << i+1 << "]" << std::ends; const char *nm = buf.str (); octave_value val = lst(i);
--- a/src/parse.y Wed Feb 02 12:06:05 2000 +0000 +++ b/src/parse.y Wed Feb 02 12:36:37 2000 +0000 @@ -1438,7 +1438,7 @@ output_buf << "^"; } - output_buf << "\n" << ends; + output_buf << "\n" << std::ends; char *msg = output_buf.str (); @@ -1632,7 +1632,7 @@ e->accept (tpc); - buf << ends; + buf << std::ends; char *s = buf.str (); @@ -1681,7 +1681,7 @@ e->accept (tpc); - buf << ends; + buf << std::ends; char *s = buf.str (); @@ -1739,7 +1739,7 @@ e->accept (tpc); - buf << ends; + buf << std::ends; char *s = buf.str (); @@ -2571,7 +2571,7 @@ m->accept (tpc); - buf << ends; + buf << std::ends; char *s = buf.str (); @@ -2742,7 +2742,7 @@ parse_and_execute (f); if (verbose) - std::cout << "done." << endl; + std::cout << "done." << std::endl; } else if (warn_for) error ("%s: unable to open file `%s'", warn_for, s.c_str ());
--- a/src/pr-output.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/pr-output.cc Wed Feb 02 12:36:37 2000 +0000 @@ -975,8 +975,8 @@ char ofill = os.fill ('0'); - ios::fmtflags oflags = os.setf (ios::right); - os.setf (ios::hex, ios::basefield); + std::ios::fmtflags oflags = os.setf (std::ios::right); + os.setf (std::ios::hex, std::ios::basefield); if (hex_format > 1 || flt_fmt == oct_mach_info::ieee_big_endian
--- a/src/pt-decl.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/pt-decl.cc Wed Feb 02 12:36:37 2000 +0000 @@ -115,7 +115,7 @@ else if (Vinitialize_global_variables) init_val = builtin_any_variable ("default_global_variable_value"); - ult.assign (octave_value::asn_eq, init_val); + ult.assign (octave_value::op_asn_eq, init_val); } } } @@ -154,7 +154,7 @@ octave_lvalue ult = id->lvalue (); - ult.assign (octave_value::asn_eq, init_val); + ult.assign (octave_value::op_asn_eq, init_val); } } }
--- a/src/pt-loop.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/pt-loop.cc Wed Feb 02 12:36:37 2000 +0000 @@ -173,7 +173,7 @@ { quit = false; - ult.assign (octave_value::asn_eq, rhs); + ult.assign (octave_value::op_asn_eq, rhs); if (! error_state) { @@ -375,8 +375,8 @@ { quit = false; - val_ref.assign (octave_value::asn_eq, val); - key_ref.assign (octave_value::asn_eq, key); + val_ref.assign (octave_value::op_asn_eq, val); + key_ref.assign (octave_value::op_asn_eq, key); if (! error_state) {
--- a/src/pt-misc.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/pt-misc.cc Wed Feb 02 12:36:37 2000 +0000 @@ -70,7 +70,7 @@ { octave_lvalue tmp = elt->lvalue (); - tmp.assign (octave_value::asn_eq, val); + tmp.assign (octave_value::op_asn_eq, val); } } } @@ -101,10 +101,10 @@ return; } - ref.assign (octave_value::asn_eq, args(i)); + ref.assign (octave_value::op_asn_eq, args(i)); } else - ref.assign (octave_value::asn_eq, octave_value ()); + ref.assign (octave_value::op_asn_eq, octave_value ()); next (p); } @@ -123,7 +123,7 @@ octave_lvalue ref = elt->lvalue (); - ref.assign (octave_value::asn_eq, octave_value ()); + ref.assign (octave_value::op_asn_eq, octave_value ()); next (p); }
--- a/src/pt-plot.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/pt-plot.cc Wed Feb 02 12:36:37 2000 +0000 @@ -309,7 +309,7 @@ return; } - plot_buf << Vgnuplot_command_end << ends; + plot_buf << Vgnuplot_command_end << std::ends; // Just testing... // char *message = plot_buf.str (); @@ -928,7 +928,7 @@ if (plot_stream && *plot_stream) { std::ostrstream plot_buf; - plot_buf << "cd \"" << newdir << "\"" << Vgnuplot_command_end << ends; + plot_buf << "cd \"" << newdir << "\"" << Vgnuplot_command_end << std::ends; char *message = plot_buf.str (); send_to_plot_stream (message); delete [] message; @@ -1124,7 +1124,7 @@ buf << argv[i] << " "; if (i < argc) buf << argv[i]; - buf << Vgnuplot_command_end << ends; + buf << Vgnuplot_command_end << std::ends; gnuplot_terminal_type = buf.str (); } } @@ -1136,7 +1136,7 @@ if (i < argc) plot_buf << argv[i]; - plot_buf << Vgnuplot_command_end << ends; + plot_buf << Vgnuplot_command_end << std::ends; char *plot_command = plot_buf.str (); send_to_plot_stream (plot_command); @@ -1177,7 +1177,7 @@ if (i < argc) plot_buf << argv[i]; - plot_buf << Vgnuplot_command_end << ends; + plot_buf << Vgnuplot_command_end << std::ends; char *plot_command = plot_buf.str (); send_to_plot_stream (plot_command);
--- a/src/pt.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/pt.cc Wed Feb 02 12:36:37 2000 +0000 @@ -47,7 +47,7 @@ accept (tpc); - buf << ends; + buf << std::ends; const char *s = buf.str ();
--- a/src/toplev.cc Wed Feb 02 12:06:05 2000 +0000 +++ b/src/toplev.cc Wed Feb 02 12:36:37 2000 +0000 @@ -356,7 +356,7 @@ else cmd_status = 127; - output_buf << ends; + output_buf << std::ends; char *msg = output_buf.str (); @@ -690,7 +690,7 @@ } if (debug_new_delete) - std::cout << "__builtin_new: " << p << endl; + std::cout << "__builtin_new: " << p << std::endl; return p; } @@ -699,7 +699,7 @@ __builtin_delete (void *ptr) { if (debug_new_delete) - std::cout << "__builtin_delete: " << ptr << endl; + std::cout << "__builtin_delete: " << ptr << std::endl; if (ptr) free (ptr);