Mercurial > octave
changeset 29961:7d6709900da7
eliminate octave:: namespace tags in DEFUN and DEFMETHOD and more
Files affected: __betainc__.cc, __contourc__.cc, __eigs__.cc,
__expint__.cc, __ftp__.cc, __gammainc__.cc, __ichol__.cc, __ilu__.cc,
__magick_read__.cc, __pchip_deriv__.cc, __qp__.cc, amd.cc, balance.cc,
besselj.cc, bsxfun.cc, call-stack.cc, ccolamd.cc, cellfun.cc, chol.cc,
colamd.cc, colloc.cc, conv2.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc,
defaults.cc, dirfns.cc, display.cc, dlmread.cc, dmperm.cc, dot.cc,
eig.cc, ellipj.cc, environment.cc, error.cc, event-manager.cc, fft.cc,
fft2.cc, fftn.cc, file-io.cc, find.cc, gcd.cc, getgrent.cc,
getpwent.cc, getrusage.cc, gsvd.cc, hash.cc, help.cc, hess.cc,
hex2num.cc, input.cc, inv.cc, jsondecode.cc, jsonencode.cc,
load-path.cc, load-save.cc, lookup.cc, lsode.cc, lu.cc, max.cc,
mgorth.cc, oct-hist.cc, ordqz.cc, ordschur.cc, pager.cc, pr-output.cc,
psi.cc, qr.cc, quad.cc, quadcc.cc, qz.cc, rand.cc, regexp.cc,
schur.cc, settings.cc, sighandlers.cc, sparse.cc, spparms.cc,
sqrtm.cc, stream-euler.cc, strfind.cc, strfns.cc, sub2ind.cc, svd.cc,
symbfact.cc, symtab.cc, syscalls.cc, sysdep.cc, time.cc, toplev.cc,
tril.cc, typecast.cc, urlwrite.cc, utils.cc, variables.cc,
__delaunayn__.cc, __fltk_uigetfile__.cc, __glpk__.cc,
__init_gnuplot__.cc, __ode15__.cc, __voronoi__.cc, audiodevinfo.cc,
audioread.cc, convhulln.cc, fftw.cc, gzip.cc, ov-cell.cc, ov-class.cc,
ov-classdef.cc, ov-fcn-handle.cc, ov-struct.cc, ov-typeinfo.cc,
ov-usr-fcn.cc, octave.cc, lex.ll, oct-parse.yy, profiler.cc,
andpt-eval.cc.
line wrap: on
line diff
--- a/libinterp/corefcn/__betainc__.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/__betainc__.cc Sat Aug 14 22:48:52 2021 -0400 @@ -79,7 +79,7 @@ b = args(2).float_array_value (); // Initialize variables used in algorithm - static const float tiny = octave::math::exp2 (-50.0f); + static const float tiny = math::exp2 (-50.0f); static const float eps = std::numeric_limits<float>::epsilon (); float xj, x2, y, Cj, Dj, aj, bj, Deltaj, alpha_j, beta_j; int j, maxit; @@ -150,7 +150,7 @@ b = args(2).array_value (); // Initialize variables used in algorithm - static const double tiny = octave::math::exp2 (-100.0); + static const double tiny = math::exp2 (-100.0); static const double eps = std::numeric_limits<double>::epsilon (); double xj, x2, y, Cj, Dj, aj, bj, Deltaj, alpha_j, beta_j; int j, maxit;
--- a/libinterp/corefcn/__contourc__.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/__contourc__.cc Sat Aug 14 22:48:52 2021 -0400 @@ -154,7 +154,7 @@ { tmp = fabs (pz[pt[1]]) / fabs (pz[pt[0]]); - if (octave::math::isnan (tmp)) + if (math::isnan (tmp)) ct_x = ct_y = 0.5; else { @@ -183,7 +183,7 @@ pt[1] = (pt[0] + 1) % 4; tmp = fabs (pz[pt[1]]) / fabs (pz[pt[0]]); - if (octave::math::isnan (tmp)) + if (math::isnan (tmp)) ct_x = ct_y = 0.5; else {
--- a/libinterp/corefcn/__eigs__.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/__eigs__.cc Sat Aug 14 22:48:52 2021 -0400 @@ -210,7 +210,7 @@ eigs_callback callback; - octave::unwind_protect_var<int> restore_var (call_depth); + unwind_protect_var<int> restore_var (call_depth); call_depth++; if (call_depth > 1) @@ -219,7 +219,7 @@ if (args(0).is_function_handle () || args(0).is_inline_function () || args(0).is_string ()) { - callback.eigs_fcn = octave::get_function_handle (interp, args(0), "x"); + callback.eigs_fcn = get_function_handle (interp, args(0), "x"); if (callback.eigs_fcn.is_undefined ()) error ("eigs: unknown function"); @@ -679,7 +679,7 @@ if (! fcn_name.empty ()) { - octave::symbol_table& symtab = interp.get_symbol_table (); + symbol_table& symtab = interp.get_symbol_table (); symtab.clear_function (fcn_name); }
--- a/libinterp/corefcn/__expint__.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/__expint__.cc Sat Aug 14 22:48:52 2021 -0400 @@ -64,7 +64,7 @@ x = args(0).float_complex_array_value (); // Initialize variables used in algorithm - static const FloatComplex tiny = octave::math::exp2 (-50.0f); + static const FloatComplex tiny = math::exp2 (-50.0f); static const float eps = std::numeric_limits<float>::epsilon (); const FloatComplex cone (1.0, 0.0); const FloatComplex czero (0.0, 0.0); @@ -122,7 +122,7 @@ x = args(0).complex_array_value (); // Initialize variables used in algorithm - static const Complex tiny = octave::math::exp2 (-100.0); + static const Complex tiny = math::exp2 (-100.0); static const double eps = std::numeric_limits<double>::epsilon (); const Complex cone (1.0, 0.0); const Complex czero (0.0, 0.0);
--- a/libinterp/corefcn/__ftp__.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/__ftp__.cc Sat Aug 14 22:48:52 2021 -0400 @@ -73,10 +73,9 @@ ? args(2).xstring_value ("__ftp__: PASSWD must be a string") : ""; - octave::url_handle_manager& uhm = interp.get_url_handle_manager (); + url_handle_manager& uhm = interp.get_url_handle_manager (); - octave::url_handle uh = uhm.make_url_handle (host, user, passwd, - octave_stdout); + url_handle uh = uhm.make_url_handle (host, user, passwd, octave_stdout); return ovl (uh.value ()); } @@ -87,9 +86,9 @@ Undocumented internal function @end deftypefn */) { - octave::url_handle_manager& uhm = interp.get_url_handle_manager (); + url_handle_manager& uhm = interp.get_url_handle_manager (); - octave::url_transfer url_xfer = uhm.get_object (args(0)); + url_transfer url_xfer = uhm.get_object (args(0)); if (! url_xfer.is_valid ()) error ("__ftp_pwd__: invalid ftp handle"); @@ -109,9 +108,9 @@ if (nargin > 1) path = args(1).xstring_value ("__ftp_cwd__: PATH must be a string"); - octave::url_handle_manager& uhm = interp.get_url_handle_manager (); + url_handle_manager& uhm = interp.get_url_handle_manager (); - octave::url_transfer url_xfer = uhm.get_object (args(0)); + url_transfer url_xfer = uhm.get_object (args(0)); if (! url_xfer.is_valid ()) error ("__ftp_cwd__: invalid ftp handle"); @@ -127,9 +126,9 @@ Undocumented internal function @end deftypefn */) { - octave::url_handle_manager& uhm = interp.get_url_handle_manager (); + url_handle_manager& uhm = interp.get_url_handle_manager (); - octave::url_transfer url_xfer = uhm.get_object (args(0)); + url_transfer url_xfer = uhm.get_object (args(0)); if (! url_xfer.is_valid ()) error ("__ftp_dir__: invalid ftp handle"); @@ -198,9 +197,9 @@ Undocumented internal function @end deftypefn */) { - octave::url_handle_manager& uhm = interp.get_url_handle_manager (); + url_handle_manager& uhm = interp.get_url_handle_manager (); - octave::url_transfer url_xfer = uhm.get_object (args(0)); + url_transfer url_xfer = uhm.get_object (args(0)); if (! url_xfer.is_valid ()) error ("__ftp_ascii__: invalid ftp handle"); @@ -216,9 +215,9 @@ Undocumented internal function @end deftypefn */) { - octave::url_handle_manager& uhm = interp.get_url_handle_manager (); + url_handle_manager& uhm = interp.get_url_handle_manager (); - octave::url_transfer url_xfer = uhm.get_object (args(0)); + url_transfer url_xfer = uhm.get_object (args(0)); if (! url_xfer.is_valid ()) error ("__ftp_binary__: invalid ftp handle"); @@ -234,9 +233,9 @@ Undocumented internal function @end deftypefn */) { - octave::url_handle_manager& uhm = interp.get_url_handle_manager (); + url_handle_manager& uhm = interp.get_url_handle_manager (); - octave::url_handle h = uhm.lookup (args(0)); + url_handle h = uhm.lookup (args(0)); if (! h.ok ()) error ("__ftp_close__: invalid ftp handle"); @@ -252,9 +251,9 @@ Undocumented internal function @end deftypefn */) { - octave::url_handle_manager& uhm = interp.get_url_handle_manager (); + url_handle_manager& uhm = interp.get_url_handle_manager (); - octave::url_transfer url_xfer = uhm.get_object (args(0)); + url_transfer url_xfer = uhm.get_object (args(0)); if (! url_xfer.is_valid ()) error ("__ftp_binary__: invalid ftp handle"); @@ -270,9 +269,9 @@ { std::string file = args(1).xstring_value ("__ftp_delete__: FILE must be a string"); - octave::url_handle_manager& uhm = interp.get_url_handle_manager (); + url_handle_manager& uhm = interp.get_url_handle_manager (); - octave::url_transfer url_xfer = uhm.get_object (args(0)); + url_transfer url_xfer = uhm.get_object (args(0)); if (! url_xfer.is_valid ()) error ("__ftp_delete__: invalid ftp handle"); @@ -290,9 +289,9 @@ { std::string dir = args(1).xstring_value ("__ftp_rmdir__: DIR must be a string"); - octave::url_handle_manager& uhm = interp.get_url_handle_manager (); + url_handle_manager& uhm = interp.get_url_handle_manager (); - octave::url_transfer url_xfer = uhm.get_object (args(0)); + url_transfer url_xfer = uhm.get_object (args(0)); if (! url_xfer.is_valid ()) error ("__ftp_rmdir__: invalid ftp handle"); @@ -310,9 +309,9 @@ { std::string dir = args(1).xstring_value ("__ftp_mkdir__: DIR must be a string"); - octave::url_handle_manager& uhm = interp.get_url_handle_manager (); + url_handle_manager& uhm = interp.get_url_handle_manager (); - octave::url_transfer url_xfer = uhm.get_object (args(0)); + url_transfer url_xfer = uhm.get_object (args(0)); if (! url_xfer.is_valid ()) error ("__ftp_mkdir__: invalid ftp handle"); @@ -331,9 +330,9 @@ std::string oldname = args(1).xstring_value ("__ftp_rename__: OLDNAME must be a string"); std::string newname = args(2).xstring_value ("__ftp_rename__: NEWNAME must be a string"); - octave::url_handle_manager& uhm = interp.get_url_handle_manager (); + url_handle_manager& uhm = interp.get_url_handle_manager (); - octave::url_transfer url_xfer = uhm.get_object (args(0)); + url_transfer url_xfer = uhm.get_object (args(0)); if (url_xfer.is_valid ()) error ("__ftp_rename__: invalid ftp handle"); @@ -351,23 +350,23 @@ { std::string pat = args(1).xstring_value ("__ftp_mput__: PATTERN must be a string"); - octave::url_handle_manager& uhm = interp.get_url_handle_manager (); + url_handle_manager& uhm = interp.get_url_handle_manager (); - octave::url_transfer url_xfer = uhm.get_object (args(0)); + url_transfer url_xfer = uhm.get_object (args(0)); if (! url_xfer.is_valid ()) error ("__ftp_mput__: invalid ftp handle"); string_vector file_list; - glob_match pattern (octave::sys::file_ops::tilde_expand (pat)); + glob_match pattern (sys::file_ops::tilde_expand (pat)); string_vector files = pattern.glob (); for (octave_idx_type i = 0; i < files.numel (); i++) { std::string file = files(i); - octave::sys::file_stat fs (file); + sys::file_stat fs (file); if (! fs.exists ()) error ("__ftp__mput: file does not exist"); @@ -383,7 +382,7 @@ { // FIXME: Does ascii mode need to be flagged here? std::ifstream ifile = - octave::sys::ifstream (file.c_str (), + sys::ifstream (file.c_str (), std::ios::in | std::ios::binary); if (! ifile.is_open ()) @@ -421,11 +420,11 @@ if (nargin == 3 && ! args(2).isempty ()) target = args(2).xstring_value ("__ftp_mget__: TARGET must be a string") - + octave::sys::file_ops::dir_sep_str (); + + sys::file_ops::dir_sep_str (); - octave::url_handle_manager& uhm = interp.get_url_handle_manager (); + url_handle_manager& uhm = interp.get_url_handle_manager (); - octave::url_transfer url_xfer = uhm.get_object (args(0)); + url_transfer url_xfer = uhm.get_object (args(0)); if (! url_xfer.is_valid ()) error ("__ftp_mget__: invalid ftp handle"); @@ -451,15 +450,14 @@ else { std::ofstream ofile = - octave::sys::ofstream ((target + sv(i)).c_str (), + sys::ofstream ((target + sv(i)).c_str (), std::ios::out | std::ios::binary); if (! ofile.is_open ()) error ("__ftp_mget__: unable to open file"); - int(*unlink_fptr)(const std::string&) = octave::sys::unlink; - octave::unwind_action_safe delete_file - (unlink_fptr, target + sv(i)); + int(*unlink_fptr)(const std::string&) = sys::unlink; + unwind_action_safe delete_file (unlink_fptr, target + sv(i)); url_xfer.get (sv(i), ofile);
--- a/libinterp/corefcn/__gammainc__.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/__gammainc__.cc Sat Aug 14 22:48:52 2021 -0400 @@ -70,7 +70,7 @@ a = args(1).float_array_value (); // Initialize variables used in algorithm - static const float tiny = octave::math::exp2 (-50.0f); + static const float tiny = math::exp2 (-50.0f); static const float eps = std::numeric_limits<float>::epsilon(); float y, Cj, Dj, bj, aj, Deltaj; int j, maxit; @@ -125,7 +125,7 @@ a = args(1).array_value (); // Initialize variables used in algorithm - static const double tiny = octave::math::exp2 (-100.0); + static const double tiny = math::exp2 (-100.0); static const double eps = std::numeric_limits<double>::epsilon(); double y, Cj, Dj, bj, aj, Deltaj; int j, maxit;
--- a/libinterp/corefcn/__ichol__.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/__ichol__.cc Sat Aug 14 22:48:52 2021 -0400 @@ -437,7 +437,7 @@ SparseMatrix sm_l = Ftril (args(0))(0).sparse_matrix_value (); ichol_t <SparseMatrix, double, ichol_mult_real, ichol_checkpivot_real> - (sm_l, L, octave::xcolnorms (sm_l, 1).fortran_vec (), droptol, michol); + (sm_l, L, xcolnorms (sm_l, 1).fortran_vec (), droptol, michol); return ovl (L); } @@ -446,7 +446,7 @@ SparseComplexMatrix L; SparseComplexMatrix sm_l = Ftril (args(0))(0).sparse_complex_matrix_value (); - Array <Complex> cols_norm = octave::xcolnorms (sm_l, 1); + Array <Complex> cols_norm = xcolnorms (sm_l, 1); ichol_t <SparseComplexMatrix, Complex, ichol_mult_complex, ichol_checkpivot_complex> (sm_l, L, cols_norm.fortran_vec (),
--- a/libinterp/corefcn/__ilu__.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/__ilu__.cc Sat Aug 14 22:48:52 2021 -0400 @@ -484,8 +484,8 @@ SparseMatrix U, L; ilu_crout <SparseMatrix, double> (sm_l, sm_u, L, U, - octave::xcolnorms (sm).fortran_vec (), - octave::xrownorms (sm).fortran_vec (), + xcolnorms (sm).fortran_vec (), + xrownorms (sm).fortran_vec (), droptol, milu); SparseMatrix speye (DiagMatrix (L.cols (), L.cols (), 1.0)); @@ -498,8 +498,8 @@ SparseComplexMatrix sm_u = Ftriu (ovl (sm))(0).sparse_complex_matrix_value (); SparseComplexMatrix sm_l = Ftril (ovl (sm, -1))(0).sparse_complex_matrix_value (); SparseComplexMatrix U, L; - Array<Complex> cols_norm = octave::xcolnorms (sm); - Array<Complex> rows_norm = octave::xrownorms (sm); + Array<Complex> cols_norm = xcolnorms (sm); + Array<Complex> rows_norm = xrownorms (sm); ilu_crout <SparseComplexMatrix, Complex> (sm_l, sm_u, L, U, cols_norm.fortran_vec (), @@ -894,7 +894,7 @@ { U = U.transpose (); // The diagonal, conveniently permuted is added to U - U += diag.index (octave::idx_vector::colon, perm_vec); + U += diag.index (idx_vector::colon, perm_vec); L = L.transpose (); } } @@ -925,9 +925,9 @@ nnz_l = (Ftril (ovl (sm, -1))(0).sparse_matrix_value ()).nnz (); Array <double> rc_norm; if (milu == "row") - rc_norm = octave::xrownorms (sm); + rc_norm = xrownorms (sm); else - rc_norm = octave::xcolnorms (sm); + rc_norm = xcolnorms (sm); Array <octave_idx_type> perm (dim_vector (sm.cols (), 1)); ilu_tp <SparseMatrix, double> (sm, L, U, nnz_u, nnz_l, @@ -940,8 +940,8 @@ retval(0) = L + speye; if (nargout == 3) { - retval(1) = U.index (octave::idx_vector::colon, perm); - retval(2) = speye.index (octave::idx_vector::colon, perm); + retval(1) = U.index (idx_vector::colon, perm); + retval(2) = speye.index (idx_vector::colon, perm); } else retval(1) = U; @@ -951,11 +951,11 @@ retval(1) = U; if (nargout == 3) { - retval(0) = L.index (perm, octave::idx_vector::colon) + speye; - retval(2) = speye.index (perm, octave::idx_vector::colon); + retval(0) = L.index (perm, idx_vector::colon) + speye; + retval(2) = speye.index (perm, idx_vector::colon); } else - retval(0) = L + speye.index (octave::idx_vector::colon, perm); + retval(0) = L + speye.index (idx_vector::colon, perm); } } else @@ -966,9 +966,9 @@ nnz_l = (Ftril (ovl (sm, -1))(0).sparse_complex_matrix_value ()).nnz (); Array <Complex> rc_norm; if (milu == "row") - rc_norm = octave::xrownorms (sm); + rc_norm = xrownorms (sm); else - rc_norm = octave::xcolnorms (sm); + rc_norm = xcolnorms (sm); Array <octave_idx_type> perm (dim_vector (sm.cols (), 1)); ilu_tp <SparseComplexMatrix, Complex> @@ -981,8 +981,8 @@ retval(0) = L + speye; if (nargout == 3) { - retval(1) = U.index (octave::idx_vector::colon, perm); - retval(2) = speye.index (octave::idx_vector::colon, perm); + retval(1) = U.index (idx_vector::colon, perm); + retval(2) = speye.index (idx_vector::colon, perm); } else if (nargout == 2) retval(1) = U; @@ -992,11 +992,11 @@ retval(1) = U; if (nargout == 3) { - retval(0) = L.index (perm, octave::idx_vector::colon) + speye; - retval(2) = speye.index (perm, octave::idx_vector::colon); + retval(0) = L.index (perm, idx_vector::colon) + speye; + retval(2) = speye.index (perm, idx_vector::colon); } else - retval(0) = L + speye.index (octave::idx_vector::colon, perm); + retval(0) = L + speye.index (idx_vector::colon, perm); } }
--- a/libinterp/corefcn/__magick_read__.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/__magick_read__.cc Sat Aug 14 22:48:52 2021 -0400 @@ -143,17 +143,17 @@ // width 1. In those cases, the type will come as scalar instead of range // since that's the behavior of the colon operator (1:1:1 will be a scalar, // not a range). -static octave::range<double> +static range<double> get_region_range (const octave_value& region) { - octave::range<double> output; + range<double> output; if (region.is_range ()) output = region.range_value (); else if (region.is_scalar_type ()) { double value = region.scalar_value (); - output = octave::range<double> (value, value); + output = range<double> (value, value); } else if (region.is_matrix_type ()) { @@ -161,7 +161,7 @@ double base = array(0); double limit = array(array.numel () - 1); double incr = array(1) - base; - output = octave::range<double> (base, incr, limit); + output = range<double> (base, incr, limit); } else error ("__magick_read__: unknown datatype for Region option"); @@ -183,8 +183,8 @@ // Subtract 1 to account for 0 indexing. - const octave::range<double> rows = get_region_range (pixel_region (0)); - const octave::range<double> cols = get_region_range (pixel_region (1)); + const range<double> rows = get_region_range (pixel_region (0)); + const range<double> cols = get_region_range (pixel_region (1)); m_row_start = rows.base () - 1; m_col_start = cols.base () - 1; @@ -761,7 +761,7 @@ // to open files on disc. In contrast, the API of ImageMagick uses UTF-8 // encoded strings. Should we somehow detect which is used on runtime and // pass the file names accordingly? (See also bug #58493.) - std::string ascii_fname = octave::sys::get_ASCII_filename (filename, true); + std::string ascii_fname = sys::get_ASCII_filename (filename, true); try { @@ -790,7 +790,7 @@ const std::string locale = (static_locale ? static_locale : ""); const std::string program_name - = octave::sys::env::get_program_invocation_name (); + = sys::env::get_program_invocation_name (); Magick::InitializeMagick (program_name.c_str ()); // Restore locale from before GraphicsMagick initialisation @@ -1203,7 +1203,7 @@ { for (octave_idx_type row = 0; row < nRows; row++) { - const double grey = octave::math::round (double (*img_fvec) / divisor); + const double grey = math::round (double (*img_fvec) / divisor); Magick::Color c (grey, grey, grey); pix[GM_idx] = c; img_fvec++; @@ -1234,9 +1234,9 @@ { for (octave_idx_type row = 0; row < nRows; row++) { - double grey = octave::math::round (double (*img_fvec) / divisor); + double grey = math::round (double (*img_fvec) / divisor); Magick::Color c (grey, grey, grey, - MaxRGB - octave::math::round (double (*a_fvec) / divisor)); + MaxRGB - math::round (double (*a_fvec) / divisor)); pix[GM_idx] = c; img_fvec++; a_fvec++; @@ -1270,9 +1270,9 @@ { for (octave_idx_type row = 0; row < nRows; row++) { - Magick::Color c (octave::math::round (double (*img_fvec) / divisor), - octave::math::round (double (img_fvec[G_offset]) / divisor), - octave::math::round (double (img_fvec[B_offset]) / divisor)); + Magick::Color c (math::round (double (*img_fvec) / divisor), + math::round (double (img_fvec[G_offset]) / divisor), + math::round (double (img_fvec[B_offset]) / divisor)); pix[GM_idx] = c; img_fvec++; GM_idx += nCols; @@ -1306,10 +1306,10 @@ { for (octave_idx_type row = 0; row < nRows; row++) { - Magick::Color c (octave::math::round (double (*img_fvec) / divisor), - octave::math::round (double (img_fvec[G_offset]) / divisor), - octave::math::round (double (img_fvec[B_offset]) / divisor), - MaxRGB - octave::math::round (double (*a_fvec) / divisor)); + Magick::Color c (math::round (double (*img_fvec) / divisor), + math::round (double (img_fvec[G_offset]) / divisor), + math::round (double (img_fvec[B_offset]) / divisor), + MaxRGB - math::round (double (*a_fvec) / divisor)); pix[GM_idx] = c; img_fvec++; a_fvec++; @@ -1345,10 +1345,10 @@ { for (octave_idx_type row = 0; row < nRows; row++) { - Magick::Color c (octave::math::round (double (*img_fvec) / divisor), - octave::math::round (double (img_fvec[M_offset]) / divisor), - octave::math::round (double (img_fvec[Y_offset]) / divisor), - octave::math::round (double (img_fvec[K_offset]) / divisor)); + Magick::Color c (math::round (double (*img_fvec) / divisor), + math::round (double (img_fvec[M_offset]) / divisor), + math::round (double (img_fvec[Y_offset]) / divisor), + math::round (double (img_fvec[K_offset]) / divisor)); pix[GM_idx] = c; img_fvec++; GM_idx += nCols; @@ -1384,12 +1384,12 @@ { for (octave_idx_type row = 0; row < nRows; row++) { - Magick::Color c (octave::math::round (double (*img_fvec) / divisor), - octave::math::round (double (img_fvec[M_offset]) / divisor), - octave::math::round (double (img_fvec[Y_offset]) / divisor), - octave::math::round (double (img_fvec[K_offset]) / divisor)); + Magick::Color c (math::round (double (*img_fvec) / divisor), + math::round (double (img_fvec[M_offset]) / divisor), + math::round (double (img_fvec[Y_offset]) / divisor), + math::round (double (img_fvec[K_offset]) / divisor)); pix[GM_idx] = c; - ind[GM_idx] = MaxRGB - octave::math::round (double (*a_fvec) / divisor); + ind[GM_idx] = MaxRGB - math::round (double (*a_fvec) / divisor); img_fvec++; a_fvec++; GM_idx += nCols; @@ -1582,7 +1582,7 @@ // If writemode is set to append, read the image and append to it. Even // if set to append, make sure that something was read at all. const std::string writemode = options.getfield ("writemode").string_value (); - if (writemode == "append" && octave::sys::file_stat (filename).exists ()) + if (writemode == "append" && sys::file_stat (filename).exists ()) { std::vector<Magick::Image> ini_imvec; read_file (filename, ini_imvec); @@ -1701,7 +1701,7 @@ // to open files on disc. In contrast, the API of ImageMagick uses UTF-8 // encoded strings. Should we somehow detect which is used on runtime and // pass the file names accordingly? (See also bug #58493.) - std::string ascii_fname = octave::sys::get_ASCII_filename (filename, true); + std::string ascii_fname = sys::get_ASCII_filename (filename, true); try { @@ -2008,12 +2008,12 @@ // We can't actually get FormatVersion but even Matlab sometimes can't. template_info.setfield ("FormatVersion", octave_value ("")); - const octave::sys::file_stat fs (filename); + const sys::file_stat fs (filename); if (! fs) error ("imfinfo: error reading '%s': %s", filename.c_str (), fs.error ().c_str ()); - const octave::sys::localtime mtime (fs.mtime ()); + const sys::localtime mtime (fs.mtime ()); const std::string filetime = mtime.strftime ("%e-%b-%Y %H:%M:%S"); template_info.setfield ("Filename", octave_value (filename)); template_info.setfield ("FileModDate", octave_value (filetime));
--- a/libinterp/corefcn/__pchip_deriv__.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/__pchip_deriv__.cc Sat Aug 14 22:48:52 2021 -0400 @@ -59,7 +59,7 @@ FloatColumnVector xvec (args(0).float_vector_value ()); FloatMatrix ymat (args(1).float_matrix_value ()); - F77_INT nx = octave::to_f77_int (xvec.numel ()); + F77_INT nx = to_f77_int (xvec.numel ()); if (nx < 2) error ("__pchip_deriv__: X must be at least of length 2"); @@ -73,7 +73,7 @@ FloatMatrix dmat (nyr, nyc); F77_INT ierr; - const F77_INT incfd = (rows ? octave::to_f77_int (nyr) : 1); + const F77_INT incfd = (rows ? to_f77_int (nyr) : 1); volatile const octave_idx_type inc = (rows ? 1 : nyr); volatile octave_idx_type k = 0; @@ -98,7 +98,7 @@ ColumnVector xvec (args(0).vector_value ()); Matrix ymat (args(1).matrix_value ()); - F77_INT nx = octave::to_f77_int (xvec.numel ()); + F77_INT nx = to_f77_int (xvec.numel ()); if (nx < 2) error ("__pchip_deriv__: X must be at least of length 2"); @@ -112,7 +112,7 @@ Matrix dmat (nyr, nyc); F77_INT ierr; - const F77_INT incfd = (rows ? octave::to_f77_int (nyr) : 1); + const F77_INT incfd = (rows ? to_f77_int (nyr) : 1); volatile const octave_idx_type inc = (rows ? 1 : nyr); volatile octave_idx_type k = 0;
--- a/libinterp/corefcn/__qp__.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/__qp__.cc Sat Aug 14 22:48:52 2021 -0400 @@ -66,7 +66,7 @@ if (! A.isempty ()) { - octave::math::svd<Matrix> A_svd (A); + math::svd<Matrix> A_svd (A); DiagMatrix S = A_svd.singular_values (); @@ -159,7 +159,7 @@ { eigH = EIG (H); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { error (ee, "qp: failed to compute eigenvalues of H"); } @@ -201,11 +201,11 @@ // factorization since the Hessian is positive // definite. - octave::math::chol<Matrix> cholH (H); + math::chol<Matrix> cholH (H); R = cholH.chol_matrix (); - Matrix Hinv = octave::math::chol2inv (R); + Matrix Hinv = math::chol2inv (R); // Computing the unconstrained step. // p = -Hinv * g; @@ -260,7 +260,7 @@ // Computing the Cholesky factorization (pR = 0 means // that the reduced Hessian was positive definite). - octave::math::chol<Matrix> cholrH (rH, pR); + math::chol<Matrix> cholrH (rH, pR); Matrix tR = cholrH.chol_matrix (); if (pR == 0) R = tR; @@ -275,7 +275,7 @@ { // Using the Cholesky factorization to invert rH - Matrix rHinv = octave::math::chol2inv (R); + Matrix rHinv = math::chol2inv (R); ColumnVector pz = -rHinv * Zt * g; @@ -300,7 +300,7 @@ { eigrH = EIG (rH); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { error (ee, "qp: failed to compute eigenvalues of rH"); }
--- a/libinterp/corefcn/amd.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/amd.cc Sat Aug 14 22:48:52 2021 -0400 @@ -89,7 +89,7 @@ print_usage (); octave_idx_type n_row, n_col; - const octave::suitesparse_integer *ridx, *cidx; + const suitesparse_integer *ridx, *cidx; SparseMatrix sm; SparseComplexMatrix scm; @@ -100,16 +100,16 @@ scm = args(0).sparse_complex_matrix_value (); n_row = scm.rows (); n_col = scm.cols (); - ridx = octave::to_suitesparse_intptr (scm.xridx ()); - cidx = octave::to_suitesparse_intptr (scm.xcidx ()); + ridx = to_suitesparse_intptr (scm.xridx ()); + cidx = to_suitesparse_intptr (scm.xcidx ()); } else { sm = args(0).sparse_matrix_value (); n_row = sm.rows (); n_col = sm.cols (); - ridx = octave::to_suitesparse_intptr (sm.xridx ()); - cidx = octave::to_suitesparse_intptr (sm.xcidx ()); + ridx = to_suitesparse_intptr (sm.xridx ()); + cidx = to_suitesparse_intptr (sm.xcidx ()); } } else @@ -121,8 +121,8 @@ n_row = sm.rows (); n_col = sm.cols (); - ridx = octave::to_suitesparse_intptr (sm.xridx ()); - cidx = octave::to_suitesparse_intptr (sm.xcidx ()); + ridx = to_suitesparse_intptr (sm.xridx ()); + cidx = to_suitesparse_intptr (sm.xcidx ()); } if (n_row != n_col) @@ -145,7 +145,7 @@ Control[AMD_AGGRESSIVE] = tmp.double_value (); } - OCTAVE_LOCAL_BUFFER (octave::suitesparse_integer, P, n_col); + OCTAVE_LOCAL_BUFFER (suitesparse_integer, P, n_col); Matrix xinfo (AMD_INFO, 1); double *Info = xinfo.fortran_vec ();
--- a/libinterp/corefcn/balance.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/balance.cc Sat Aug 14 22:48:52 2021 -0400 @@ -152,7 +152,7 @@ { if (complex_case) { - octave::math::aepbalance<FloatComplexMatrix> result (fcaa, noperm, noscal); + math::aepbalance<FloatComplexMatrix> result (fcaa, noperm, noscal); if (nargout == 0 || nargout == 1) retval = ovl (result.balanced_matrix ()); @@ -166,7 +166,7 @@ } else { - octave::math::aepbalance<FloatMatrix> result (faa, noperm, noscal); + math::aepbalance<FloatMatrix> result (faa, noperm, noscal); if (nargout == 0 || nargout == 1) retval = ovl (result.balanced_matrix ()); @@ -183,7 +183,7 @@ { if (complex_case) { - octave::math::aepbalance<ComplexMatrix> result (caa, noperm, noscal); + math::aepbalance<ComplexMatrix> result (caa, noperm, noscal); if (nargout == 0 || nargout == 1) retval = ovl (result.balanced_matrix ()); @@ -197,7 +197,7 @@ } else { - octave::math::aepbalance<Matrix> result (aa, noperm, noscal); + math::aepbalance<Matrix> result (aa, noperm, noscal); if (nargout == 0 || nargout == 1) retval = ovl (result.balanced_matrix ()); @@ -251,7 +251,7 @@ { if (complex_case) { - octave::math::gepbalance<FloatComplexMatrix> result (fcaa, fcbb, bal_job); + math::gepbalance<FloatComplexMatrix> result (fcaa, fcbb, bal_job); switch (nargout) { @@ -280,7 +280,7 @@ } else { - octave::math::gepbalance<FloatMatrix> result (faa, fbb, bal_job); + math::gepbalance<FloatMatrix> result (faa, fbb, bal_job); switch (nargout) { @@ -312,7 +312,7 @@ { if (complex_case) { - octave::math::gepbalance<ComplexMatrix> result (caa, cbb, bal_job); + math::gepbalance<ComplexMatrix> result (caa, cbb, bal_job); switch (nargout) { @@ -341,7 +341,7 @@ } else { - octave::math::gepbalance<Matrix> result (aa, bb, bal_job); + math::gepbalance<Matrix> result (aa, bb, bal_job); switch (nargout) {
--- a/libinterp/corefcn/besselj.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/besselj.cc Sat Aug 14 22:48:52 2021 -0400 @@ -53,27 +53,27 @@ switch (type) \ { \ case BESSEL_J: \ - result = octave::math::besselj (alpha, x, scaled, ierr); \ + result = math::besselj (alpha, x, scaled, ierr); \ break; \ \ case BESSEL_Y: \ - result = octave::math::bessely (alpha, x, scaled, ierr); \ + result = math::bessely (alpha, x, scaled, ierr); \ break; \ \ case BESSEL_I: \ - result = octave::math::besseli (alpha, x, scaled, ierr); \ + result = math::besseli (alpha, x, scaled, ierr); \ break; \ \ case BESSEL_K: \ - result = octave::math::besselk (alpha, x, scaled, ierr); \ + result = math::besselk (alpha, x, scaled, ierr); \ break; \ \ case BESSEL_H1: \ - result = octave::math::besselh1 (alpha, x, scaled, ierr); \ + result = math::besselh1 (alpha, x, scaled, ierr); \ break; \ \ case BESSEL_H2: \ - result = octave::math::besselh2 (alpha, x, scaled, ierr); \ + result = math::besselh2 (alpha, x, scaled, ierr); \ break; \ \ default: \ @@ -689,9 +689,9 @@ octave_value result; if (kind > 1) - result = octave::math::biry (z, kind == 3, scale, ierr); + result = math::biry (z, kind == 3, scale, ierr); else - result = octave::math::airy (z, kind == 1, scale, ierr); + result = math::airy (z, kind == 1, scale, ierr); retval(0) = result; if (nargout > 1) @@ -705,9 +705,9 @@ octave_value result; if (kind > 1) - result = octave::math::biry (z, kind == 3, scale, ierr); + result = math::biry (z, kind == 3, scale, ierr); else - result = octave::math::airy (z, kind == 1, scale, ierr); + result = math::airy (z, kind == 1, scale, ierr); retval(0) = result; if (nargout > 1)
--- a/libinterp/corefcn/bsxfun.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/bsxfun.cc Sat Aug 14 22:48:52 2021 -0400 @@ -348,7 +348,7 @@ { std::string name = func.string_value (); - octave::symbol_table& symtab = interp.get_symbol_table (); + symbol_table& symtab = interp.get_symbol_table (); func = symtab.find_function (name); @@ -414,14 +414,14 @@ octave_value_list inputs (2); inputs(0) = A; inputs(1) = B; - retval = octave::feval (func, inputs, 1); + retval = feval (func, inputs, 1); } else if (dvc.numel () < 1) { octave_value_list inputs (2); inputs(0) = A.resize (dvc); inputs(1) = B.resize (dvc); - retval = octave::feval (func, inputs, 1); + retval = feval (func, inputs, 1); } else { @@ -463,7 +463,7 @@ if (maybe_update_column (Bc, B, dvb, dvc, i, idxB)) inputs(1) = Bc; - octave_value_list tmp = octave::feval (func, inputs, 1); + octave_value_list tmp = feval (func, inputs, 1); #define BSXINIT(T, CLS, EXTRACTOR) \ (result_type == CLS) \ @@ -542,7 +542,7 @@ { have_NDArray = false; C = result_NDArray; - C = octave::cat_op (C, tmp(0), ra_idx); + C = cat_op (C, tmp(0), ra_idx); } else if (tmp(0).isreal ()) result_NDArray.insert (tmp(0).array_value (), ra_idx); @@ -562,7 +562,7 @@ { have_FloatNDArray = false; C = result_FloatNDArray; - C = octave::cat_op (C, tmp(0), ra_idx); + C = cat_op (C, tmp(0), ra_idx); } else if (tmp(0).isreal ()) result_FloatNDArray.insert @@ -585,7 +585,7 @@ { \ have_ ## T = false; \ C = result_ ## T; \ - C = octave::cat_op (C, tmp(0), ra_idx); \ + C = cat_op (C, tmp(0), ra_idx); \ } \ else \ result_ ## T .insert (tmp(0). EXTRACTOR ## _array_value (), ra_idx); \ @@ -603,7 +603,7 @@ else if BSXLOOP(uint32NDArray, "uint32", uint32) else if BSXLOOP(uint64NDArray, "uint64", uint64) else - C = octave::cat_op (C, tmp(0), ra_idx); + C = cat_op (C, tmp(0), ra_idx); } }
--- a/libinterp/corefcn/call-stack.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/call-stack.cc Sat Aug 14 22:48:52 2021 -0400 @@ -1152,7 +1152,7 @@ @seealso{max_recursion_depth} @end deftypefn */) { - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); return tw.max_stack_depth (args, nargout); } @@ -1208,7 +1208,7 @@ string_vector argv = args.make_argv ("who"); - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); return tw.do_who (argc, argv, nargout == 1); } @@ -1296,7 +1296,7 @@ string_vector argv = args.make_argv ("whos"); - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); return tw.do_who (argc, argv, nargout == 1, true); }
--- a/libinterp/corefcn/ccolamd.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/ccolamd.cc Sat Aug 14 22:48:52 2021 -0400 @@ -256,28 +256,28 @@ } // Allocate workspace for ccolamd - OCTAVE_LOCAL_BUFFER (octave::suitesparse_integer, p, n_col+1); + OCTAVE_LOCAL_BUFFER (suitesparse_integer, p, n_col+1); for (octave_idx_type i = 0; i < n_col+1; i++) p[i] = cidx[i]; octave_idx_type Alen = CCOLAMD_NAME (_recommended) (nnz, n_row, n_col); - OCTAVE_LOCAL_BUFFER (octave::suitesparse_integer, A, Alen); + OCTAVE_LOCAL_BUFFER (suitesparse_integer, A, Alen); for (octave_idx_type i = 0; i < nnz; i++) A[i] = ridx[i]; static_assert (CCOLAMD_STATS <= 40, "ccolamd: # of CCOLAMD_STATS exceeded. Please report this to bugs.octave.org"); - octave::suitesparse_integer stats_storage[CCOLAMD_STATS]; - octave::suitesparse_integer *stats = &stats_storage[0]; + suitesparse_integer stats_storage[CCOLAMD_STATS]; + suitesparse_integer *stats = &stats_storage[0]; if (nargin > 2) { NDArray in_cmember = args(2).array_value (); octave_idx_type cslen = in_cmember.numel (); - OCTAVE_LOCAL_BUFFER (octave::suitesparse_integer, cmember, cslen); + OCTAVE_LOCAL_BUFFER (suitesparse_integer, cmember, cslen); for (octave_idx_type i = 0; i < cslen; i++) // convert cmember from 1-based to 0-based - cmember[i] = static_cast<octave::suitesparse_integer>(in_cmember(i) - 1); + cmember[i] = static_cast<suitesparse_integer>(in_cmember(i) - 1); if (cslen != n_col) error ("ccolamd: CMEMBER must be of length equal to #cols of A"); @@ -505,17 +505,17 @@ err_square_matrix_required ("csymamd", "S"); // Allocate workspace for symamd - OCTAVE_LOCAL_BUFFER (octave::suitesparse_integer, perm, n_col+1); + OCTAVE_LOCAL_BUFFER (suitesparse_integer, perm, n_col+1); static_assert (CCOLAMD_STATS <= 40, "csymamd: # of CCOLAMD_STATS exceeded. Please report this to bugs.octave.org"); - octave::suitesparse_integer stats_storage[CCOLAMD_STATS]; - octave::suitesparse_integer *stats = &stats_storage[0]; + suitesparse_integer stats_storage[CCOLAMD_STATS]; + suitesparse_integer *stats = &stats_storage[0]; if (nargin > 2) { NDArray in_cmember = args(2).array_value (); octave_idx_type cslen = in_cmember.numel (); - OCTAVE_LOCAL_BUFFER (octave::suitesparse_integer, cmember, cslen); + OCTAVE_LOCAL_BUFFER (suitesparse_integer, cmember, cslen); for (octave_idx_type i = 0; i < cslen; i++) // convert cmember from 1-based to 0-based cmember[i] = static_cast<octave_idx_type> (in_cmember(i) - 1); @@ -524,8 +524,8 @@ error ("csymamd: CMEMBER must be of length equal to #cols of A"); if (! CSYMAMD_NAME () (n_col, - octave::to_suitesparse_intptr (ridx), - octave::to_suitesparse_intptr (cidx), + to_suitesparse_intptr (ridx), + to_suitesparse_intptr (cidx), perm, knobs, stats, &calloc, &free, cmember, -1)) { CSYMAMD_NAME (_report)(stats); @@ -536,8 +536,8 @@ else { if (! CSYMAMD_NAME () (n_col, - octave::to_suitesparse_intptr (ridx), - octave::to_suitesparse_intptr (cidx), + to_suitesparse_intptr (ridx), + to_suitesparse_intptr (cidx), perm, knobs, stats, &calloc, &free, nullptr, -1)) { CSYMAMD_NAME (_report)(stats);
--- a/libinterp/corefcn/cellfun.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/cellfun.cc Sat Aug 14 22:48:52 2021 -0400 @@ -68,7 +68,7 @@ OCTAVE_NAMESPACE_BEGIN static octave_value_list -get_output_list (octave::error_system& es, +get_output_list (error_system& es, octave_idx_type count, octave_idx_type nargout, const octave_value_list& inputlist, octave_value& func, @@ -80,14 +80,14 @@ try { - tmp = octave::feval (func, inputlist, nargout); + tmp = feval (func, inputlist, nargout); } - catch (const octave::execution_exception& ee) + catch (const execution_exception& ee) { if (error_handler.is_defined ()) { - octave::interpreter& interp - = octave::__get_interpreter__ ("get_output_list"); + interpreter& interp + = __get_interpreter__ ("get_output_list"); es.save_exception (ee); interp.recover_from_exception (); @@ -112,7 +112,7 @@ octave_value_list errlist = inputlist; errlist.prepend (msg); - tmp = octave::feval (error_handler, errlist, nargout); + tmp = feval (error_handler, errlist, nargout); } else tmp.clear (); @@ -225,7 +225,7 @@ } static void -get_mapper_fun_options (octave::symbol_table& symtab, +get_mapper_fun_options (symbol_table& symtab, const octave_value_list& args, int& nargin, bool& uniform_output, octave_value& error_handler) @@ -237,9 +237,9 @@ std::size_t compare_len = std::max (arg.length (), static_cast<std::size_t> (2)); - if (octave::string::strncmpi (arg, "uniformoutput", compare_len)) + if (string::strncmpi (arg, "uniformoutput", compare_len)) uniform_output = args(nargin-1).bool_value (); - else if (octave::string::strncmpi (arg, "errorhandler", compare_len)) + else if (string::strncmpi (arg, "errorhandler", compare_len)) { if (args(nargin-1).is_function_handle () || args(nargin-1).is_inline_function ()) @@ -419,7 +419,7 @@ octave_value func = args(0); - octave::symbol_table& symtab = interp.get_symbol_table (); + symbol_table& symtab = interp.get_symbol_table (); if (func.is_string ()) { @@ -432,8 +432,8 @@ std::string name = args(0).string_value (); - if (! octave::valid_identifier (name)) - func = octave::get_function_handle (interp, args(0), "x"); + if (! valid_identifier (name)) + func = get_function_handle (interp, args(0), "x"); else { func = symtab.find_function (name); @@ -537,7 +537,7 @@ } } - octave::error_system& es = interp.get_error_system (); + error_system& es = interp.get_error_system (); // Apply functions. @@ -1149,15 +1149,15 @@ bool symbol_table_lookup = false; octave_value func = args(0); - octave::symbol_table& symtab = interp.get_symbol_table (); + symbol_table& symtab = interp.get_symbol_table (); if (func.is_string ()) { // See if we can convert the string into a function. std::string name = args(0).string_value (); - if (! octave::valid_identifier (name)) - func = octave::get_function_handle (interp, args(0), "x"); + if (! valid_identifier (name)) + func = get_function_handle (interp, args(0), "x"); else { func = symtab.find_function (name); @@ -1243,7 +1243,7 @@ } } - octave::error_system& es = interp.get_error_system (); + error_system& es = interp.get_error_system (); // Apply functions. @@ -1923,14 +1923,14 @@ { octave_idx_type nidx = (idim < nd ? d[idim].numel () : 1); if (nidx == 1) - idx[0] = octave::idx_vector::colon; + idx[0] = idx_vector::colon; else { octave_idx_type l = 0; for (octave_idx_type i = 0; i < nidx; i++) { octave_idx_type u = l + d[idim](i); - idx[i] = octave::idx_vector (l, u); + idx[i] = idx_vector (l, u); l = u; } } @@ -1968,17 +1968,17 @@ for (octave_idx_type i = 0; i < nidx; i++) { octave_idx_type u = l + d[ivec](i); - retval.xelem (i) = a.index (octave::idx_vector (l, u)); + retval.xelem (i) = a.index (idx_vector (l, u)); l = u; } } else { // General 2D case. Use 2D indexing. - OCTAVE_LOCAL_BUFFER (octave::idx_vector, ridx, nridx); + OCTAVE_LOCAL_BUFFER (idx_vector, ridx, nridx); prepare_idx (ridx, 0, nd, d); - OCTAVE_LOCAL_BUFFER (octave::idx_vector, cidx, ncidx); + OCTAVE_LOCAL_BUFFER (idx_vector, cidx, ncidx); prepare_idx (cidx, 1, nd, d); for (octave_idx_type j = 0; j < ncidx; j++) @@ -2017,8 +2017,8 @@ retval.clear (rdv); - OCTAVE_LOCAL_BUFFER (octave::idx_vector, xidx, idxtot); - OCTAVE_LOCAL_BUFFER (octave::idx_vector *, idx, nd); + OCTAVE_LOCAL_BUFFER (idx_vector, xidx, idxtot); + OCTAVE_LOCAL_BUFFER (idx_vector *, idx, nd); idxtot = 0; for (int i = 0; i < nd; i++) @@ -2029,8 +2029,8 @@ } OCTAVE_LOCAL_BUFFER_INIT (octave_idx_type, ridx, nd, 0); - Array<octave::idx_vector> ra_idx - (dim_vector (1, std::max (nd, a.ndims ())), octave::idx_vector::colon); + Array<idx_vector> ra_idx + (dim_vector (1, std::max (nd, a.ndims ())), idx_vector::colon); for (octave_idx_type j = 0; j < retval.numel (); j++) { @@ -2303,7 +2303,7 @@ || (dim == 1 && array.rows () == 1))) { for (octave_idx_type i = 0; i < n; i++) - retval.xelem (i) = array.index (octave::idx_vector (lb(i) - 1, ub(i))); + retval.xelem (i) = array.index (idx_vector (lb(i) - 1, ub(i))); } else { @@ -2313,11 +2313,11 @@ dim = dv.first_non_singleton (); ndims = std::max (ndims, dim + 1); - Array<octave::idx_vector> idx (dim_vector (ndims, 1), octave::idx_vector::colon); + Array<idx_vector> idx (dim_vector (ndims, 1), idx_vector::colon); for (octave_idx_type i = 0; i < n; i++) { - idx(dim) = octave::idx_vector (lb(i) - 1, ub(i)); + idx(dim) = idx_vector (lb(i) - 1, ub(i)); retval.xelem (i) = array.index (idx); } } @@ -2437,7 +2437,7 @@ octave_value_list idx (ndims, octave_value::magic_colon_t); for (octave_idx_type i = 0; i < n; i++) { - idx(dim) = octave::range<double> (lb(i), ub(i)); + idx(dim) = range<double> (lb(i), ub(i)); retcell.xelem (i) = x.index_op (idx); } }
--- a/libinterp/corefcn/chol.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/chol.cc Sat Aug 14 22:48:52 2021 -0400 @@ -166,11 +166,11 @@ { std::string tmp = args(n++).xstring_value ("chol: optional arguments must be strings"); - if (octave::string::strcmpi (tmp, "vector")) + if (string::strcmpi (tmp, "vector")) vecout = true; - else if (octave::string::strcmpi (tmp, "lower")) + else if (string::strcmpi (tmp, "lower")) LLt = true; - else if (octave::string::strcmpi (tmp, "upper")) + else if (string::strcmpi (tmp, "upper")) LLt = false; else error (R"(chol: optional argument must be one of "vector", "lower", or "upper")"); @@ -192,7 +192,7 @@ { SparseMatrix m = arg.sparse_matrix_value (); - octave::math::sparse_chol<SparseMatrix> fact (m, info, natural, force); + math::sparse_chol<SparseMatrix> fact (m, info, natural, force); if (nargout == 3) { @@ -217,7 +217,7 @@ { SparseComplexMatrix m = arg.sparse_complex_matrix_value (); - octave::math::sparse_chol<SparseComplexMatrix> fact (m, info, natural, force); + math::sparse_chol<SparseComplexMatrix> fact (m, info, natural, force); if (nargout == 3) { @@ -251,7 +251,7 @@ octave_idx_type info; - octave::math::chol<FloatMatrix> fact (m, info, LLt != true); + math::chol<FloatMatrix> fact (m, info, LLt != true); if (nargout == 2 || info == 0) retval = ovl (get_chol (fact), info); @@ -264,7 +264,7 @@ octave_idx_type info; - octave::math::chol<FloatComplexMatrix> fact (m, info, LLt != true); + math::chol<FloatComplexMatrix> fact (m, info, LLt != true); if (nargout == 2 || info == 0) retval = ovl (get_chol (fact), info); @@ -284,7 +284,7 @@ octave_idx_type info; - octave::math::chol<Matrix> fact (m, info, LLt != true); + math::chol<Matrix> fact (m, info, LLt != true); if (nargout == 2 || info == 0) retval = ovl (get_chol (fact), info); @@ -297,7 +297,7 @@ octave_idx_type info; - octave::math::chol<ComplexMatrix> fact (m, info, LLt != true); + math::chol<ComplexMatrix> fact (m, info, LLt != true); if (nargout == 2 || info == 0) retval = ovl (get_chol (fact), info); @@ -385,7 +385,7 @@ { SparseMatrix m = arg.sparse_matrix_value (); - octave::math::sparse_chol<SparseMatrix> chol (m, info); + math::sparse_chol<SparseMatrix> chol (m, info); if (info == 0) retval = chol.inverse (); @@ -396,7 +396,7 @@ { SparseComplexMatrix m = arg.sparse_complex_matrix_value (); - octave::math::sparse_chol<SparseComplexMatrix> chol (m, info); + math::sparse_chol<SparseComplexMatrix> chol (m, info); if (info == 0) retval = chol.inverse (); @@ -413,7 +413,7 @@ FloatMatrix m = arg.float_matrix_value (); octave_idx_type info; - octave::math::chol<FloatMatrix> chol (m, info); + math::chol<FloatMatrix> chol (m, info); if (info == 0) retval = chol.inverse (); else @@ -424,7 +424,7 @@ FloatComplexMatrix m = arg.float_complex_matrix_value (); octave_idx_type info; - octave::math::chol<FloatComplexMatrix> chol (m, info); + math::chol<FloatComplexMatrix> chol (m, info); if (info == 0) retval = chol.inverse (); else @@ -440,7 +440,7 @@ Matrix m = arg.matrix_value (); octave_idx_type info; - octave::math::chol<Matrix> chol (m, info); + math::chol<Matrix> chol (m, info); if (info == 0) retval = chol.inverse (); else @@ -451,7 +451,7 @@ ComplexMatrix m = arg.complex_matrix_value (); octave_idx_type info; - octave::math::chol<ComplexMatrix> chol (m, info); + math::chol<ComplexMatrix> chol (m, info); if (info == 0) retval = chol.inverse (); else @@ -512,13 +512,13 @@ { SparseMatrix r = arg.sparse_matrix_value (); - retval = octave::math::chol2inv (r); + retval = math::chol2inv (r); } else if (arg.iscomplex ()) { SparseComplexMatrix r = arg.sparse_complex_matrix_value (); - retval = octave::math::chol2inv (r); + retval = math::chol2inv (r); } else err_wrong_type_arg ("chol2inv", arg); @@ -529,13 +529,13 @@ { FloatMatrix r = arg.float_matrix_value (); - retval = octave::math::chol2inv (r); + retval = math::chol2inv (r); } else if (arg.iscomplex ()) { FloatComplexMatrix r = arg.float_complex_matrix_value (); - retval = octave::math::chol2inv (r); + retval = math::chol2inv (r); } else err_wrong_type_arg ("chol2inv", arg); @@ -547,13 +547,13 @@ { Matrix r = arg.matrix_value (); - retval = octave::math::chol2inv (r); + retval = math::chol2inv (r); } else if (arg.iscomplex ()) { ComplexMatrix r = arg.complex_matrix_value (); - retval = octave::math::chol2inv (r); + retval = math::chol2inv (r); } else err_wrong_type_arg ("chol2inv", arg); @@ -659,7 +659,7 @@ FloatMatrix R = argr.float_matrix_value (); FloatColumnVector u = argu.float_column_vector_value (); - octave::math::chol<FloatMatrix> fact; + math::chol<FloatMatrix> fact; fact.set (R); if (down) @@ -676,7 +676,7 @@ FloatComplexColumnVector u = argu.float_complex_column_vector_value (); - octave::math::chol<FloatComplexMatrix> fact; + math::chol<FloatComplexMatrix> fact; fact.set (R); if (down) @@ -695,7 +695,7 @@ Matrix R = argr.matrix_value (); ColumnVector u = argu.column_vector_value (); - octave::math::chol<Matrix> fact; + math::chol<Matrix> fact; fact.set (R); if (down) @@ -711,7 +711,7 @@ ComplexMatrix R = argr.complex_matrix_value (); ComplexColumnVector u = argu.complex_column_vector_value (); - octave::math::chol<ComplexMatrix> fact; + math::chol<ComplexMatrix> fact; fact.set (R); if (down) @@ -853,7 +853,7 @@ FloatMatrix R = argr.float_matrix_value (); FloatColumnVector u = argu.float_column_vector_value (); - octave::math::chol<FloatMatrix> fact; + math::chol<FloatMatrix> fact; fact.set (R); err = fact.insert_sym (u, j-1); @@ -866,7 +866,7 @@ FloatComplexColumnVector u = argu.float_complex_column_vector_value (); - octave::math::chol<FloatComplexMatrix> fact; + math::chol<FloatComplexMatrix> fact; fact.set (R); err = fact.insert_sym (u, j-1); @@ -881,7 +881,7 @@ Matrix R = argr.matrix_value (); ColumnVector u = argu.column_vector_value (); - octave::math::chol<Matrix> fact; + math::chol<Matrix> fact; fact.set (R); err = fact.insert_sym (u, j-1); @@ -893,7 +893,7 @@ ComplexMatrix R = argr.complex_matrix_value (); ComplexColumnVector u = argu.complex_column_vector_value (); - octave::math::chol<ComplexMatrix> fact; + math::chol<ComplexMatrix> fact; fact.set (R); err = fact.insert_sym (u, j-1); @@ -1090,7 +1090,7 @@ // real case FloatMatrix R = argr.float_matrix_value (); - octave::math::chol<FloatMatrix> fact; + math::chol<FloatMatrix> fact; fact.set (R); fact.delete_sym (j-1); @@ -1101,7 +1101,7 @@ // complex case FloatComplexMatrix R = argr.float_complex_matrix_value (); - octave::math::chol<FloatComplexMatrix> fact; + math::chol<FloatComplexMatrix> fact; fact.set (R); fact.delete_sym (j-1); @@ -1115,7 +1115,7 @@ // real case Matrix R = argr.matrix_value (); - octave::math::chol<Matrix> fact; + math::chol<Matrix> fact; fact.set (R); fact.delete_sym (j-1); @@ -1126,7 +1126,7 @@ // complex case ComplexMatrix R = argr.complex_matrix_value (); - octave::math::chol<ComplexMatrix> fact; + math::chol<ComplexMatrix> fact; fact.set (R); fact.delete_sym (j-1); @@ -1223,7 +1223,7 @@ // real case FloatMatrix R = argr.float_matrix_value (); - octave::math::chol<FloatMatrix> fact; + math::chol<FloatMatrix> fact; fact.set (R); fact.shift_sym (i-1, j-1); @@ -1234,7 +1234,7 @@ // complex case FloatComplexMatrix R = argr.float_complex_matrix_value (); - octave::math::chol<FloatComplexMatrix> fact; + math::chol<FloatComplexMatrix> fact; fact.set (R); fact.shift_sym (i-1, j-1); @@ -1248,7 +1248,7 @@ // real case Matrix R = argr.matrix_value (); - octave::math::chol<Matrix> fact; + math::chol<Matrix> fact; fact.set (R); fact.shift_sym (i-1, j-1); @@ -1259,7 +1259,7 @@ // complex case ComplexMatrix R = argr.complex_matrix_value (); - octave::math::chol<ComplexMatrix> fact; + math::chol<ComplexMatrix> fact; fact.set (R); fact.shift_sym (i-1, j-1);
--- a/libinterp/corefcn/colamd.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/colamd.cc Sat Aug 14 22:48:52 2021 -0400 @@ -376,20 +376,20 @@ } // Allocate workspace for colamd - OCTAVE_LOCAL_BUFFER (octave::suitesparse_integer, p, n_col+1); + OCTAVE_LOCAL_BUFFER (suitesparse_integer, p, n_col+1); for (octave_idx_type i = 0; i < n_col+1; i++) p[i] = cidx[i]; octave_idx_type Alen = COLAMD_NAME (_recommended) (nnz, n_row, n_col); - OCTAVE_LOCAL_BUFFER (octave::suitesparse_integer, A, Alen); + OCTAVE_LOCAL_BUFFER (suitesparse_integer, A, Alen); for (octave_idx_type i = 0; i < nnz; i++) A[i] = ridx[i]; // Order the columns (destroys A) static_assert (COLAMD_STATS <= 40, "colamd: # of COLAMD_STATS exceeded. Please report this to bugs.octave.org"); - octave::suitesparse_integer stats_storage[COLAMD_STATS]; - octave::suitesparse_integer *stats = &stats_storage[0]; + suitesparse_integer stats_storage[COLAMD_STATS]; + suitesparse_integer *stats = &stats_storage[0]; if (! COLAMD_NAME () (n_row, n_col, Alen, A, p, knobs, stats)) { COLAMD_NAME (_report)(stats); @@ -594,11 +594,11 @@ OCTAVE_LOCAL_BUFFER (octave_idx_type, perm, n_col+1); static_assert (COLAMD_STATS <= 40, "symamd: # of COLAMD_STATS exceeded. Please report this to bugs.octave.org"); - octave::suitesparse_integer stats_storage[COLAMD_STATS]; - octave::suitesparse_integer *stats = &stats_storage[0]; - if (! SYMAMD_NAME () (n_col, octave::to_suitesparse_intptr (ridx), - octave::to_suitesparse_intptr (cidx), - octave::to_suitesparse_intptr (perm), + suitesparse_integer stats_storage[COLAMD_STATS]; + suitesparse_integer *stats = &stats_storage[0]; + if (! SYMAMD_NAME () (n_col, to_suitesparse_intptr (ridx), + to_suitesparse_intptr (cidx), + to_suitesparse_intptr (perm), knobs, stats, &calloc, &free)) { SYMAMD_NAME (_report)(stats);
--- a/libinterp/corefcn/colloc.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/colloc.cc Sat Aug 14 22:48:52 2021 -0400 @@ -58,10 +58,10 @@ error ("colloc: N must be a scalar"); double tmp = args(0).double_value (); - if (octave::math::isnan (tmp)) + if (math::isnan (tmp)) error ("colloc: N cannot be NaN"); - octave_idx_type ncol = octave::math::nint_big (tmp); + octave_idx_type ncol = math::nint_big (tmp); if (ncol < 0) error ("colloc: N must be positive"); @@ -87,7 +87,7 @@ if (ntot < 1) error (R"("colloc: the total number of roots (N + "left" + "right") must be >= 1)"); - octave::CollocWt wts (ncol, left, right); + CollocWt wts (ncol, left, right); ColumnVector r = wts.roots (); Matrix A = wts.first ();
--- a/libinterp/corefcn/conv2.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/conv2.cc Sat Aug 14 22:48:52 2021 -0400 @@ -75,7 +75,7 @@ std::string shape = "full"; // default bool separable = false; - octave::convn_type ct = octave::convn_full; + convn_type ct = convn_full; if (nargin == 3) { @@ -94,11 +94,11 @@ error ("conv2: A and B must be 1-D vectors or 2-D matrices"); if (shape == "full") - ct = octave::convn_full; + ct = convn_full; else if (shape == "same") - ct = octave::convn_same; + ct = convn_same; else if (shape == "valid") - ct = octave::convn_valid; + ct = convn_valid; else error ("conv2: SHAPE type not valid"); @@ -122,13 +122,13 @@ { FloatColumnVector v1 (args(0).float_vector_value ()); FloatRowVector v2 (args(1).float_vector_value ()); - retval = octave::convn (a, v1, v2, ct); + retval = convn (a, v1, v2, ct); } else { FloatComplexColumnVector v1 (args(0).float_complex_vector_value ()); FloatComplexRowVector v2 (args(1).float_complex_vector_value ()); - retval = octave::convn (a, v1, v2, ct); + retval = convn (a, v1, v2, ct); } } else @@ -136,7 +136,7 @@ FloatColumnVector v1 (args(0).float_vector_value ()); FloatRowVector v2 (args(1).float_vector_value ()); FloatMatrix a (args(2).float_matrix_value ()); - retval = octave::convn (a, v1, v2, ct); + retval = convn (a, v1, v2, ct); } } else @@ -149,13 +149,13 @@ { ColumnVector v1 (args(0).vector_value ()); RowVector v2 (args(1).vector_value ()); - retval = octave::convn (a, v1, v2, ct); + retval = convn (a, v1, v2, ct); } else { ComplexColumnVector v1 (args(0).complex_vector_value ()); ComplexRowVector v2 (args(1).complex_vector_value ()); - retval = octave::convn (a, v1, v2, ct); + retval = convn (a, v1, v2, ct); } } else @@ -163,7 +163,7 @@ ColumnVector v1 (args(0).vector_value ()); RowVector v2 (args(1).vector_value ()); Matrix a (args(2).matrix_value ()); - retval = octave::convn (a, v1, v2, ct); + retval = convn (a, v1, v2, ct); } } } // if (separable) @@ -177,19 +177,19 @@ if (args(1).isreal ()) { FloatMatrix b (args(1).float_matrix_value ()); - retval = octave::convn (a, b, ct); + retval = convn (a, b, ct); } else { FloatComplexMatrix b (args(1).float_complex_matrix_value ()); - retval = octave::convn (a, b, ct); + retval = convn (a, b, ct); } } else { FloatMatrix a (args(0).float_matrix_value ()); FloatMatrix b (args(1).float_matrix_value ()); - retval = octave::convn (a, b, ct); + retval = convn (a, b, ct); } } else @@ -200,19 +200,19 @@ if (args(1).isreal ()) { Matrix b (args(1).matrix_value ()); - retval = octave::convn (a, b, ct); + retval = convn (a, b, ct); } else { ComplexMatrix b (args(1).complex_matrix_value ()); - retval = octave::convn (a, b, ct); + retval = convn (a, b, ct); } } else { Matrix a (args(0).matrix_value ()); Matrix b (args(1).matrix_value ()); - retval = octave::convn (a, b, ct); + retval = convn (a, b, ct); } } @@ -334,17 +334,17 @@ print_usage (); std::string shape = "full"; // default - octave::convn_type ct = octave::convn_full; + convn_type ct = convn_full; if (nargin == 3) shape = args(2).xstring_value ("convn: SHAPE must be a string"); if (shape == "full") - ct = octave::convn_full; + ct = convn_full; else if (shape == "same") - ct = octave::convn_same; + ct = convn_same; else if (shape == "valid") - ct = octave::convn_valid; + ct = convn_valid; else error ("convn: SHAPE type not valid"); @@ -358,19 +358,19 @@ if (args(1).isreal ()) { FloatNDArray b (args(1).float_array_value ()); - retval = octave::convn (a, b, ct); + retval = convn (a, b, ct); } else { FloatComplexNDArray b (args(1).float_complex_array_value ()); - retval = octave::convn (a, b, ct); + retval = convn (a, b, ct); } } else { FloatNDArray a (args(0).float_array_value ()); FloatNDArray b (args(1).float_array_value ()); - retval = octave::convn (a, b, ct); + retval = convn (a, b, ct); } } else @@ -381,19 +381,19 @@ if (args(1).isreal ()) { NDArray b (args(1).array_value ()); - retval = octave::convn (a, b, ct); + retval = convn (a, b, ct); } else { ComplexNDArray b (args(1).complex_array_value ()); - retval = octave::convn (a, b, ct); + retval = convn (a, b, ct); } } else { NDArray a (args(0).array_value ()); NDArray b (args(1).array_value ()); - retval = octave::convn (a, b, ct); + retval = convn (a, b, ct); } }
--- a/libinterp/corefcn/daspk.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/daspk.cc Sat Aug 14 22:48:52 2021 -0400 @@ -47,6 +47,8 @@ #include "DASPK-opts.cc" +OCTAVE_NAMESPACE_BEGIN + // Global pointer for user defined function required by daspk. static octave_value daspk_fcn; @@ -60,7 +62,7 @@ // Is this a recursive call? static int call_depth = 0; -ColumnVector +static ColumnVector daspk_user_function (const ColumnVector& x, const ColumnVector& xdot, double t, octave_idx_type& ires) { @@ -80,9 +82,9 @@ try { - tmp = octave::feval (daspk_fcn, args, 1); + tmp = feval (daspk_fcn, args, 1); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { err_user_supplied_eval (ee, "daspk"); } @@ -109,7 +111,7 @@ return retval; } -Matrix +static Matrix daspk_user_jacobian (const ColumnVector& x, const ColumnVector& xdot, double t, double cj) { @@ -130,9 +132,9 @@ try { - tmp = octave::feval (daspk_jac, args, 1); + tmp = feval (daspk_jac, args, 1); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { err_user_supplied_eval (ee, "daspk"); } @@ -156,8 +158,6 @@ return retval; } -OCTAVE_NAMESPACE_BEGIN - DEFMETHOD (daspk, interp, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {[@var{x}, @var{xdot}, @var{istate}, @var{msg}] =} daspk (@var{fcn}, @var{x_0}, @var{xdot_0}, @var{t}, @var{t_crit}) @@ -271,7 +271,7 @@ octave_value_list retval (4); - octave::unwind_protect_var<int> restore_var (call_depth); + unwind_protect_var<int> restore_var (call_depth); call_depth++; if (call_depth > 1) @@ -294,13 +294,11 @@ f_arg = c(0); else if (c.numel () == 2) { - daspk_fcn = octave::get_function_handle (interp, c(0), - fcn_param_names); + daspk_fcn = get_function_handle (interp, c(0), fcn_param_names); if (daspk_fcn.is_defined ()) { - daspk_jac = octave::get_function_handle (interp, c(1), - jac_param_names); + daspk_jac = get_function_handle (interp, c(1), jac_param_names); if (daspk_jac.is_undefined ()) daspk_fcn = octave_value (); @@ -319,21 +317,20 @@ switch (f_arg.rows ()) { case 1: - daspk_fcn = octave::get_function_handle (interp, f_arg, - fcn_param_names); + daspk_fcn = get_function_handle (interp, f_arg, fcn_param_names); break; case 2: { string_vector tmp = f_arg.string_vector_value (); - daspk_fcn = octave::get_function_handle (interp, tmp(0), - fcn_param_names); + daspk_fcn = get_function_handle (interp, tmp(0), + fcn_param_names); if (daspk_fcn.is_defined ()) { - daspk_jac = octave::get_function_handle (interp, tmp(1), - jac_param_names); + daspk_jac = get_function_handle (interp, tmp(1), + jac_param_names); if (daspk_jac.is_undefined ()) daspk_fcn = octave_value ();
--- a/libinterp/corefcn/dasrt.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/dasrt.cc Sat Aug 14 22:48:52 2021 -0400 @@ -48,6 +48,8 @@ #include "DASRT-opts.cc" +OCTAVE_NAMESPACE_BEGIN + // Global pointers for user defined function required by dasrt. static octave_value dasrt_fcn; static octave_value dasrt_jac; @@ -81,9 +83,9 @@ try { - tmp = octave::feval (dasrt_fcn, args, 1); + tmp = feval (dasrt_fcn, args, 1); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { err_user_supplied_eval (ee, "dasrt"); } @@ -122,9 +124,9 @@ try { - tmp = octave::feval (dasrt_cf, args, 1); + tmp = feval (dasrt_cf, args, 1); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { err_user_supplied_eval (ee, "dasrt"); } @@ -168,9 +170,9 @@ try { - tmp = octave::feval (dasrt_jac, args, 1); + tmp = feval (dasrt_jac, args, 1); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { err_user_supplied_eval (ee, "dasrt"); } @@ -194,8 +196,6 @@ return retval; } -OCTAVE_NAMESPACE_BEGIN - DEFMETHOD (dasrt, interp, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {[@var{x}, @var{xdot}, @var{t_out}, @var{istat}, @var{msg}] =} dasrt (@var{fcn}, @var{g}, @var{x_0}, @var{xdot_0}, @var{t}) @@ -350,7 +350,7 @@ octave_value_list retval (5); - octave::unwind_protect_var<int> restore_var (call_depth); + unwind_protect_var<int> restore_var (call_depth); call_depth++; if (call_depth > 1) @@ -379,13 +379,11 @@ f_arg = c(0); else if (c.numel () == 2) { - dasrt_fcn = octave::get_function_handle (interp, c(0), - fcn_param_names); + dasrt_fcn = get_function_handle (interp, c(0), fcn_param_names); if (dasrt_fcn.is_defined ()) { - dasrt_jac = octave::get_function_handle (interp, c(1), - jac_param_names); + dasrt_jac = get_function_handle (interp, c(1), jac_param_names); if (dasrt_jac.is_undefined ()) dasrt_fcn = octave_value (); @@ -404,21 +402,20 @@ switch (f_arg.rows ()) { case 1: - dasrt_fcn = octave::get_function_handle (interp, f_arg, - fcn_param_names); + dasrt_fcn = get_function_handle (interp, f_arg, fcn_param_names); break; case 2: { string_vector tmp = f_arg.string_vector_value (); - dasrt_fcn = octave::get_function_handle (interp, tmp(0), - fcn_param_names); + dasrt_fcn = get_function_handle (interp, tmp(0), + fcn_param_names); if (dasrt_fcn.is_defined ()) { - dasrt_jac = octave::get_function_handle (interp, tmp(1), - jac_param_names); + dasrt_jac = get_function_handle (interp, tmp(1), + jac_param_names); if (dasrt_jac.is_undefined ()) dasrt_fcn = octave_value (); @@ -453,7 +450,7 @@ { std::list<std::string> cf_param_names ({"x", "t"}); - dasrt_cf = octave::get_function_handle (interp, args(1), cf_param_names); + dasrt_cf = get_function_handle (interp, args(1), cf_param_names); } if (dasrt_cf.is_defined ())
--- a/libinterp/corefcn/dassl.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/dassl.cc Sat Aug 14 22:48:52 2021 -0400 @@ -46,6 +46,8 @@ #include "DASSL-opts.cc" +OCTAVE_NAMESPACE_BEGIN + // Global pointer for user defined function required by dassl. static octave_value dassl_fcn; @@ -59,7 +61,7 @@ // Is this a recursive call? static int call_depth = 0; -ColumnVector +static ColumnVector dassl_user_function (const ColumnVector& x, const ColumnVector& xdot, double t, octave_idx_type& ires) { @@ -79,9 +81,9 @@ try { - tmp = octave::feval (dassl_fcn, args, 1); + tmp = feval (dassl_fcn, args, 1); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { err_user_supplied_eval (ee, "dassl"); } @@ -108,7 +110,7 @@ return retval; } -Matrix +static Matrix dassl_user_jacobian (const ColumnVector& x, const ColumnVector& xdot, double t, double cj) { @@ -129,9 +131,9 @@ try { - tmp = octave::feval (dassl_jac, args, 1); + tmp = feval (dassl_jac, args, 1); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { err_user_supplied_eval (ee, "dassl"); } @@ -155,8 +157,6 @@ return retval; } -OCTAVE_NAMESPACE_BEGIN - DEFMETHOD (dassl, interp, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {[@var{x}, @var{xdot}, @var{istate}, @var{msg}] =} dassl (@var{fcn}, @var{x_0}, @var{xdot_0}, @var{t}, @var{t_crit}) @@ -271,7 +271,7 @@ octave_value_list retval (4); - octave::unwind_protect_var<int> restore_var (call_depth); + unwind_protect_var<int> restore_var (call_depth); call_depth++; if (call_depth > 1) @@ -294,13 +294,11 @@ f_arg = c(0); else if (c.numel () == 2) { - dassl_fcn = octave::get_function_handle (interp, c(0), - fcn_param_names); + dassl_fcn = get_function_handle (interp, c(0), fcn_param_names); if (dassl_fcn.is_defined ()) { - dassl_jac = octave::get_function_handle (interp, c(1), - jac_param_names); + dassl_jac = get_function_handle (interp, c(1), jac_param_names); if (dassl_jac.is_undefined ()) dassl_fcn = octave_value (); @@ -319,21 +317,20 @@ switch (f_arg.rows ()) { case 1: - dassl_fcn = octave::get_function_handle (interp, f_arg, - fcn_param_names); + dassl_fcn = get_function_handle (interp, f_arg, fcn_param_names); break; case 2: { string_vector tmp = f_arg.string_vector_value (); - dassl_fcn = octave::get_function_handle (interp, tmp(0), - fcn_param_names); + dassl_fcn = get_function_handle (interp, tmp(0), + fcn_param_names); if (dassl_fcn.is_defined ()) { - dassl_jac = octave::get_function_handle (interp, tmp(1), - jac_param_names); + dassl_jac = get_function_handle (interp, tmp(1), + jac_param_names); if (dassl_jac.is_undefined ()) dassl_fcn = octave_value ();
--- a/libinterp/corefcn/data.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/data.cc Sat Aug 14 22:48:52 2021 -0400 @@ -453,7 +453,7 @@ for (octave_idx_type i = 0; i < x.numel (); i++) { int exp; - f.xelem (i) = octave::math::log2 (x(i), exp); + f.xelem (i) = math::log2 (x(i), exp); e.xelem (i) = exp; } } @@ -664,29 +664,29 @@ else if (args(0).is_single_type () || args(1).is_single_type ()) { if (args(0).is_scalar_type () && args(1).is_scalar_type ()) - retval = octave::math::rem (args(0).float_value (), args(1).float_value ()); + retval = math::rem (args(0).float_value (), args(1).float_value ()); else { FloatNDArray a0 = args(0).float_array_value (); FloatNDArray a1 = args(1).float_array_value (); - retval = binmap<float> (a0, a1, octave::math::rem<float>, "rem"); + retval = binmap<float> (a0, a1, math::rem<float>, "rem"); } } else { if (args(0).is_scalar_type () && args(1).is_scalar_type ()) - retval = octave::math::rem (args(0).scalar_value (), args(1).scalar_value ()); + retval = math::rem (args(0).scalar_value (), args(1).scalar_value ()); else if (args(0).issparse () || args(1).issparse ()) { SparseMatrix m0 = args(0).sparse_matrix_value (); SparseMatrix m1 = args(1).sparse_matrix_value (); - retval = binmap<double> (m0, m1, octave::math::rem<double>, "rem"); + retval = binmap<double> (m0, m1, math::rem<double>, "rem"); } else { NDArray a0 = args(0).array_value (); NDArray a1 = args(1).array_value (); - retval = binmap<double> (a0, a1, octave::math::rem<double>, "rem"); + retval = binmap<double> (a0, a1, math::rem<double>, "rem"); } } @@ -846,29 +846,29 @@ else if (args(0).is_single_type () || args(1).is_single_type ()) { if (args(0).is_scalar_type () && args(1).is_scalar_type ()) - retval = octave::math::mod (args(0).float_value (), args(1).float_value ()); + retval = math::mod (args(0).float_value (), args(1).float_value ()); else { FloatNDArray a0 = args(0).float_array_value (); FloatNDArray a1 = args(1).float_array_value (); - retval = binmap<float> (a0, a1, octave::math::mod<float>, "mod"); + retval = binmap<float> (a0, a1, math::mod<float>, "mod"); } } else { if (args(0).is_scalar_type () && args(1).is_scalar_type ()) - retval = octave::math::mod (args(0).scalar_value (), args(1).scalar_value ()); + retval = math::mod (args(0).scalar_value (), args(1).scalar_value ()); else if (args(0).issparse () || args(1).issparse ()) { SparseMatrix m0 = args(0).sparse_matrix_value (); SparseMatrix m1 = args(1).sparse_matrix_value (); - retval = binmap<double> (m0, m1, octave::math::mod<double>, "mod"); + retval = binmap<double> (m0, m1, math::mod<double>, "mod"); } else { NDArray a0 = args(0).array_value (); NDArray a1 = args(1).array_value (); - retval = binmap<double> (a0, a1, octave::math::mod<double>, "mod"); + retval = binmap<double> (a0, a1, math::mod<double>, "mod"); } } @@ -1651,8 +1651,7 @@ std::string cname = ov.class_name (); - octave::symbol_table& symtab - = octave::__get_symbol_table__ ("attempt_type_conversion"); + symbol_table& symtab = __get_symbol_table__ ("attempt_type_conversion"); octave_value fcn = symtab.find_method (dtype, cname); @@ -1662,9 +1661,9 @@ try { - result = octave::feval (fcn, ovl (ov), 1); + result = feval (fcn, ovl (ov), 1); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { error (ee, "conversion from %s to %s failed", dtype.c_str (), cname.c_str ()); @@ -1690,9 +1689,9 @@ try { - result = octave::feval (fcn, ovl (ov), 1); + result = feval (fcn, ovl (ov), 1); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { error (ee, "%s constructor failed for %s argument", dtype.c_str (), cname.c_str ()); @@ -1716,9 +1715,9 @@ // Get dominant type for list - std::string dtype = octave::get_dispatch_type (ovl); - - octave::symbol_table& symtab = octave::__get_symbol_table__ ("do_class_concat"); + std::string dtype = get_dispatch_type (ovl); + + symbol_table& symtab = __get_symbol_table__ ("do_class_concat"); octave_value fcn = symtab.find_method (cattype, dtype); @@ -1730,9 +1729,9 @@ try { - tmp2 = octave::feval (fcn, ovl, 1); + tmp2 = feval (fcn, ovl, 1); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { error (ee, "%s/%s method failed", dtype.c_str (), cattype.c_str ()); } @@ -1817,7 +1816,7 @@ first_elem_is_struct = args(i).isstruct (); } else - result_type = octave::get_concat_class (result_type, args(i).class_name ()); + result_type = get_concat_class (result_type, args(i).class_name ()); if (all_strings_p && ! args(i).is_string ()) all_strings_p = false; @@ -1859,7 +1858,7 @@ if (any_class_p) { - retval = octave::do_class_concat (args, fname, dim); + retval = do_class_concat (args, fname, dim); } else if (result_type == "double") { @@ -1893,7 +1892,7 @@ warn_implicit_conversion ("Octave:num-to-str", "numeric", result_type); else - octave::maybe_warn_string_concat (all_dq_strings_p, all_sq_strings_p); + maybe_warn_string_concat (all_dq_strings_p, all_sq_strings_p); charNDArray result = do_single_type_concat<charNDArray> (args, dim); @@ -1956,7 +1955,7 @@ // // We might also start with a empty octave_value using // - // tmp = octave::type_info::lookup_type (args(1).type_name()); + // tmp = type_info::lookup_type (args(1).type_name()); // // and then directly resize. However, for some types there might // be some additional setup needed, and so this should be avoided. @@ -1972,7 +1971,7 @@ // Can't fast return here to skip empty matrices as something // like cat (1,[],single ([])) must return an empty matrix of // the right type. - tmp = octave::cat_op (tmp, args(j), ra_idx); + tmp = cat_op (tmp, args(j), ra_idx); dim_vector dv_tmp = args(j).dims (); @@ -2647,8 +2646,7 @@ { // Don't use numel (const octave_value_list&) here as that corresponds to // an overloaded call, not to builtin! - retval = octave::dims_to_numel (args(0).dims (), - args.slice (1, nargin-1)); + retval = dims_to_numel (args(0).dims (), args.slice (1, nargin-1)); } return retval; @@ -3988,7 +3986,7 @@ break; case 1: - octave::get_dimensions (args(0), fcn, dims); + get_dimensions (args(0), fcn, dims); break; default: @@ -4003,7 +4001,7 @@ dims.chop_trailing_singletons (); - octave::check_dimensions (dims, fcn); + check_dimensions (dims, fcn); // FIXME: Perhaps this should be made extensible by using the class name // to lookup a function to call to create the new value. @@ -4088,7 +4086,7 @@ // benefit, then maybe there should be a special storage // type for constant value arrays. double dval = static_cast<double> (val); - retval = octave::range<double>::make_constant (dval, dims(1)); + retval = range<double>::make_constant (dval, dims(1)); } else retval = NDArray (dims, val); @@ -4148,7 +4146,7 @@ break; case 1: - octave::get_dimensions (args(0), fcn, dims); + get_dimensions (args(0), fcn, dims); break; default: @@ -4163,7 +4161,7 @@ dims.chop_trailing_singletons (); - octave::check_dimensions (dims, fcn); + check_dimensions (dims, fcn); // Note that automatic narrowing will handle conversion from // NDArray to scalar. @@ -4193,12 +4191,11 @@ case oct_data_conv::dt_double: if (iscomplex) retval = ComplexNDArray (dims, Complex (val, 0)); - else if (dims.ndims () == 2 && dims(0) == 1 - && octave::math::isfinite (val)) + else if (dims.ndims () == 2 && dims(0) == 1 && math::isfinite (val)) // FIXME: If this optimization provides a significant benefit, // then maybe there should be a special storage type for // constant value arrays. - retval = octave::range<double>::make_constant (val, dims(1)); + retval = range<double>::make_constant (val, dims(1)); else retval = NDArray (dims, val); break; @@ -4236,7 +4233,7 @@ break; case 1: - octave::get_dimensions (args(0), fcn, dims); + get_dimensions (args(0), fcn, dims); break; default: @@ -4251,7 +4248,7 @@ dims.chop_trailing_singletons (); - octave::check_dimensions (dims, fcn); + check_dimensions (dims, fcn); // Note that automatic narrowing will handle conversion from // NDArray to scalar. @@ -4263,11 +4260,11 @@ break; case oct_data_conv::dt_double: - if (dims.ndims () == 2 && dims(0) == 1 && octave::math::isfinite (val)) + if (dims.ndims () == 2 && dims(0) == 1 && math::isfinite (val)) // FIXME: If this optimization provides a significant benefit, // then maybe there should be a special storage type for // constant value arrays. - retval = octave::range<double>::make_constant (val, dims(1)); + retval = range<double>::make_constant (val, dims(1)); else retval = NDArray (dims, val); break; @@ -4306,7 +4303,7 @@ break; case 1: - octave::get_dimensions (args(0), fcn, dims); + get_dimensions (args(0), fcn, dims); break; default: @@ -4321,7 +4318,7 @@ dims.chop_trailing_singletons (); - octave::check_dimensions (dims, fcn); + check_dimensions (dims, fcn); // Note that automatic narrowing will handle conversion from // NDArray to scalar. @@ -4384,7 +4381,7 @@ break; case 1: - octave::get_dimensions (args(0), fcn, dims); + get_dimensions (args(0), fcn, dims); break; default: @@ -4399,7 +4396,7 @@ dims.chop_trailing_singletons (); - octave::check_dimensions (dims, fcn); + check_dimensions (dims, fcn); // Note that automatic narrowing will handle conversion from // NDArray to scalar. @@ -4769,14 +4766,14 @@ for (octave_idx_type i = 0; i < x.numel (); i++) { P val = epsval.xelem (i); - if (octave::math::isnan (val) || octave::math::isinf (val)) - epsval(i) = octave::numeric_limits<P>::NaN (); + if (math::isnan (val) || math::isinf (val)) + epsval(i) = numeric_limits<P>::NaN (); else if (val < std::numeric_limits<P>::min ()) epsval(i) = std::numeric_limits<P>::denorm_min (); else { int exponent; - octave::math::frexp (val, &exponent); + math::frexp (val, &exponent); const P digits = std::numeric_limits<P>::digits; epsval(i) = std::pow (static_cast<P> (2.0), static_cast<P> (exponent - digits)); @@ -5330,14 +5327,14 @@ else if (nargin == 1) { octave_idx_type nr, nc; - octave::get_dimensions (args(0), "eye", nr, nc); + get_dimensions (args(0), "eye", nr, nc); retval = identity_matrix (nr, nc, dt); } else { octave_idx_type nr, nc; - octave::get_dimensions (args(0), args(1), "eye", nr, nc); + get_dimensions (args(0), args(1), "eye", nr, nc); retval = identity_matrix (nr, nc, dt); } @@ -6013,9 +6010,9 @@ if (str == "fro") p_arg = octave_value (2); else if (str == "inf") - p_arg = octave::numeric_limits<double>::Inf (); + p_arg = numeric_limits<double>::Inf (); else if (str == "-inf") - p_arg = -octave::numeric_limits<double>::Inf (); + p_arg = -numeric_limits<double>::Inf (); else error ("norm: unrecognized option: %s", str.c_str ()); } @@ -6043,11 +6040,11 @@ break; case sfinf: - retval = xnorm (x_arg, octave::numeric_limits<double>::Inf ()); + retval = xnorm (x_arg, numeric_limits<double>::Inf ()); break; case sfneginf: - retval = xnorm (x_arg, -octave::numeric_limits<double>::Inf ()); + retval = xnorm (x_arg, -numeric_limits<double>::Inf ()); break; } @@ -6150,7 +6147,7 @@ if (args.length () != 1) print_usage (); - return octave::unary_op (op, args(0)); + return unary_op (op, args(0)); } DEFUN (not, args, , @@ -6256,7 +6253,7 @@ if (args.length () != 2) print_usage (); - return octave::binary_op (op, args(0), args(1)); + return binary_op (op, args(0), args(1)); } static octave_value @@ -6272,10 +6269,10 @@ octave_value retval; if (nargin == 2) - retval = octave::binary_op (op, args(0), args(1)); + retval = binary_op (op, args(0), args(1)); else { - retval = octave::binary_op (op, args(0), args(1)); + retval = binary_op (op, args(0), args(1)); for (int i = 2; i < nargin; i++) retval.assign (aop, args(i)); @@ -6577,8 +6574,8 @@ print_usage (); return (nargin == 2 - ? octave::colon_op (args(0), args(1)) - : octave::colon_op (args(0), args(1), args(2))); + ? colon_op (args(0), args(1)) + : colon_op (args(0), args(1), args(2))); } static double tic_toc_timestamp = -1.0; @@ -6639,7 +6636,7 @@ warning ("tic: ignoring extra arguments"); octave_value retval; - octave::sys::time now; + sys::time now; double tmp = now.double_value (); if (nargout > 0) @@ -6699,7 +6696,7 @@ if (start_time < 0) error ("toc: function called before timer initialization with tic()"); - octave::sys::time now; + sys::time now; double etime = now.double_value () - start_time; @@ -6741,7 +6738,7 @@ if (args.length () != 0) print_usage (); - octave::sys::cpu_time cpu_tm; + sys::cpu_time cpu_tm; double usr = cpu_tm.user (); double sys = cpu_tm.system (); @@ -6881,7 +6878,7 @@ // NOTE: Can not change this to ovl() call because arg.sort changes sidx // and objects are declared const in ovl prototype. retval(0) = arg.sort (sidx, dim, smode); - retval(1) = octave::idx_vector (sidx, dv(dim)); // No checking, extent is known. + retval(1) = idx_vector (sidx, dv(dim)); // No checking, extent is known. } else retval = ovl (arg.sort (dim, smode)); @@ -7307,7 +7304,7 @@ try { - octave::idx_vector n = args(1).index_vector (); + idx_vector n = args(1).index_vector (); switch (argx.builtin_type ()) { @@ -7348,7 +7345,7 @@ err_wrong_type_arg ("nth_element", argx); } } - catch (const octave::index_exception& ie) + catch (const index_exception& ie) { error ("nth_element: invalid index %s", ie.what ()); } @@ -7373,7 +7370,7 @@ template <typename NDT> static NDT -do_accumarray_sum (const octave::idx_vector& idx, const NDT& vals, +do_accumarray_sum (const idx_vector& idx, const NDT& vals, octave_idx_type n = -1) { typedef typename NDT::element_type T; @@ -7412,7 +7409,7 @@ try { - octave::idx_vector idx = args(0).index_vector (); + idx_vector idx = args(0).index_vector (); octave_idx_type n = -1; if (nargin == 3) n = args(2).idx_type_value (true); @@ -7421,7 +7418,7 @@ if (vals.is_range ()) { - octave::range<double> r = vals.range_value (); + range<double> r = vals.range_value (); if (r.increment () == 0) vals = r.base (); } @@ -7447,7 +7444,7 @@ else err_wrong_type_arg ("accumarray", vals); } - catch (const octave::index_exception& ie) + catch (const index_exception& ie) { error ("__accumarray_sum__: invalid index %s", ie.what ()); } @@ -7457,7 +7454,7 @@ template <typename NDT> static NDT -do_accumarray_minmax (const octave::idx_vector& idx, const NDT& vals, +do_accumarray_minmax (const idx_vector& idx, const NDT& vals, octave_idx_type n, bool ismin, const typename NDT::element_type& zero_val) { @@ -7470,7 +7467,7 @@ NDT retval (dim_vector (n, 1), zero_val); // Pick minimizer or maximizer. - void (MArray<T>::*op) (const octave::idx_vector&, const MArray<T>&) + void (MArray<T>::*op) (const idx_vector&, const MArray<T>&) = ismin ? (&MArray<T>::idx_min) : (&MArray<T>::idx_max); octave_idx_type l = idx.length (n); @@ -7500,7 +7497,7 @@ try { - octave::idx_vector idx = args(0).index_vector (); + idx_vector idx = args(0).index_vector (); octave_idx_type n = -1; if (nargin == 4) n = args(3).idx_type_value (true); @@ -7558,7 +7555,7 @@ err_wrong_type_arg ("accumarray", vals); } } - catch (const octave::index_exception& ie) + catch (const index_exception& ie) { error ("do_accumarray_minmax_fun: invalid index %s", ie.what ()); } @@ -7586,7 +7583,7 @@ template <typename NDT> static NDT -do_accumdim_sum (const octave::idx_vector& idx, const NDT& vals, +do_accumdim_sum (const idx_vector& idx, const NDT& vals, int dim = -1, octave_idx_type n = -1) { typedef typename NDT::element_type T; @@ -7633,7 +7630,7 @@ try { - octave::idx_vector idx = args(0).index_vector (); + idx_vector idx = args(0).index_vector (); int dim = -1; if (nargin >= 3) dim = args(2).int_value () - 1; @@ -7665,7 +7662,7 @@ else err_wrong_type_arg ("accumdim", vals); } - catch (const octave::index_exception& ie) + catch (const index_exception& ie) { error ("__accumdim_sum__: invalid index %s", ie.what ()); } @@ -7855,7 +7852,7 @@ octave_idx_type k = retval.columns (); while (order > 0 && k > 0) { - octave::idx_vector col1 (':'), col2 (':'), sl1 (1, k), sl2 (0, k-1); + idx_vector col1 (':'), col2 (':'), sl1 (1, k), sl2 (0, k-1); retval = SparseT (retval.index (col1, sl1)) - SparseT (retval.index (col2, sl2)); assert (retval.columns () == k-1); @@ -7868,7 +7865,7 @@ octave_idx_type k = retval.rows (); while (order > 0 && k > 0) { - octave::idx_vector col1 (':'), col2 (':'), sl1 (1, k), sl2 (0, k-1); + idx_vector col1 (':'), col2 (':'), sl1 (1, k), sl2 (0, k-1); retval = SparseT (retval.index (sl1, col1)) - SparseT (retval.index (sl2, col2)); assert (retval.rows () == k-1); @@ -8183,18 +8180,18 @@ if (args(0).isinteger ()) { -#define MAKE_INT_BRANCH(X) \ - if (args(0).is_ ## X ## _type ()) \ - { \ - const X##NDArray in = args(0). X## _array_value (); \ - std::size_t inlen = in.numel () * sizeof (X## _t) / sizeof (char); \ +#define MAKE_INT_BRANCH(X) \ + if (args(0).is_ ## X ## _type ()) \ + { \ + const X##NDArray in = args(0). X## _array_value (); \ + std::size_t inlen = in.numel () * sizeof (X## _t) / sizeof (char); \ const char *inc = reinterpret_cast<const char *> (in.data ()); \ - char *out; \ - if (octave::base64_encode (inc, inlen, &out)) \ - { \ - retval(0) = octave_value (out); \ - ::free (out); \ - } \ + char *out; \ + if (base64_encode (inc, inlen, &out)) \ + { \ + retval(0) = octave_value (out); \ + ::free (out); \ + } \ } MAKE_INT_BRANCH(int8) @@ -8219,7 +8216,7 @@ const char* inc; inc = reinterpret_cast<const char *> (in.data ()); char *out; - if (octave::base64_encode (inc, inlen, &out)) + if (base64_encode (inc, inlen, &out)) { retval(0) = octave_value (out); ::free (out); @@ -8233,7 +8230,7 @@ const char* inc; inc = reinterpret_cast<const char *> (in.data ()); char *out; - if (octave::base64_encode (inc, inlen, &out)) + if (base64_encode (inc, inlen, &out)) { retval(0) = octave_value (out); ::free (out); @@ -8285,7 +8282,7 @@ std::string str = args(0).string_value (); - Array<double> retval = octave::base64_decode (str); + Array<double> retval = base64_decode (str); if (nargin == 2) { @@ -8341,7 +8338,7 @@ std::string str = args(0).string_value (); - intNDArray<octave_uint8> retval = octave::base64_decode_bytes (str); + intNDArray<octave_uint8> retval = base64_decode_bytes (str); if (nargin == 2) {
--- a/libinterp/corefcn/defaults.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/defaults.cc Sat Aug 14 22:48:52 2021 -0400 @@ -459,7 +459,7 @@ if (args.length () != 0) print_usage (); - return ovl (octave::config::octave_home ()); + return ovl (config::octave_home ()); } /* @@ -480,7 +480,7 @@ if (args.length () != 0) print_usage (); - return ovl (octave::config::octave_exec_home ()); + return ovl (config::octave_exec_home ()); } /* @@ -516,7 +516,7 @@ if (args.length () != 0) print_usage (); - return ovl (octave::sys::env::get_user_config_directory ()); + return ovl (sys::env::get_user_config_directory ()); } /* @@ -534,7 +534,7 @@ if (args.length () != 0) print_usage (); - return ovl (octave::sys::env::get_user_data_directory ()); + return ovl (sys::env::get_user_data_directory ()); } /*
--- a/libinterp/corefcn/dirfns.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/dirfns.cc Sat Aug 14 22:48:52 2021 -0400 @@ -107,7 +107,7 @@ octave_value_list retval; if (nargout > 0) - retval = octave_value (octave::sys::env::get_current_directory ()); + retval = octave_value (sys::env::get_current_directory ()); if (nargin == 1) { @@ -118,7 +118,7 @@ } else if (nargout == 0) { - std::string home_dir = octave::sys::env::get_home_directory (); + std::string home_dir = sys::env::get_home_directory (); if (! home_dir.empty ()) interp.chdir (home_dir); @@ -137,7 +137,7 @@ @seealso{cd, dir, ls, mkdir, rmdir} @end deftypefn */) { - return ovl (octave::sys::env::get_current_directory ()); + return ovl (sys::env::get_current_directory ()); } DEFUN (readdir, args, , @@ -161,12 +161,12 @@ octave_value_list retval = ovl (Cell (), -1.0, ""); - dirname = octave::sys::file_ops::tilde_expand (dirname); + dirname = sys::file_ops::tilde_expand (dirname); string_vector dirlist; std::string msg; - if (octave::sys::get_dirlist (dirname, dirlist, msg)) + if (sys::get_dirlist (dirname, dirlist, msg)) { retval(0) = Cell (dirlist.sort ()); retval(1) = 0.0; @@ -199,14 +199,14 @@ std::string parent = args(0).xstring_value ("mkdir: PARENT must be a string"); std::string dir = args(1).xstring_value ("mkdir: DIR must be a string"); - dirname = octave::sys::file_ops::concat (parent, dir); + dirname = sys::file_ops::concat (parent, dir); } else if (nargin == 1) dirname = args(0).xstring_value ("mkdir: DIR must be a string"); - dirname = octave::sys::file_ops::tilde_expand (dirname); + dirname = sys::file_ops::tilde_expand (dirname); - octave::sys::file_stat fs (dirname); + sys::file_stat fs (dirname); if (fs && fs.is_dir ()) { @@ -217,7 +217,7 @@ { std::string msg; - int status = octave::sys::mkdir (dirname, 0777, msg); + int status = sys::mkdir (dirname, 0777, msg); if (status < 0) return ovl (false, msg, "mkdir"); @@ -251,12 +251,12 @@ std::string dirname = args(0).xstring_value ("rmdir: DIR must be a string"); - std::string fulldir = octave::sys::file_ops::tilde_expand (dirname); + std::string fulldir = sys::file_ops::tilde_expand (dirname); octave_value_list retval; int status = -1; std::string msg; - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); if (nargin == 2) { @@ -266,10 +266,10 @@ bool doit = true; if (interp.interactive () - && ! octave::application::forced_interactive () + && ! application::forced_interactive () && Vconfirm_recursive_rmdir) { - octave::input_system& input_sys = interp.get_input_system (); + input_system& input_sys = interp.get_input_system (); std::string prompt = "remove entire contents of " + fulldir + "? "; @@ -279,13 +279,13 @@ if (doit) { evmgr.file_remove (fulldir, ""); - status = octave::sys::recursive_rmdir (fulldir, msg); + status = sys::recursive_rmdir (fulldir, msg); } } else { evmgr.file_remove (fulldir, ""); - status = octave::sys::rmdir (fulldir, msg); + status = sys::rmdir (fulldir, msg); } evmgr.file_renamed (status >= 0); @@ -324,13 +324,13 @@ std::string from = args(0).xstring_value ("link: OLD must be a string"); std::string to = args(1).xstring_value ("link: NEW must be a string"); - from = octave::sys::file_ops::tilde_expand (from); - to = octave::sys::file_ops::tilde_expand (to); + from = sys::file_ops::tilde_expand (from); + to = sys::file_ops::tilde_expand (to); octave_value_list retval; std::string msg; - int status = octave::sys::link (from, to, msg); + int status = sys::link (from, to, msg); if (nargout == 0) { @@ -366,13 +366,13 @@ std::string from = args(0).xstring_value ("symlink: OLD must be a string"); std::string to = args(1).xstring_value ("symlink: NEW must be a string"); - from = octave::sys::file_ops::tilde_expand (from); - to = octave::sys::file_ops::tilde_expand (to); + from = sys::file_ops::tilde_expand (from); + to = sys::file_ops::tilde_expand (to); octave_value_list retval; std::string msg; - int status = octave::sys::symlink (from, to, msg); + int status = sys::symlink (from, to, msg); if (nargout == 0) { @@ -408,11 +408,11 @@ std::string symlink = args(0).xstring_value ("readlink: SYMLINK must be a string"); - symlink = octave::sys::file_ops::tilde_expand (symlink); + symlink = sys::file_ops::tilde_expand (symlink); std::string result, msg; - int status = octave::sys::readlink (symlink, result, msg); + int status = sys::readlink (symlink, result, msg); if (status < 0) return ovl ("", -1.0, msg); @@ -438,17 +438,17 @@ std::string from = args(0).xstring_value ("rename: OLD must be a string"); std::string to = args(1).xstring_value ("rename: NEW must be a string"); - from = octave::sys::file_ops::tilde_expand (from); - to = octave::sys::file_ops::tilde_expand (to); + from = sys::file_ops::tilde_expand (from); + to = sys::file_ops::tilde_expand (to); octave_value_list retval; std::string msg; - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); evmgr.file_remove (from, to); - int status = octave::sys::rename (from, to, msg); + int status = sys::rename (from, to, msg); evmgr.file_renamed (status >= 0); @@ -529,7 +529,7 @@ string_vector pat = args(0).xstring_vector_value ("glob: PATTERN must be a string"); - glob_match pattern (octave::sys::file_ops::tilde_expand (pat)); + glob_match pattern (sys::file_ops::tilde_expand (pat)); return ovl (Cell (pattern.glob ())); } @@ -596,9 +596,9 @@ string_vector pat = args(0).string_vector_value (); - string_vector pattern (octave::sys::file_ops::tilde_expand (pat)); + string_vector pattern (sys::file_ops::tilde_expand (pat)); - return ovl (Cell (octave::sys::windows_glob (pattern))); + return ovl (Cell (sys::windows_glob (pattern))); } /* @@ -657,7 +657,7 @@ string_vector pat = args(0).string_vector_value (); string_vector str = args(1).string_vector_value (); - glob_match pattern (octave::sys::file_ops::tilde_expand (pat)); + glob_match pattern (sys::file_ops::tilde_expand (pat)); return ovl (pattern.match (str)); } @@ -683,14 +683,14 @@ octave_value retval; if (nargin == 0) - retval = octave::sys::file_ops::dir_sep_str (); + retval = sys::file_ops::dir_sep_str (); else { std::string s = args(0).xstring_value ("filesep: argument must be a string"); if (s != "all") error (R"(filesep: argument must be "all")"); - retval = octave::sys::file_ops::dir_sep_chars (); + retval = sys::file_ops::dir_sep_chars (); } return retval; @@ -706,7 +706,7 @@ if (args.length () > 0) print_usage (); - return ovl (octave::directory_path::path_sep_str ()); + return ovl (directory_path::path_sep_str ()); } DEFUN (confirm_recursive_rmdir, args, nargout,
--- a/libinterp/corefcn/display.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/display.cc Sat Aug 14 22:48:52 2021 -0400 @@ -61,7 +61,7 @@ @seealso{isguirunning} @end deftypefn */) { - octave::display_info& dpy_info = interp.get_display_info (); + display_info& dpy_info = interp.get_display_info (); return ovl (dpy_info.display_available ()); }
--- a/libinterp/corefcn/dlmread.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/dlmread.cc Sat Aug 14 22:48:52 2021 -0400 @@ -227,12 +227,12 @@ // Filename. std::string fname (args(0).string_value ()); - std::string tname = octave::sys::file_ops::tilde_expand (fname); + std::string tname = sys::file_ops::tilde_expand (fname); - tname = octave::find_data_file_in_load_path ("dlmread", tname); + tname = find_data_file_in_load_path ("dlmread", tname); #if defined (OCTAVE_USE_WINDOWS_API) - std::wstring wname = octave::sys::u8_to_wstring (tname); + std::wstring wname = sys::u8_to_wstring (tname); input_file.open (wname.c_str (), std::ios::in); #else input_file.open (tname.c_str (), std::ios::in); @@ -245,9 +245,9 @@ } else if (args(0).is_scalar_type ()) { - octave::stream_list& streams = interp.get_stream_list (); + stream_list& streams = interp.get_stream_list (); - octave::stream is = streams.lookup (args(0), "dlmread"); + stream is = streams.lookup (args(0), "dlmread"); input = is.input_stream (); @@ -262,7 +262,7 @@ if (nargin > 1) { if (args(1).is_sq_string ()) - sep = octave::do_string_escapes (args(1).string_value ()); + sep = do_string_escapes (args(1).string_value ()); else sep = args(1).string_value (); } @@ -340,7 +340,7 @@ char *prev_locale = std::setlocale (LC_ALL, nullptr); std::string old_locale (prev_locale ? prev_locale : ""); std::setlocale (LC_ALL, "C"); - octave::unwind_action act + unwind_action act ([old_locale] () { std::setlocale (LC_ALL, old_locale.c_str ()); }); std::string line; @@ -481,7 +481,7 @@ tmp_stream.str (str); tmp_stream.clear (); - double x = octave::read_value<double> (tmp_stream); + double x = read_value<double> (tmp_stream); if (tmp_stream) { if (tmp_stream.eof ()) @@ -523,7 +523,7 @@ } else { - double y = octave::read_value<double> (tmp_stream); + double y = read_value<double> (tmp_stream); if (! iscmplx && y != 0.0) { @@ -540,7 +540,7 @@ } else { - // octave::read_value<double>() parsing failed + // read_value<double>() parsing failed j++; // Leave data initialized to empty_value }
--- a/libinterp/corefcn/dmperm.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/dmperm.cc Sat Aug 14 22:48:52 2021 -0400 @@ -49,7 +49,7 @@ #if defined (HAVE_CXSPARSE) static RowVector -put_int (octave::suitesparse_integer *p, octave_idx_type n) +put_int (suitesparse_integer *p, octave_idx_type n) { RowVector ret (n); for (octave_idx_type i = 0; i < n; i++) @@ -75,20 +75,20 @@ { m = arg.sparse_matrix_value (); csm.nzmax = m.nnz (); - csm.p = octave::to_suitesparse_intptr (m.xcidx ()); - csm.i = octave::to_suitesparse_intptr (m.xridx ()); + csm.p = to_suitesparse_intptr (m.xcidx ()); + csm.i = to_suitesparse_intptr (m.xridx ()); } else { cm = arg.sparse_complex_matrix_value (); csm.nzmax = cm.nnz (); - csm.p = octave::to_suitesparse_intptr (cm.xcidx ()); - csm.i = octave::to_suitesparse_intptr (cm.xridx ()); + csm.p = to_suitesparse_intptr (cm.xcidx ()); + csm.i = to_suitesparse_intptr (cm.xridx ()); } if (nargout <= 1 || rank) { - octave::suitesparse_integer *jmatch = CXSPARSE_NAME (_maxtrans) (&csm, 0); + suitesparse_integer *jmatch = CXSPARSE_NAME (_maxtrans) (&csm, 0); if (rank) { octave_idx_type r = 0;
--- a/libinterp/corefcn/dot.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/dot.cc Sat Aug 14 22:48:52 2021 -0400 @@ -66,9 +66,9 @@ } } - m = octave::to_f77_int (tmp_m); - n = octave::to_f77_int (tmp_n); - k = octave::to_f77_int (tmp_k); + m = to_f77_int (tmp_m); + n = to_f77_int (tmp_n); + k = to_f77_int (tmp_k); } DEFUN (dot, args, , @@ -192,7 +192,7 @@ // exceed intmax. octave_value_list tmp; tmp(1) = dim + 1; - tmp(0) = octave::binary_op (octave_value::op_el_mul, argx, argy); + tmp(0) = binary_op (octave_value::op_el_mul, argx, argy); tmp = Fsum (tmp, 1); if (! tmp.empty ()) @@ -302,9 +302,9 @@ { int nd = dimx.ndims (); - m = octave::to_f77_int (dimx(0)); - k = octave::to_f77_int (dimx(1)); - n = octave::to_f77_int (dimy(1)); + m = to_f77_int (dimx(0)); + k = to_f77_int (dimx(1)); + n = to_f77_int (dimy(1)); octave_idx_type tmp_np = 1; @@ -321,7 +321,7 @@ tmp_np *= dimz(i); } - np = octave::to_f77_int (tmp_np); + np = to_f77_int (tmp_np); if (! match) error ("blkmm: A and B dimensions don't match: (%s) and (%s)",
--- a/libinterp/corefcn/eig.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/eig.cc Sat Aug 14 22:48:52 2021 -0400 @@ -151,17 +151,17 @@ err_wrong_type_arg ("eig", args(i)); std::string arg_i = args(i).string_value (); - if (octave::string::strcmpi (arg_i, "qz")) + if (string::strcmpi (arg_i, "qz")) qz_flag = true; - else if (octave::string::strcmpi (arg_i, "chol")) + else if (string::strcmpi (arg_i, "chol")) chol_flag = true; - else if (octave::string::strcmpi (arg_i, "balance")) + else if (string::strcmpi (arg_i, "balance")) balance_flag = true; - else if (octave::string::strcmpi (arg_i, "nobalance")) + else if (string::strcmpi (arg_i, "nobalance")) no_balance_flag = true; - else if (octave::string::strcmpi (arg_i, "matrix")) + else if (string::strcmpi (arg_i, "matrix")) matrix_flag = true; - else if (octave::string::strcmpi (arg_i, "vector")) + else if (string::strcmpi (arg_i, "vector")) vector_flag = true; else error (R"(eig: invalid option "%s")", arg_i.c_str ());
--- a/libinterp/corefcn/ellipj.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/ellipj.cc Sat Aug 14 22:48:52 2021 -0400 @@ -95,7 +95,7 @@ double sn, cn, dn; double err = 0; - octave::math::ellipj (u, m, sn, cn, dn, err); + math::ellipj (u, m, sn, cn, dn, err); return ovl (sn, cn, dn, err); } @@ -107,7 +107,7 @@ Complex sn, cn, dn; double err = 0; - octave::math::ellipj (u, m, sn, cn, dn, err); + math::ellipj (u, m, sn, cn, dn, err); return ovl (sn, cn, dn, err); } @@ -130,7 +130,7 @@ octave_idx_type nel = u.numel (); for (octave_idx_type i = 0; i < nel; i++) - octave::math::ellipj (pu[i], m, psn[i], pcn[i], pdn[i], perr[i]); + math::ellipj (pu[i], m, psn[i], pcn[i], pdn[i], perr[i]); return ovl (sn, cn, dn, err); } @@ -160,7 +160,7 @@ octave_idx_type nel = m.numel (); for (octave_idx_type i = 0; i < nel; i++) - octave::math::ellipj (u, pm[i], psn[i], pcn[i], pdn[i], perr[i]); + math::ellipj (u, pm[i], psn[i], pcn[i], pdn[i], perr[i]); return ovl (sn, cn, dn, err); } @@ -180,7 +180,7 @@ octave_idx_type nel = m.numel (); for (octave_idx_type i = 0; i < nel; i++) - octave::math::ellipj (u, pm[i], psn[i], pcn[i], pdn[i], perr[i]); + math::ellipj (u, pm[i], psn[i], pcn[i], pdn[i], perr[i]); return ovl (sn, cn, dn, err); } @@ -211,7 +211,7 @@ for (octave_idx_type j = 0; j < mc; j++) for (octave_idx_type i = 0; i < ur; i++) - octave::math::ellipj (pu[i], pm[j], sn(i,j), cn(i,j), dn(i,j), err(i,j)); + math::ellipj (pu[i], pm[j], sn(i,j), cn(i,j), dn(i,j), err(i,j)); return ovl (sn, cn, dn, err); } @@ -229,7 +229,7 @@ octave_idx_type nel = m.numel (); for (octave_idx_type i = 0; i < nel; i++) - octave::math::ellipj (pu[i], pm[i], psn[i], pcn[i], pdn[i], perr[i]); + math::ellipj (pu[i], pm[i], psn[i], pcn[i], pdn[i], perr[i]); return ovl (sn, cn, dn, err); } @@ -259,7 +259,7 @@ for (octave_idx_type j = 0; j < mc; j++) for (octave_idx_type i = 0; i < ur; i++) - octave::math::ellipj (pu[i], pm[j], sn(i,j), cn(i,j), dn(i,j), err(i,j)); + math::ellipj (pu[i], pm[j], sn(i,j), cn(i,j), dn(i,j), err(i,j)); return ovl (sn, cn, dn, err); } @@ -277,7 +277,7 @@ octave_idx_type nel = m.numel (); for (octave_idx_type i = 0; i < nel; i++) - octave::math::ellipj (pu[i], pm[i], psn[i], pcn[i], pdn[i], perr[i]); + math::ellipj (pu[i], pm[i], psn[i], pcn[i], pdn[i], perr[i]); return ovl (sn, cn, dn, err); }
--- a/libinterp/corefcn/environment.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/environment.cc Sat Aug 14 22:48:52 2021 -0400 @@ -171,7 +171,7 @@ @seealso{edit, edit_history} @end deftypefn */) { - octave::environment& env = interp.get_environment (); + environment& env = interp.get_environment (); return env.editor (args, nargout); } @@ -208,7 +208,7 @@ @seealso{IMAGE_PATH, OCTAVE_HOME, OCTAVE_EXEC_HOME} @end deftypefn */) { - octave::environment& env = interp.get_environment (); + environment& env = interp.get_environment (); return env.exec_path (args, nargout); } @@ -240,7 +240,7 @@ @seealso{EXEC_PATH, OCTAVE_HOME, OCTAVE_EXEC_HOME} @end deftypefn */) { - octave::environment& env = interp.get_environment (); + environment& env = interp.get_environment (); return env.image_path (args, nargout); }
--- a/libinterp/corefcn/error.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/error.cc Sat Aug 14 22:48:52 2021 -0400 @@ -1162,12 +1162,12 @@ std::string msg = err.contents ("message").string_value (); std::string id = err.contents ("identifier").string_value (); - octave_map err_stack = octave::init_error_stack (interp); + octave_map err_stack = init_error_stack (interp); if (err.contains ("stack")) err_stack = err.contents ("stack").xmap_value ("ERR.STACK must be a struct"); - octave::error_system& es = interp.get_error_system (); + error_system& es = interp.get_error_system (); es.rethrow_error (id, msg, err_stack); @@ -1272,7 +1272,7 @@ std::string id; std::string message; - std::list<octave::frame_info> stack_info; + std::list<frame_info> stack_info; bool have_fmt = false; @@ -1310,7 +1310,7 @@ if (c.isstruct ()) stack_info - = octave::error_system::make_stack_frame_list (c.map_value ()); + = error_system::make_stack_frame_list (c.map_value ()); } } else @@ -1327,7 +1327,7 @@ if (have_fmt) { - octave_value_list tmp = octave::Fsprintf (nargs, 1); + octave_value_list tmp = Fsprintf (nargs, 1); arg = tmp(0); } else @@ -1346,7 +1346,7 @@ if (message.empty ()) return retval; - octave::error_system& es = interp.get_error_system (); + error_system& es = interp.get_error_system (); es.throw_error ("error", id, message, stack_info); @@ -1480,7 +1480,7 @@ int nargin = args.length (); bool done = false; - octave::error_system& es = interp.get_error_system (); + error_system& es = interp.get_error_system (); if (nargin > 0 && args.all_strings_p ()) { @@ -1520,10 +1520,10 @@ octave_value curr_state = val.contents ("state"); // FIXME: this might be better with a dictionary object. - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); octave_value curr_warning_states - = tw.get_auto_fcn_var (octave::stack_frame::SAVED_WARNING_STATES); + = tw.get_auto_fcn_var (stack_frame::SAVED_WARNING_STATES); octave_map m; @@ -1571,7 +1571,7 @@ m.contents ("identifier") = ids; m.contents ("state") = states; - tw.set_auto_fcn_var (octave::stack_frame::SAVED_WARNING_STATES, m); + tw.set_auto_fcn_var (stack_frame::SAVED_WARNING_STATES, m); // Now ignore the "local" argument, // and continue to handle the current setting. @@ -1823,25 +1823,23 @@ args(1) = id; args(0) = state; - octave::interpreter& interp - = octave::__get_interpreter__ ("set_warning_state"); + interpreter& interp = __get_interpreter__ ("set_warning_state"); - return octave::Fwarning (interp, args, 1); + return Fwarning (interp, args, 1); } octave_value_list set_warning_state (const octave_value_list& args) { - octave::interpreter& interp - = octave::__get_interpreter__ ("set_warning_state"); + interpreter& interp = __get_interpreter__ ("set_warning_state"); - return octave::Fwarning (interp, args, 1); + return Fwarning (interp, args, 1); } int warning_enabled (const std::string& id) { - octave::error_system& es = octave::__get_error_system__ ("warning_enabled"); + error_system& es = __get_error_system__ ("warning_enabled"); return es.warning_enabled (id); } @@ -1849,7 +1847,7 @@ void disable_warning (const std::string& id) { - octave::error_system& es = octave::__get_error_system__ ("disable_warning"); + error_system& es = __get_error_system__ ("disable_warning"); es.disable_warning (id); } @@ -1906,7 +1904,7 @@ if (nargin > 1) print_usage (); - octave::error_system& es = interp.get_error_system (); + error_system& es = interp.get_error_system (); octave_scalar_map err; @@ -1917,7 +1915,7 @@ if (nargin == 1) { - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); if (args(0).is_string ()) { @@ -2052,7 +2050,7 @@ if (nargin > 2) print_usage (); - octave::error_system& es = interp.get_error_system (); + error_system& es = interp.get_error_system (); string_vector argv = args.make_argv ("lasterr"); @@ -2097,7 +2095,7 @@ if (nargin > 2) print_usage (); - octave::error_system& es = interp.get_error_system (); + error_system& es = interp.get_error_system (); string_vector argv = args.make_argv ("lastwarn"); @@ -2134,7 +2132,7 @@ The original variable value is restored when exiting the function. @end deftypefn */) { - octave::error_system& es = interp.get_error_system (); + error_system& es = interp.get_error_system (); return es.beep_on_error (args, nargout); } @@ -2156,7 +2154,7 @@ @seealso{debug_on_warning, debug_on_interrupt} @end deftypefn */) { - octave::error_system& es = interp.get_error_system (); + error_system& es = interp.get_error_system (); return es.debug_on_error (args, nargout); } @@ -2175,16 +2173,15 @@ @seealso{debug_on_error, debug_on_interrupt} @end deftypefn */) { - octave::error_system& es = interp.get_error_system (); + error_system& es = interp.get_error_system (); return es.debug_on_warning (args, nargout); } void -interpreter_try (octave::unwind_protect& frame) +interpreter_try (unwind_protect& frame) { - octave::error_system& es - = octave::__get_error_system__ ("interpreter_try"); + error_system& es = __get_error_system__ ("interpreter_try"); es.interpreter_try (frame); }
--- a/libinterp/corefcn/event-manager.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/event-manager.cc Sat Aug 14 22:48:52 2021 -0400 @@ -201,7 +201,7 @@ { if (interp.experimental_terminal_widget ()) { - if (! octave::application::is_gui_running ()) + if (! application::is_gui_running ()) { // FIXME: Currently, the following action is queued and // executed in a Qt event loop and we return immediately to @@ -210,7 +210,7 @@ // waiting until the GUI exits to return to the command // prompt, similar to the way the UI* functions work? - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); evmgr.start_gui (); } @@ -229,7 +229,7 @@ Undocumented internal function. @end deftypefn */) { - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); return ovl (evmgr.enabled ()); } @@ -242,14 +242,14 @@ { octave_value retval; - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); if (args.length () == 1) { std::string file = args(0).xstring_value ("first argument must be filename"); - octave::flush_stdout (); + flush_stdout (); retval = evmgr.edit_file (file); } @@ -258,7 +258,7 @@ std::string file = args(0).xstring_value ("first argument must be filename"); - octave::flush_stdout (); + flush_stdout (); retval = evmgr.prompt_new_edit_file (file); } @@ -283,9 +283,9 @@ std::string btn3 = args(4).xstring_value ("invalid arguments"); std::string btndef = args(5).xstring_value ("invalid arguments"); - octave::flush_stdout (); + flush_stdout (); - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); retval = evmgr.question_dialog (msg, title, btn1, btn2, btn3, btndef); } @@ -313,16 +313,16 @@ octave_idx_type nel; - octave::event_manager::filter_list filter_lst; + event_manager::filter_list filter_lst; for (octave_idx_type i = 0; i < flist.rows (); i++) filter_lst.push_back (std::make_pair (flist(i,0), (flist.columns () > 1 ? flist(i,1) : ""))); - octave::flush_stdout (); + flush_stdout (); - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); std::list<std::string> items_lst = evmgr.file_dialog (filter_lst, title, filename, pathname, multi_on); @@ -401,9 +401,9 @@ std::string ok_string = args(6).string_value (); std::string cancel_string = args(7).string_value (); - octave::flush_stdout (); + flush_stdout (); - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); std::pair<std::list<int>, int> result = evmgr.list_dialog (list_lst, mode, width, height, initial_lst, @@ -454,9 +454,9 @@ for (octave_idx_type i = 0; i < nel; i++) defaults_lst.push_back (tmp(i)); - octave::flush_stdout (); + flush_stdout (); - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); std::list<std::string> items_lst = evmgr.input_dialog (prompt_lst, title, nr, nc, defaults_lst); @@ -483,7 +483,7 @@ { std::string icon_name = args(0).xstring_value ("invalid arguments"); - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); retval = evmgr.get_named_icon (icon_name); } @@ -497,7 +497,7 @@ Undocumented internal function. @end deftypefn */) { - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); return ovl (evmgr.show_preferences ()); } @@ -508,7 +508,7 @@ Undocumented internal function. @end deftypefn */) { - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); return ovl (evmgr.apply_preferences ()); } @@ -531,9 +531,9 @@ if (args.length () >= 2) value = args(1).string_value(); - if (octave::application::is_gui_running ()) + if (application::is_gui_running ()) { - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); return ovl (evmgr.gui_preference (key, value)); } @@ -558,7 +558,7 @@ error ("__event_manager_file_remove__: " "old and new name expected as arguments"); - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); evmgr.file_remove (old_name, new_name); @@ -579,7 +579,7 @@ error ("__event_manager_file_renamed__: " "first argument must be boolean for reload new named file"); - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); evmgr.file_renamed (load_new); @@ -605,7 +605,7 @@ if (val.is_undefined ()) error ("openvar: '%s' is not a variable", name.c_str ()); - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); evmgr.edit_variable (name, val); @@ -626,7 +626,7 @@ { std::string file; - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); evmgr.show_terminal_window (); @@ -644,7 +644,7 @@ if (args.length () >= 1) file = args(0).string_value(); - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); return ovl (evmgr.show_documentation (file)); } @@ -660,7 +660,7 @@ if (args.length () >= 1) file = args(0).string_value(); - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); return ovl (evmgr.register_documentation (file)); } @@ -676,7 +676,7 @@ if (args.length () >= 1) file = args(0).string_value(); - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); return ovl (evmgr.unregister_documentation (file)); } @@ -687,7 +687,7 @@ Undocumented internal function. @end deftypefn */) { - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); evmgr.show_file_browser (); @@ -700,7 +700,7 @@ Undocumented internal function. @end deftypefn */) { - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); evmgr.show_command_history (); @@ -713,7 +713,7 @@ Undocumented internal function. @end deftypefn */) { - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); evmgr.show_workspace (); @@ -726,7 +726,7 @@ Undocumented internal function. @end deftypefn */) { - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); evmgr.show_community_news (); @@ -739,7 +739,7 @@ Undocumented internal function. @end deftypefn */) { - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); evmgr.show_release_notes (); @@ -775,7 +775,7 @@ feature = args(0).string_value (); status = args(1).string_value (); - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); return ovl (evmgr.gui_status_update (feature, status)); } @@ -786,7 +786,7 @@ Undocumented internal function. @end deftypefn */) { - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); return ovl (evmgr.update_gui_lexer ()); } @@ -802,7 +802,7 @@ if (args.length () >= 1) file = args(0).string_value(); - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); evmgr.copy_image_to_clipboard (file); return ovl (); } @@ -817,7 +817,7 @@ if (args.length () != 0) print_usage (); - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); evmgr.focus_window ("history"); return ovl (); } @@ -832,7 +832,7 @@ if (args.length () != 0) print_usage (); - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); evmgr.focus_window ("command"); return ovl (); } @@ -847,7 +847,7 @@ if (args.length () != 0) print_usage (); - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); evmgr.focus_window ("filebrowser"); return ovl (); } @@ -862,7 +862,7 @@ if (args.length () != 0) print_usage (); - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); evmgr.focus_window ("workspace"); return ovl (); }
--- a/libinterp/corefcn/fft.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/fft.cc Sat Aug 14 22:48:52 2021 -0400 @@ -57,10 +57,10 @@ if (! args(1).isempty ()) { double dval = args(1).double_value (); - if (octave::math::isnan (dval)) + if (math::isnan (dval)) error ("%s: number of points (N) cannot be NaN", fcn); - n_points = octave::math::nint_big (dval); + n_points = math::nint_big (dval); if (n_points < 0) error ("%s: number of points (N) must be greater than zero", fcn); } @@ -69,14 +69,14 @@ if (nargin > 2) { double dval = args(2).double_value (); - if (octave::math::isnan (dval)) + if (math::isnan (dval)) error ("%s: DIM cannot be NaN", fcn); else if (dval < 1 || dval > ndims) error ("%s: DIM must be a valid dimension along which to perform FFT", fcn); else // to be safe, cast it back to int since dim is an int - dim = octave::math::nint (dval) - 1; + dim = math::nint (dval) - 1; } // FIXME: This seems strange and unnecessary (10/21/16). @@ -112,8 +112,8 @@ { octave_value_list idx (ndims); for (octave_idx_type i = 0; i < ndims; i++) - idx(i) = octave::idx_vector::colon; - idx(dim) = octave::idx_vector (0); + idx(i) = idx_vector::colon; + idx(dim) = idx_vector (0); return arg.index_op (idx); }
--- a/libinterp/corefcn/fft2.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/fft2.cc Sat Aug 14 22:48:52 2021 -0400 @@ -55,10 +55,10 @@ if (nargin > 1) { double dval = args(1).double_value (); - if (octave::math::isnan (dval)) + if (math::isnan (dval)) error ("%s: number of rows (N) cannot be NaN", fcn); - n_rows = octave::math::nint_big (dval); + n_rows = math::nint_big (dval); if (n_rows < 0) error ("%s: number of rows (N) must be greater than zero", fcn); } @@ -67,10 +67,10 @@ if (nargin > 2) { double dval = args(2).double_value (); - if (octave::math::isnan (dval)) + if (math::isnan (dval)) error ("%s: number of columns (M) cannot be NaN", fcn); - n_cols = octave::math::nint_big (dval); + n_cols = math::nint_big (dval); if (n_cols < 0) error ("%s: number of columns (M) must be greater than zero", fcn); }
--- a/libinterp/corefcn/fftn.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/fftn.cc Sat Aug 14 22:48:52 2021 -0400 @@ -67,12 +67,12 @@ for (int i = 0; i < dims.ndims (); i++) { - if (octave::math::isnan (val(i,0))) + if (math::isnan (val(i,0))) error ("%s: SIZE has invalid NaN entries", fcn); - else if (octave::math::nint_big (val(i,0)) < 0) + else if (math::nint_big (val(i,0)) < 0) error ("%s: all dimensions in SIZE must be greater than zero", fcn); else - dims(i) = octave::math::nint_big(val(i,0)); + dims(i) = math::nint_big(val(i,0)); } }
--- a/libinterp/corefcn/file-io.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/file-io.cc Sat Aug 14 22:48:52 2021 -0400 @@ -192,7 +192,7 @@ if (args.length () != 1) print_usage (); - octave::stream_list& streams = interp.get_stream_list (); + stream_list& streams = interp.get_stream_list (); return ovl (streams.remove (args(0), "fclose")); } @@ -208,11 +208,11 @@ if (args.length () != 1) print_usage (); - octave::stream_list& streams = interp.get_stream_list (); + stream_list& streams = interp.get_stream_list (); int fid = streams.get_file_number (args(0)); - octave::stream os = streams.lookup (fid, "fclear"); + stream os = streams.lookup (fid, "fclear"); os.clearerr (); @@ -239,20 +239,20 @@ octave_value retval = -1; - octave::stream_list& streams = interp.get_stream_list (); + stream_list& streams = interp.get_stream_list (); // FIXME: any way to avoid special case for stdout? int fid = streams.get_file_number (args(0)); if (fid == 1) { - octave::flush_stdout (); + flush_stdout (); retval = 0; } else { - octave::stream os = streams.lookup (fid, "fflush"); + stream os = streams.lookup (fid, "fflush"); retval = os.flush (); } @@ -287,9 +287,9 @@ if (nargin < 1 || nargin > 2) print_usage (); - octave::stream_list& streams = interp.get_stream_list (); - - octave::stream os = streams.lookup (args(0), who); + stream_list& streams = interp.get_stream_list (); + + stream os = streams.lookup (args(0), who); octave_value len_arg = (nargin == 2) ? args(1) : octave_value (); @@ -330,9 +330,9 @@ if (nargin < 1 || nargin > 2) print_usage (); - octave::stream_list& streams = interp.get_stream_list (); - - octave::stream os = streams.lookup (args(0), who); + stream_list& streams = interp.get_stream_list (); + + stream os = streams.lookup (args(0), who); octave_value len_arg = (nargin == 2) ? args(1) : octave_value (); @@ -372,9 +372,9 @@ if (nargin < 1 || nargin > 2) print_usage (); - octave::stream_list& streams = interp.get_stream_list (); - - octave::stream os = streams.lookup (args(0), who); + stream_list& streams = interp.get_stream_list (); + + stream os = streams.lookup (args(0), who); octave_value count_arg = (nargin == 2) ? args(1) : octave_value (); @@ -388,11 +388,11 @@ return ovl (); } -static octave::stream +static stream do_stream_open (const std::string& name, const std::string& mode_arg, const std::string& arch, std::string encoding, int& fid) { - octave::stream retval; + stream retval; fid = -1; @@ -419,22 +419,22 @@ std::ios::openmode md = fopen_mode_to_ios_mode (mode); - octave::mach_info::float_format flt_fmt - = octave::mach_info::string_to_float_format (arch); - - std::string fname = octave::sys::file_ops::tilde_expand (name); - - octave::sys::file_stat fs (fname); + mach_info::float_format flt_fmt + = mach_info::string_to_float_format (arch); + + std::string fname = sys::file_ops::tilde_expand (name); + + sys::file_stat fs (fname); if (! (md & std::ios::out)) - fname = octave::find_data_file_in_load_path ("fopen", fname); + fname = find_data_file_in_load_path ("fopen", fname); if (! fs.is_dir ()) { #if defined (HAVE_ZLIB) if (use_zlib) { - FILE *fptr = octave::sys::fopen (fname.c_str (), mode.c_str ()); + FILE *fptr = sys::fopen (fname.c_str (), mode.c_str ()); if (fptr) { @@ -451,7 +451,7 @@ else #endif { - FILE *fptr = octave::sys::fopen (fname, mode); + FILE *fptr = sys::fopen (fname, mode); retval = octave_stdiostream::create (fname, fptr, md, flt_fmt, encoding); @@ -465,12 +465,12 @@ return retval; } -static octave::stream +static stream do_stream_open (const octave_value& tc_name, const octave_value& tc_mode, const octave_value& tc_arch, const octave_value& tc_encoding, const char *fcn, int& fid) { - octave::stream retval; + stream retval; fid = -1; @@ -599,7 +599,7 @@ octave_value_list retval = ovl (-1.0); - octave::stream_list& streams = interp.get_stream_list (); + stream_list& streams = interp.get_stream_list (); if (nargin == 1) { @@ -626,7 +626,7 @@ octave_value arch = (nargin > 2) ? args(2) : octave_value ("native"); - octave::input_system& input_sys = interp.get_input_system (); + input_system& input_sys = interp.get_input_system (); octave_value encoding = (nargin > 3) ? args(3) : octave_value (input_sys.mfile_encoding ()); if (encoding.string_value () == "system") @@ -634,7 +634,7 @@ int fid = -1; - octave::stream os = do_stream_open (args(0), mode, arch, encoding, "fopen", + stream os = do_stream_open (args(0), mode, arch, encoding, "fopen", fid); if (os) @@ -690,7 +690,7 @@ if (args.length () > 0) warning ("freport: ignoring extra arguments"); - octave::stream_list& streams = interp.get_stream_list (); + stream_list& streams = interp.get_stream_list (); octave_stdout << streams.list_open_files (); @@ -714,9 +714,9 @@ int result = -1; - octave::stream_list& streams = interp.get_stream_list (); - - octave::stream os = streams.lookup (args(0), "frewind"); + stream_list& streams = interp.get_stream_list (); + + stream os = streams.lookup (args(0), "frewind"); result = os.rewind (); @@ -750,9 +750,9 @@ if (nargin < 2 || nargin > 3) print_usage (); - octave::stream_list& streams = interp.get_stream_list (); - - octave::stream os = streams.lookup (args(0), "fseek"); + stream_list& streams = interp.get_stream_list (); + + stream os = streams.lookup (args(0), "fseek"); octave_value origin_arg = (nargin == 3) ? args(2) : octave_value (-1.0); @@ -770,15 +770,15 @@ if (args.length () != 1) print_usage (); - octave::stream_list& streams = interp.get_stream_list (); - - octave::stream os = streams.lookup (args(0), "ftell"); + stream_list& streams = interp.get_stream_list (); + + stream os = streams.lookup (args(0), "ftell"); return ovl (os.tell ()); } static octave_value_list -printf_internal (octave::interpreter& interp, const std::string& who, +printf_internal (interpreter& interp, const std::string& who, const octave_value_list& args, int nargout) { int nargin = args.length (); @@ -788,10 +788,10 @@ int result; - octave::stream os; + stream os; int fmt_n = 0; - octave::stream_list& streams = interp.get_stream_list (); + stream_list& streams = interp.get_stream_list (); if (args(0).is_string ()) os = streams.lookup (1, who); @@ -873,15 +873,15 @@ } static octave_value_list -puts_internal (octave::interpreter& interp, const std::string& who, +puts_internal (interpreter& interp, const std::string& who, const octave_value_list& args) { if (args.length () != 2) print_usage (); - octave::stream_list& streams = interp.get_stream_list (); - - octave::stream os = streams.lookup (args(0), who); + stream_list& streams = interp.get_stream_list (); + + stream os = streams.lookup (args(0), who); return ovl (os.puts (args(1), who)); } @@ -953,8 +953,8 @@ // from it to return. octave_ostrstream *ostr = new octave_ostrstream (); - // The octave::stream destructor will delete OSTR for us. - octave::stream os (ostr); + // The stream destructor will delete OSTR for us. + stream os (ostr); if (! os.is_valid ()) error ("%s: unable to create output buffer", who.c_str ()); @@ -989,7 +989,7 @@ } static octave_value_list -scanf_internal (octave::interpreter& interp, const std::string& who, +scanf_internal (interpreter& interp, const std::string& who, const octave_value_list& args) { int nargin = args.length (); @@ -999,9 +999,9 @@ octave_value_list retval; - octave::stream_list& streams = interp.get_stream_list (); - - octave::stream os = streams.lookup (args(0), who); + stream_list& streams = interp.get_stream_list (); + + stream os = streams.lookup (args(0), who); if (! args(1).is_string ()) error ("%s: format TEMPLATE must be a string", who.c_str ()); @@ -1121,7 +1121,7 @@ std::string data = get_scan_string_data (args(0), who); - octave::stream os = octave_istrstream::create (data); + stream os = octave_istrstream::create (data); if (! os.is_valid ()) error ("%s: unable to create temporary input buffer", who.c_str ()); @@ -1182,13 +1182,13 @@ } static octave_value_list -textscan_internal (octave::interpreter& interp, const std::string& who, +textscan_internal (interpreter& interp, const std::string& who, const octave_value_list& args) { if (args.length () < 1) print_usage (who); - octave::stream os; + stream os; if (args(0).is_string ()) { @@ -1201,7 +1201,7 @@ } else { - octave::stream_list& streams = interp.get_stream_list (); + stream_list& streams = interp.get_stream_list (); os = streams.lookup (args(0), who); } @@ -1220,7 +1220,7 @@ fmt = args(1).string_value (); if (args(1).is_sq_string ()) - fmt = octave::do_string_escapes (fmt); + fmt = do_string_escapes (fmt); nskip++; } @@ -2367,7 +2367,7 @@ */ static octave_value -do_fread (octave::stream& os, const octave_value& size_arg, +do_fread (stream& os, const octave_value& size_arg, const octave_value& prec_arg, const octave_value& skip_arg, const octave_value& arch_arg, octave_idx_type& count) { @@ -2386,7 +2386,7 @@ oct_data_conv::string_to_data_type (prec, block_size, input_type, output_type); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { error (ee, "fread: invalid PRECISION specified"); } @@ -2397,15 +2397,15 @@ { skip = skip_arg.int_value (true); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { error (ee, "fread: SKIP must be an integer"); } std::string arch = arch_arg.xstring_value ("fread: ARCH architecture type must be a string"); - octave::mach_info::float_format flt_fmt - = octave::mach_info::string_to_float_format (arch); + mach_info::float_format flt_fmt + = mach_info::string_to_float_format (arch); return os.read (size, block_size, input_type, output_type, skip, flt_fmt, count); @@ -2573,9 +2573,9 @@ if (nargin < 1 || nargin > 5) print_usage (); - octave::stream_list& streams = interp.get_stream_list (); - - octave::stream os = streams.lookup (args(0), "fread"); + stream_list& streams = interp.get_stream_list (); + + stream os = streams.lookup (args(0), "fread"); octave_value size = lo_ieee_inf_value (); octave_value prec = "uint8"; @@ -2609,7 +2609,7 @@ } static int -do_fwrite (octave::stream& os, const octave_value& data, +do_fwrite (stream& os, const octave_value& data, const octave_value& prec_arg, const octave_value& skip_arg, const octave_value& arch_arg) { @@ -2622,7 +2622,7 @@ { oct_data_conv::string_to_data_type (prec, block_size, output_type); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { error (ee, "fwrite: invalid PRECISION specified"); } @@ -2633,15 +2633,15 @@ { skip = skip_arg.int_value (true); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { error (ee, "fwrite: SKIP must be an integer"); } std::string arch = arch_arg.xstring_value ("fwrite: ARCH architecture type must be a string"); - octave::mach_info::float_format flt_fmt - = octave::mach_info::string_to_float_format (arch); + mach_info::float_format flt_fmt + = mach_info::string_to_float_format (arch); return os.write (data, block_size, output_type, skip, flt_fmt); } @@ -2673,9 +2673,9 @@ if (nargin < 2 || nargin > 5) print_usage (); - octave::stream_list& streams = interp.get_stream_list (); - - octave::stream os = streams.lookup (args(0), "fwrite"); + stream_list& streams = interp.get_stream_list (); + + stream os = streams.lookup (args(0), "fwrite"); octave_value prec = "uchar"; octave_value skip = 0; @@ -2717,9 +2717,9 @@ if (args.length () != 1) print_usage (); - octave::stream_list& streams = interp.get_stream_list (); - - octave::stream os = streams.lookup (args(0), "feof"); + stream_list& streams = interp.get_stream_list (); + + stream os = streams.lookup (args(0), "feof"); return ovl (os.eof () ? 1.0 : 0.0); } @@ -2750,9 +2750,9 @@ if (nargin < 1 || nargin > 2) print_usage (); - octave::stream_list& streams = interp.get_stream_list (); - - octave::stream os = streams.lookup (args(0), "ferror"); + stream_list& streams = interp.get_stream_list (); + + stream os = streams.lookup (args(0), "ferror"); bool clear = false; @@ -2816,17 +2816,17 @@ octave_value retval; - octave::stream_list& streams = interp.get_stream_list (); + stream_list& streams = interp.get_stream_list (); if (mode == "r") { - octave::stream ips = octave_iprocstream::create (name); + stream ips = octave_iprocstream::create (name); retval = streams.insert (ips); } else if (mode == "w") { - octave::stream ops = octave_oprocstream::create (name); + stream ops = octave_oprocstream::create (name); retval = streams.insert (ops); } @@ -2848,7 +2848,7 @@ if (args.length () != 1) print_usage (); - octave::stream_list& streams = interp.get_stream_list (); + stream_list& streams = interp.get_stream_list (); return ovl (streams.remove (args(0), "pclose")); } @@ -2883,14 +2883,14 @@ if (nargin > 0) dir = args(0).xstring_value ("tempname: DIR must be a string"); else - dir = octave::sys::env::getenv ("TMPDIR"); + dir = sys::env::getenv ("TMPDIR"); std::string pfx ("oct-"); if (nargin > 1) pfx = args(1).xstring_value ("tempname: PREFIX must be a string"); - return ovl (octave::sys::tempnam (dir, pfx)); + return ovl (sys::tempnam (dir, pfx)); } /* @@ -2974,7 +2974,7 @@ std::ios::openmode md = fopen_mode_to_ios_mode ("w+b"); - octave::stream s = octave_stdiostream::create (nm, fid, md); + stream s = octave_stdiostream::create (nm, fid, md); if (! s) { @@ -2983,7 +2983,7 @@ error ("tmpfile: failed to create octave_stdiostream object"); } - octave::stream_list& streams = interp.get_stream_list (); + stream_list& streams = interp.get_stream_list (); retval = ovl (streams.insert (s), ""); } @@ -3053,12 +3053,12 @@ std::ios::openmode md = fopen_mode_to_ios_mode (fopen_mode); - octave::stream s = octave_stdiostream::create (nm, fid, md); + stream s = octave_stdiostream::create (nm, fid, md); if (! s) error ("mkstemp: failed to create octave_stdiostream object"); - octave::stream_list& streams = interp.get_stream_list (); + stream_list& streams = interp.get_stream_list (); retval(0) = streams.insert (s); retval(1) = nm; @@ -3127,7 +3127,7 @@ int oct_mask = convert (mask, 8, 10); - int status = convert (octave::sys::umask (oct_mask), 10, 8); + int status = convert (sys::umask (oct_mask), 10, 8); if (status >= 0) return ovl (status); @@ -3160,7 +3160,7 @@ if (args.length () != 0) print_usage (); - return ovl (octave::get_P_tmpdir ()); + return ovl (get_P_tmpdir ()); } // NOTE: the values of SEEK_SET, SEEK_CUR, and SEEK_END have to be @@ -3219,7 +3219,7 @@ @seealso{stdout, stderr} @end deftypefn */) { - octave::stream_list& streams = interp.get_stream_list (); + stream_list& streams = interp.get_stream_list (); return const_value ("stdin", args, streams.stdin_file ()); } @@ -3233,7 +3233,7 @@ @seealso{stdin, stderr, page_screen_output} @end deftypefn */) { - octave::stream_list& streams = interp.get_stream_list (); + stream_list& streams = interp.get_stream_list (); return const_value ("stdout", args, streams.stdout_file ()); } @@ -3248,7 +3248,7 @@ @seealso{stdin, stdout} @end deftypefn */) { - octave::stream_list& streams = interp.get_stream_list (); + stream_list& streams = interp.get_stream_list (); return const_value ("stderr", args, streams.stderr_file ()); }
--- a/libinterp/corefcn/find.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/find.cc Sat Aug 14 22:48:52 2021 -0400 @@ -60,7 +60,7 @@ { default: case 3: - retval(2) = Array<T> (nda.index (octave::idx_vector (idx))); + retval(2) = Array<T> (nda.index (idx_vector (idx))); OCTAVE_FALLTHROUGH; case 2: @@ -74,13 +74,13 @@ idx.xelem (i) %= nr; } iext = -1; - retval(1) = octave::idx_vector (jdx, -1); + retval(1) = idx_vector (jdx, -1); } OCTAVE_FALLTHROUGH; case 1: case 0: - retval(0) = octave::idx_vector (idx, iext); + retval(0) = idx_vector (idx, iext); break; } @@ -402,10 +402,10 @@ { double val = args(1).xscalar_value ("find: N must be an integer"); - if (val < 0 || (! octave::math::isinf (val) - && val != octave::math::fix (val))) + if (val < 0 || (! math::isinf (val) + && val != math::fix (val))) error ("find: N must be a non-negative integer"); - else if (! octave::math::isinf (val)) + else if (! math::isinf (val)) n_to_find = val; }
--- a/libinterp/corefcn/gcd.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/gcd.cc Sat Aug 14 22:48:52 2021 -0400 @@ -43,7 +43,7 @@ static double simple_gcd (double a, double b) { - if (! octave::math::isinteger (a) || ! octave::math::isinteger (b)) + if (! math::isinteger (a) || ! math::isinteger (b)) error ("gcd: all values must be integers"); double aa = fabs (a); @@ -79,10 +79,10 @@ static std::complex<FP> simple_gcd (const std::complex<FP>& a, const std::complex<FP>& b) { - if (! octave::math::isinteger (a.real ()) - || ! octave::math::isinteger (a.imag ()) - || ! octave::math::isinteger (b.real ()) - || ! octave::math::isinteger (b.imag ())) + if (! math::isinteger (a.real ()) + || ! math::isinteger (a.imag ()) + || ! math::isinteger (b.real ()) + || ! math::isinteger (b.imag ())) error ("gcd: all complex parts must be integers"); std::complex<FP> aa = a; @@ -122,7 +122,7 @@ static double extended_gcd (double a, double b, double& x, double& y) { - if (! octave::math::isinteger (a) || ! octave::math::isinteger (b)) + if (! math::isinteger (a) || ! math::isinteger (b)) error ("gcd: all values must be integers"); double aa = fabs (a); @@ -160,10 +160,10 @@ extended_gcd (const std::complex<FP>& a, const std::complex<FP>& b, std::complex<FP>& x, std::complex<FP>& y) { - if (! octave::math::isinteger (a.real ()) - || ! octave::math::isinteger (a.imag ()) - || ! octave::math::isinteger (b.real ()) - || ! octave::math::isinteger (b.imag ())) + if (! math::isinteger (a.real ()) + || ! math::isinteger (a.imag ()) + || ! math::isinteger (b.real ()) + || ! math::isinteger (b.imag ())) error ("gcd: all complex parts must be integers"); std::complex<FP> aa = a; @@ -344,7 +344,7 @@ if (aa.numel () == 1) dv = bb.dims (); else if (bb.numel () != 1 && bb.dims () != dv) - octave::err_nonconformant ("gcd", a.dims (), b.dims ()); + err_nonconformant ("gcd", a.dims (), b.dims ()); NDA gg (dv), xx (dv), yy (dv);
--- a/libinterp/corefcn/getgrent.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/getgrent.cc Sat Aug 14 22:48:52 2021 -0400 @@ -46,7 +46,7 @@ // Group file functions. (Why not?) static octave_value -mk_gr_map (const octave::sys::group& gr) +mk_gr_map (const sys::group& gr) { if (gr) { @@ -77,8 +77,8 @@ std::string msg; - // octave::sys::group::getgrent may set msg. - octave_value val = mk_gr_map (octave::sys::group::getgrent (msg)); + // sys::group::getgrent may set msg. + octave_value val = mk_gr_map (sys::group::getgrent (msg)); return ovl (val, msg); } @@ -98,15 +98,15 @@ double dval = args(0).double_value (); - if (octave::math::x_nint (dval) != dval) + if (math::x_nint (dval) != dval) error ("getgrgid: GID must be an integer"); gid_t gid = static_cast<gid_t> (dval); std::string msg; - // octave::sys::group::getgrgid may set msg. - octave_value val = mk_gr_map (octave::sys::group::getgrgid (gid, msg)); + // sys::group::getgrgid may set msg. + octave_value val = mk_gr_map (sys::group::getgrgid (gid, msg)); return ovl (val, msg); } @@ -128,8 +128,8 @@ std::string msg; - // octave::sys::group::getgrnam may set msg. - octave_value val = mk_gr_map (octave::sys::group::getgrnam (s.c_str (), msg)); + // sys::group::getgrnam may set msg. + octave_value val = mk_gr_map (sys::group::getgrnam (s.c_str (), msg)); return ovl (val, msg); } @@ -146,8 +146,8 @@ std::string msg; - // octave::sys::group::setgrent may set msg. - int status = octave::sys::group::setgrent (msg); + // sys::group::setgrent may set msg. + int status = sys::group::setgrent (msg); return ovl (static_cast<double> (status), msg); } @@ -164,8 +164,8 @@ std::string msg; - // octave::sys::group::endgrent may set msg. - int status = octave::sys::group::endgrent (msg); + // sys::group::endgrent may set msg. + int status = sys::group::endgrent (msg); return ovl (static_cast<double> (status), msg); }
--- a/libinterp/corefcn/getpwent.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/getpwent.cc Sat Aug 14 22:48:52 2021 -0400 @@ -46,7 +46,7 @@ // Password file functions. (Why not?) static octave_value -mk_pw_map (const octave::sys::password& pw) +mk_pw_map (const sys::password& pw) { octave_value retval; @@ -83,8 +83,8 @@ std::string msg; - // octave::sys::password::getpwent may set msg. - octave_value val = mk_pw_map (octave::sys::password::getpwent (msg)); + // sys::password::getpwent may set msg. + octave_value val = mk_pw_map (sys::password::getpwent (msg)); return ovl (val, msg); } @@ -104,15 +104,15 @@ double dval = args(0).double_value (); - if (octave::math::x_nint (dval) != dval) + if (math::x_nint (dval) != dval) error ("getpwuid: UID must be an integer"); uid_t uid = static_cast<uid_t> (dval); std::string msg; - // octave::sys::password::getpwuid may set msg. - octave_value val = mk_pw_map (octave::sys::password::getpwuid (uid, msg)); + // sys::password::getpwuid may set msg. + octave_value val = mk_pw_map (sys::password::getpwuid (uid, msg)); return ovl (val, msg); } @@ -134,8 +134,8 @@ std::string msg; - // octave::sys::password::getpwnam may set msg. - octave_value val = mk_pw_map (octave::sys::password::getpwnam (s, msg)); + // sys::password::getpwnam may set msg. + octave_value val = mk_pw_map (sys::password::getpwnam (s, msg)); return ovl (val, msg); } @@ -152,8 +152,8 @@ std::string msg; - // octave::sys::password::setpwent may set msg. - int status = octave::sys::password::setpwent (msg); + // sys::password::setpwent may set msg. + int status = sys::password::setpwent (msg); return ovl (static_cast<double> (status), msg); } @@ -170,8 +170,8 @@ std::string msg; - // octave::sys::password::endpwent may set msg. - int status = octave::sys::password::endpwent (msg); + // sys::password::endpwent may set msg. + int status = sys::password::endpwent (msg); return ovl (static_cast<double> (status), msg); }
--- a/libinterp/corefcn/getrusage.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/getrusage.cc Sat Aug 14 22:48:52 2021 -0400 @@ -102,9 +102,9 @@ octave_scalar_map ru_map; octave_scalar_map tv_map; - octave::sys::resource_usage rusage; + sys::resource_usage rusage; - octave::sys::cpu_time cpu = rusage.cpu (); + sys::cpu_time cpu = rusage.cpu (); tv_map.assign ("sec", cpu.user_sec ()); tv_map.assign ("usec", cpu.user_usec ());
--- a/libinterp/corefcn/gsvd.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/gsvd.cc Sat Aug 14 22:48:52 2021 -0400 @@ -43,13 +43,13 @@ OCTAVE_NAMESPACE_BEGIN template <typename T> -static typename octave::math::gsvd<T>::Type +static typename math::gsvd<T>::Type gsvd_type (int nargout) { return ((nargout == 0 || nargout == 1) - ? octave::math::gsvd<T>::Type::sigma_only - : (nargout > 5) ? octave::math::gsvd<T>::Type::std - : octave::math::gsvd<T>::Type::economy); + ? math::gsvd<T>::Type::sigma_only + : (nargout > 5) ? math::gsvd<T>::Type::std + : math::gsvd<T>::Type::economy); } // Named like this to avoid conflicts with the gsvd class. @@ -58,7 +58,7 @@ do_gsvd (const T& A, const T& B, const octave_idx_type nargout, bool is_single = false) { - octave::math::gsvd<T> result (A, B, gsvd_type<T> (nargout)); + math::gsvd<T> result (A, B, gsvd_type<T> (nargout)); octave_value_list retval (nargout); if (nargout < 2) @@ -182,29 +182,29 @@ { if (argA.is_single_type () || argB.is_single_type ()) { - retval(0) = octave::float_identity_matrix (nc, nc); - retval(1) = octave::float_identity_matrix (nc, nc); + retval(0) = float_identity_matrix (nc, nc); + retval(1) = float_identity_matrix (nc, nc); if (nargout > 2) - retval(2) = octave::float_identity_matrix (nr, nr); + retval(2) = float_identity_matrix (nr, nr); if (nargout > 3) retval(3) = FloatMatrix (nr, nc); if (nargout > 4) - retval(4) = octave::float_identity_matrix (nr, nr); + retval(4) = float_identity_matrix (nr, nr); if (nargout > 5) - retval(5) = octave::float_identity_matrix (nr, nr); + retval(5) = float_identity_matrix (nr, nr); } else { - retval(0) = octave::identity_matrix (nc, nc); - retval(1) = octave::identity_matrix (nc, nc); + retval(0) = identity_matrix (nc, nc); + retval(1) = identity_matrix (nc, nc); if (nargout > 2) - retval(2) = octave::identity_matrix (nr, nr); + retval(2) = identity_matrix (nr, nr); if (nargout > 3) retval(3) = Matrix (nr, nc); if (nargout > 4) - retval(4) = octave::identity_matrix (nr, nr); + retval(4) = identity_matrix (nr, nr); if (nargout > 5) - retval(5) = octave::identity_matrix (nr, nr); + retval(5) = identity_matrix (nr, nr); } } }
--- a/libinterp/corefcn/hash.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/hash.cc Sat Aug 14 22:48:52 2021 -0400 @@ -121,7 +121,7 @@ std::string hash_type = args(0).string_value (); std::string str = args(1).string_value (); - return ovl (octave::crypto::hash (hash_type, str)); + return ovl (crypto::hash (hash_type, str)); } /*
--- a/libinterp/corefcn/help.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/help.cc Sat Aug 14 22:48:52 2021 -0400 @@ -732,7 +732,7 @@ const std::string name = args(0).xstring_value ("get_help_text: NAME must be a string"); - octave::help_system& help_sys = interp.get_help_system (); + help_system& help_sys = interp.get_help_system (); std::string text, format; @@ -757,7 +757,7 @@ const std::string fname = args(0).xstring_value ("get_help_text_from_file: NAME must be a string"); - octave::help_system& help_sys = interp.get_help_system (); + help_system& help_sys = interp.get_help_system (); std::string text, format; @@ -774,7 +774,7 @@ Undocumented internal function. @end deftypefn */) { - return ovl (Cell (octave::operator_names)); + return ovl (Cell (operator_names)); } // Return a cell array of strings containing the names of all keywords. @@ -791,7 +791,7 @@ Undocumented internal function. @end deftypefn */) { - octave::symbol_table& symtab = interp.get_symbol_table (); + symbol_table& symtab = interp.get_symbol_table (); const string_vector bif = symtab.built_in_function_names (); @@ -820,13 +820,13 @@ Cell retval; // Find the main function we are in. - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); octave_user_code *caller = tw.debug_user_code (); if (! caller) return ovl (retval); - octave::symbol_scope scope = caller->scope (); + symbol_scope scope = caller->scope (); return ovl (Cell (scope.localfunctions ())); } @@ -860,7 +860,7 @@ Undocumented internal function. @end deftypefn */) { - octave::help_system& help_sys = interp.get_help_system (); + help_system& help_sys = interp.get_help_system (); string_vector argv = args.make_argv (); @@ -909,7 +909,7 @@ { octave_value retval; - octave::load_path& lp = interp.get_load_path (); + load_path& lp = interp.get_load_path (); if (args.length () == 0) { @@ -955,7 +955,7 @@ Modifying it during a running session of Octave will have no effect. @end deftypefn */) { - octave::help_system& help_sys = interp.get_help_system (); + help_system& help_sys = interp.get_help_system (); return help_sys.built_in_docstrings_file (args, nargout); } @@ -984,7 +984,7 @@ @seealso{lookfor} @end deftypefn */) { - octave::help_system& help_sys = interp.get_help_system (); + help_system& help_sys = interp.get_help_system (); return help_sys.doc_cache_file (args, nargout); } @@ -1010,7 +1010,7 @@ @seealso{info_program, doc, help, makeinfo_program} @end deftypefn */) { - octave::help_system& help_sys = interp.get_help_system (); + help_system& help_sys = interp.get_help_system (); return help_sys.info_file (args, nargout); } @@ -1033,7 +1033,7 @@ @seealso{info_file, doc, help, makeinfo_program} @end deftypefn */) { - octave::help_system& help_sys = interp.get_help_system (); + help_system& help_sys = interp.get_help_system (); return help_sys.info_program (args, nargout); } @@ -1055,7 +1055,7 @@ @seealso{texi_macros_file, info_file, info_program, doc, help} @end deftypefn */) { - octave::help_system& help_sys = interp.get_help_system (); + help_system& help_sys = interp.get_help_system (); return help_sys.makeinfo_program (args, nargout); } @@ -1074,7 +1074,7 @@ The original variable value is restored when exiting the function. @end deftypefn */) { - octave::help_system& help_sys = interp.get_help_system (); + help_system& help_sys = interp.get_help_system (); return help_sys.suppress_verbose_help_message (args, nargout); } @@ -1102,7 +1102,7 @@ @seealso{makeinfo_program} @end deftypefn */) { - octave::help_system& help_sys = interp.get_help_system (); + help_system& help_sys = interp.get_help_system (); return help_sys.texi_macros_file (args, nargout); }
--- a/libinterp/corefcn/hess.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/hess.cc Sat Aug 14 22:48:52 2021 -0400 @@ -84,7 +84,7 @@ { FloatMatrix tmp = arg.float_matrix_value (); - octave::math::hess<FloatMatrix> result (tmp); + math::hess<FloatMatrix> result (tmp); if (nargout <= 1) retval = ovl (result.hess_matrix ()); @@ -96,7 +96,7 @@ { FloatComplexMatrix ctmp = arg.float_complex_matrix_value (); - octave::math::hess<FloatComplexMatrix> result (ctmp); + math::hess<FloatComplexMatrix> result (ctmp); if (nargout <= 1) retval = ovl (result.hess_matrix ()); @@ -111,7 +111,7 @@ { Matrix tmp = arg.matrix_value (); - octave::math::hess<Matrix> result (tmp); + math::hess<Matrix> result (tmp); if (nargout <= 1) retval = ovl (result.hess_matrix ()); @@ -123,7 +123,7 @@ { ComplexMatrix ctmp = arg.complex_matrix_value (); - octave::math::hess<ComplexMatrix> result (ctmp); + math::hess<ComplexMatrix> result (ctmp); if (nargout <= 1) retval = ovl (result.hess_matrix ());
--- a/libinterp/corefcn/hex2num.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/hex2num.cc Sat Aug 14 22:48:52 2021 -0400 @@ -40,9 +40,9 @@ static inline bool is_little_endian (bool is_float) { - return ((is_float && (octave::mach_info::native_float_format () - == octave::mach_info::flt_fmt_ieee_little_endian)) - || octave::mach_info::words_little_endian ()); + return ((is_float && (mach_info::native_float_format () + == mach_info::flt_fmt_ieee_little_endian)) + || mach_info::words_little_endian ()); } static uint8_t
--- a/libinterp/corefcn/input.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/input.cc Sat Aug 14 22:48:52 2021 -0400 @@ -1172,7 +1172,7 @@ if (nargin < 1 || nargin > 2) print_usage (); - octave::input_system& input_sys = interp.get_input_system (); + input_system& input_sys = interp.get_input_system (); return input_sys.get_user_input (args, std::max (nargout, 1)); } @@ -1196,7 +1196,7 @@ if (nargin > 1) print_usage (); - octave::input_system& input_sys = interp.get_input_system (); + input_system& input_sys = interp.get_input_system (); std::string prompt; @@ -1229,7 +1229,7 @@ if (nargin > 1) print_usage (); - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); if (nargin == 1) { @@ -1270,7 +1270,7 @@ for (;;) { - std::string cmd = octave::generate_completion (hint, k); + std::string cmd = generate_completion (hint, k); if (! cmd.empty ()) { @@ -1347,12 +1347,12 @@ print_usage (); if (nargin == 0) - octave::command_editor::read_init_file (); + command_editor::read_init_file (); else { std::string file = args(0).string_value (); - octave::command_editor::read_init_file (file); + command_editor::read_init_file (file); } return ovl (); @@ -1371,7 +1371,7 @@ if (args.length () != 0) print_usage (); - octave::command_editor::re_read_init_file (); + command_editor::re_read_init_file (); return ovl (); } @@ -1406,9 +1406,9 @@ if (nargin == 2) user_data = args(1); - octave::input_system& input_sys = interp.get_input_system (); + input_system& input_sys = interp.get_input_system (); - octave::hook_function hook_fcn (args(0), user_data); + hook_function hook_fcn (args(0), user_data); input_sys.add_input_event_hook (hook_fcn); @@ -1434,7 +1434,7 @@ bool warn = (nargin < 2); - octave::input_system& input_sys = interp.get_input_system (); + input_system& input_sys = interp.get_input_system (); if (! input_sys.remove_input_event_hook (hook_fcn_id) && warn) warning ("remove_input_event_hook: %s not found in list", @@ -1482,7 +1482,7 @@ @seealso{PS2, PS4} @end deftypefn */) { - octave::input_system& input_sys = interp.get_input_system (); + input_system& input_sys = interp.get_input_system (); return input_sys.PS1 (args, nargout); } @@ -1506,7 +1506,7 @@ @seealso{PS1, PS4} @end deftypefn */) { - octave::input_system& input_sys = interp.get_input_system (); + input_system& input_sys = interp.get_input_system (); return input_sys.PS2 (args, nargout); } @@ -1526,7 +1526,7 @@ The original variable value is restored when exiting the function. @end deftypefn */) { - octave::input_system& input_sys = interp.get_input_system (); + input_system& input_sys = interp.get_input_system (); return input_sys.completion_append_char (args, nargout); } @@ -1557,7 +1557,7 @@ Undocumented internal function. @end deftypefn */) { - octave::input_system& input_sys = interp.get_input_system (); + input_system& input_sys = interp.get_input_system (); return input_sys.gud_mode (args, nargout); } @@ -1568,7 +1568,7 @@ Set and query the codepage that is used for reading .m files. @end deftypefn */) { - octave::input_system& input_sys = interp.get_input_system (); + input_system& input_sys = interp.get_input_system (); return input_sys.mfile_encoding (args, nargout); } @@ -1623,7 +1623,7 @@ octave_value retval; - octave::input_system& input_sys = interp.get_input_system (); + input_system& input_sys = interp.get_input_system (); if (nargout > 0) retval = input_sys.dir_encoding (dir); @@ -1654,7 +1654,7 @@ The original variable value is restored when exiting the function. @end deftypefn */) { - octave::input_system& input_sys = interp.get_input_system (); + input_system& input_sys = interp.get_input_system (); return input_sys.auto_repeat_debug_command (args, nargout); }
--- a/libinterp/corefcn/inv.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/inv.cc Sat Aug 14 22:48:52 2021 -0400 @@ -214,7 +214,7 @@ } if (nargout < 2 && (info == -1 || rcond_plus_one_eq_one)) - octave::warn_singular_matrix (isfloat ? frcond : rcond); + warn_singular_matrix (isfloat ? frcond : rcond); return retval; }
--- a/libinterp/corefcn/jsondecode.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/jsondecode.cc Sat Aug 14 22:48:52 2021 -0400 @@ -523,7 +523,7 @@ if (! (nargin % 2)) print_usage (); - octave::make_valid_name_options options (args.slice (1, nargin - 1)); + make_valid_name_options options (args.slice (1, nargin - 1)); if (! args(0).is_string ()) error ("jsondecode: JSON_TXT must be a character string");
--- a/libinterp/corefcn/jsonencode.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/jsonencode.cc Sat Aug 14 22:48:52 2021 -0400 @@ -602,9 +602,9 @@ error ("jsonencode: option value must be a logical scalar"); std::string option_name = args(i++).string_value (); - if (octave::string::strcmpi (option_name, "ConvertInfAndNaN")) + if (string::strcmpi (option_name, "ConvertInfAndNaN")) ConvertInfAndNaN = args(i).bool_value (); - else if (octave::string::strcmpi (option_name, "PrettyPrint")) + else if (string::strcmpi (option_name, "PrettyPrint")) PrettyPrint = args(i).bool_value (); else error ("jsonencode: "
--- a/libinterp/corefcn/load-path.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/load-path.cc Sat Aug 14 22:48:52 2021 -0400 @@ -2426,7 +2426,7 @@ { std::string dirname = args(0).xstring_value ("genpath: DIR must be a string"); - retval = octave::genpath (dirname); + retval = genpath (dirname); } else { @@ -2437,7 +2437,7 @@ for (octave_idx_type i = 1; i < nargin; i++) skip[i-1] = args(i).xstring_value ("genpath: all arguments must be strings"); - retval = octave::genpath (dirname, skip); + retval = genpath (dirname, skip); } return retval; @@ -2449,7 +2449,7 @@ Reinitialize Octave's load path directory cache. @end deftypefn */) { - octave::rehash_internal (); + rehash_internal (); return ovl (); } @@ -2465,7 +2465,7 @@ if (! args.empty ()) print_usage (); - octave::load_path& lp = interp.get_load_path (); + load_path& lp = interp.get_load_path (); return ovl (lp.get_command_line_path ()); } @@ -2481,7 +2481,7 @@ if (! args.empty ()) print_usage (); - octave::load_path& lp = interp.get_load_path (); + load_path& lp = interp.get_load_path (); lp.initialize (true); @@ -2499,7 +2499,7 @@ Undocumented internal function. @end deftypefn */) { - octave::load_path& lp = interp.get_load_path (); + load_path& lp = interp.get_load_path (); return ovl (lp.system_path ()); } @@ -2529,18 +2529,18 @@ string_vector argv = args.make_argv ("path"); - octave::load_path& lp = interp.get_load_path (); + load_path& lp = interp.get_load_path (); if (nargin > 0) { std::string path = argv[1]; for (int i = 2; i <= nargin; i++) - path += octave::directory_path::path_sep_str () + argv[i]; + path += directory_path::path_sep_str () + argv[i]; lp.set (path, true); - octave::rehash_internal (); + rehash_internal (); } if (nargout > 0) @@ -2599,7 +2599,7 @@ if (nargin == 0) print_usage (); - octave::load_path& lp = interp.get_load_path (); + load_path& lp = interp.get_load_path (); octave_value retval; @@ -2647,7 +2647,7 @@ { std::string arg = arglist(i).xstring_value ("addpath: all arguments must be strings"); - std::list<std::string> dir_elts = octave::split_path (arg); + std::list<std::string> dir_elts = split_path (arg); if (! append) std::reverse (dir_elts.begin (), dir_elts.end ()); @@ -2664,11 +2664,11 @@ (it_start, dir.end (), [] (char l, char r) { - return l == r && octave::sys::file_ops::is_dir_sep (l); + return l == r && sys::file_ops::is_dir_sep (l); }), dir.end ()); - auto pos = dir.find_last_of (octave::sys::file_ops::dir_sep_chars ()); + auto pos = dir.find_last_of (sys::file_ops::dir_sep_chars ()); if (pos == std::string::npos) { if (! dir.empty () && dir[0] == '+') @@ -2694,7 +2694,7 @@ } if (need_to_update) - octave::rehash_internal (); + rehash_internal (); return retval; } @@ -2728,7 +2728,7 @@ octave_value retval; - octave::load_path& lp = interp.get_load_path (); + load_path& lp = interp.get_load_path (); if (nargout > 0) retval = lp.path (); @@ -2738,7 +2738,7 @@ for (int i = 0; i < nargin; i++) { std::string arg = args(i).xstring_value ("rmpath: all arguments must be strings"); - std::list<std::string> dir_elts = octave::split_path (arg); + std::list<std::string> dir_elts = split_path (arg); for (const auto& dir : dir_elts) { @@ -2753,7 +2753,7 @@ } if (need_to_update) - octave::rehash_internal (); + rehash_internal (); return retval; } @@ -2764,7 +2764,7 @@ Undocumented internal function. @end deftypefn */) { - octave::load_path& lp = interp.get_load_path (); + load_path& lp = interp.get_load_path (); lp.display (octave_stdout);
--- a/libinterp/corefcn/load-save.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/load-save.cc Sat Aug 14 22:48:52 2021 -0400 @@ -1645,7 +1645,7 @@ @seealso{save, dlmwrite, csvwrite, fwrite} @end deftypefn */) { - octave::load_save_system& load_save_sys = interp.get_load_save_system (); + load_save_system& load_save_sys = interp.get_load_save_system (); return load_save_sys.load (args, nargout); } @@ -1799,7 +1799,7 @@ @seealso{load, save_default_options, save_header_format_string, save_precision, dlmread, csvread, fread} @end deftypefn */) { - octave::load_save_system& load_save_sys = interp.get_load_save_system (); + load_save_system& load_save_sys = interp.get_load_save_system (); return load_save_sys.save (args, nargout); } @@ -1916,7 +1916,7 @@ @seealso{octave_core_file_limit, octave_core_file_name, octave_core_file_options} @end deftypefn */) { - octave::load_save_system& load_save_sys = interp.get_load_save_system (); + load_save_system& load_save_sys = interp.get_load_save_system (); return load_save_sys.crash_dumps_octave_core (args, nargout); } @@ -1938,7 +1938,7 @@ @seealso{save, save_header_format_string, save_precision} @end deftypefn */) { - octave::load_save_system& load_save_sys = interp.get_load_save_system (); + load_save_system& load_save_sys = interp.get_load_save_system (); return load_save_sys.save_default_options (args, nargout); } @@ -1966,7 +1966,7 @@ @seealso{crash_dumps_octave_core, octave_core_file_name, octave_core_file_options} @end deftypefn */) { - octave::load_save_system& load_save_sys = interp.get_load_save_system (); + load_save_system& load_save_sys = interp.get_load_save_system (); return load_save_sys.octave_core_file_limit (args, nargout); } @@ -1987,7 +1987,7 @@ @seealso{crash_dumps_octave_core, octave_core_file_name, octave_core_file_options} @end deftypefn */) { - octave::load_save_system& load_save_sys = interp.get_load_save_system (); + load_save_system& load_save_sys = interp.get_load_save_system (); return load_save_sys.octave_core_file_name (args, nargout); } @@ -2010,7 +2010,7 @@ @seealso{crash_dumps_octave_core, octave_core_file_name, octave_core_file_limit} @end deftypefn */) { - octave::load_save_system& load_save_sys = interp.get_load_save_system (); + load_save_system& load_save_sys = interp.get_load_save_system (); return load_save_sys.octave_core_file_options (args, nargout); } @@ -2040,7 +2040,7 @@ @seealso{strftime, save_default_options} @end deftypefn */) { - octave::load_save_system& load_save_sys = interp.get_load_save_system (); + load_save_system& load_save_sys = interp.get_load_save_system (); return load_save_sys.save_header_format_string (args, nargout); }
--- a/libinterp/corefcn/lookup.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/lookup.cc Sat Aug 14 22:48:52 2021 -0400 @@ -122,7 +122,7 @@ idx.xelem (i) = std::max (zero, std::min (j, n-2)); } - retval = octave::idx_vector (idx); + retval = idx_vector (idx); } else if (left_inf) { @@ -134,7 +134,7 @@ idx.xelem (i) = std::max (zero, j); } - retval = octave::idx_vector (idx); + retval = idx_vector (idx); } else if (right_inf) {
--- a/libinterp/corefcn/lsode.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/lsode.cc Sat Aug 14 22:48:52 2021 -0400 @@ -287,13 +287,13 @@ warned_fcn_imaginary = false; warned_jac_imaginary = false; - octave::unwind_protect_var<int> restore_var (call_depth); + unwind_protect_var<int> restore_var (call_depth); call_depth++; if (call_depth > 1) error ("lsode: invalid recursive call"); - octave::symbol_table& symtab = interp.get_symbol_table (); + symbol_table& symtab = interp.get_symbol_table (); std::string fcn_name, fname, jac_name, jname; @@ -311,13 +311,11 @@ f_arg = c(0); else if (c.numel () == 2) { - lsode_fcn = octave::get_function_handle (interp, c(0), - parameter_names); + lsode_fcn = get_function_handle (interp, c(0), parameter_names); if (lsode_fcn.is_defined ()) { - lsode_jac = octave::get_function_handle (interp, c(1), - parameter_names); + lsode_jac = get_function_handle (interp, c(1), parameter_names); if (lsode_jac.is_undefined ()) lsode_fcn = octave_value (); @@ -336,21 +334,20 @@ switch (f_arg.rows ()) { case 1: - lsode_fcn = octave::get_function_handle (interp, f_arg, - parameter_names); + lsode_fcn = get_function_handle (interp, f_arg, parameter_names); break; case 2: { string_vector tmp = f_arg.string_vector_value (); - lsode_fcn = octave::get_function_handle (interp, tmp(0), - parameter_names); + lsode_fcn = get_function_handle (interp, tmp(0), + parameter_names); if (lsode_fcn.is_defined ()) { - lsode_jac = octave::get_function_handle (interp, tmp(1), - parameter_names); + lsode_jac = get_function_handle (interp, tmp(1), + parameter_names); if (lsode_jac.is_undefined ()) lsode_fcn = octave_value ();
--- a/libinterp/corefcn/lu.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/lu.cc Sat Aug 14 22:48:52 2021 -0400 @@ -41,7 +41,7 @@ template <typename MT> static octave_value -get_lu_l (const octave::math::lu<MT>& fact) +get_lu_l (const math::lu<MT>& fact) { MT L = fact.L (); if (L.issquare ()) @@ -52,7 +52,7 @@ template <typename MT> static octave_value -get_lu_u (const octave::math::lu<MT>& fact) +get_lu_u (const math::lu<MT>& fact) { MT U = fact.U (); if (U.issquare () && fact.regular ()) @@ -207,8 +207,8 @@ ColumnVector Qinit (nc); for (octave_idx_type i = 0; i < nc; i++) Qinit(i) = i; - octave::math::sparse_lu<SparseMatrix> fact (m, Qinit, thresh, - false, true); + math::sparse_lu<SparseMatrix> fact (m, Qinit, thresh, false, + true); if (nargout < 2) retval(0) = fact.Y (); @@ -241,7 +241,7 @@ else { retval.resize (scale ? 5 : 4); - octave::math::sparse_lu<SparseMatrix> fact (m, thresh, scale); + math::sparse_lu<SparseMatrix> fact (m, thresh, scale); retval(0) = octave_value (fact.L (), MatrixType (MatrixType::Lower)); @@ -275,9 +275,8 @@ ColumnVector Qinit (nc); for (octave_idx_type i = 0; i < nc; i++) Qinit(i) = i; - octave::math::sparse_lu<SparseComplexMatrix> fact (m, Qinit, - thresh, false, - true); + math::sparse_lu<SparseComplexMatrix> fact (m, Qinit, thresh, + false, true); if (nargout < 2) retval(0) = fact.Y (); @@ -309,8 +308,7 @@ else { retval.resize (scale ? 5 : 4); - octave::math::sparse_lu<SparseComplexMatrix> fact (m, thresh, - scale); + math::sparse_lu<SparseComplexMatrix> fact (m, thresh, scale); retval(0) = octave_value (fact.L (), MatrixType (MatrixType::Lower)); @@ -347,7 +345,7 @@ { FloatMatrix m = arg.float_matrix_value (); - octave::math::lu<FloatMatrix> fact (m); + math::lu<FloatMatrix> fact (m); switch (nargout) { @@ -381,7 +379,7 @@ { Matrix m = arg.matrix_value (); - octave::math::lu<Matrix> fact (m); + math::lu<Matrix> fact (m); switch (nargout) { @@ -418,7 +416,7 @@ { FloatComplexMatrix m = arg.float_complex_matrix_value (); - octave::math::lu<FloatComplexMatrix> fact (m); + math::lu<FloatComplexMatrix> fact (m); switch (nargout) { @@ -452,7 +450,7 @@ { ComplexMatrix m = arg.complex_matrix_value (); - octave::math::lu<ComplexMatrix> fact (m); + math::lu<ComplexMatrix> fact (m); switch (nargout) { @@ -656,7 +654,7 @@ FloatMatrix x = argx.float_matrix_value (); FloatMatrix y = argy.float_matrix_value (); - octave::math::lu<FloatMatrix> fact (L, U, P); + math::lu<FloatMatrix> fact (L, U, P); if (pivoted) fact.update_piv (x, y); else @@ -674,7 +672,7 @@ Matrix x = argx.matrix_value (); Matrix y = argy.matrix_value (); - octave::math::lu<Matrix> fact (L, U, P); + math::lu<Matrix> fact (L, U, P); if (pivoted) fact.update_piv (x, y); else @@ -697,7 +695,7 @@ FloatComplexMatrix x = argx.float_complex_matrix_value (); FloatComplexMatrix y = argy.float_complex_matrix_value (); - octave::math::lu<FloatComplexMatrix> fact (L, U, P); + math::lu<FloatComplexMatrix> fact (L, U, P); if (pivoted) fact.update_piv (x, y); else @@ -715,7 +713,7 @@ ComplexMatrix x = argx.complex_matrix_value (); ComplexMatrix y = argy.complex_matrix_value (); - octave::math::lu<ComplexMatrix> fact (L, U, P); + math::lu<ComplexMatrix> fact (L, U, P); if (pivoted) fact.update_piv (x, y); else
--- a/libinterp/corefcn/max.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/max.cc Sat Aug 14 22:48:52 2021 -0400 @@ -271,7 +271,7 @@ { if (arg.is_range () && (dim == -1 || dim == 1)) { - octave::range<double> range = arg.range_value (); + range<double> range = arg.range_value (); if (range.numel () < 1) { retval(0) = arg;
--- a/libinterp/corefcn/mgorth.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/mgorth.cc Sat Aug 14 22:48:52 2021 -0400 @@ -47,7 +47,7 @@ x -= h(j) * Vcj; } - h(Vc) = octave::xnorm (x); + h(Vc) = xnorm (x); if (std::real (h(Vc)) > 0) x /= h(Vc); }
--- a/libinterp/corefcn/oct-hist.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/oct-hist.cc Sat Aug 14 22:48:52 2021 -0400 @@ -496,7 +496,7 @@ file.close (); - int(*unlink_fptr)(const std::string&) = octave::sys::unlink; + int(*unlink_fptr)(const std::string&) = sys::unlink; unwind_action unlink_action (unlink_fptr, name); unwind_protect_var<bool> upv (m_input_from_tmp_file, true); @@ -514,7 +514,7 @@ if (name.empty ()) return; - int(*unlink_fptr)(const std::string&) = octave::sys::unlink; + int(*unlink_fptr)(const std::string&) = sys::unlink; unwind_action unlink_action (unlink_fptr, name); unwind_protect_var<bool> upv (m_input_from_tmp_file, true); @@ -618,7 +618,7 @@ if (args.length () > 2) print_usage (); - octave::history_system& history_sys = interp.get_history_system (); + history_system& history_sys = interp.get_history_system (); history_sys.do_edit_history (args); @@ -669,7 +669,7 @@ { // FIXME: should this be limited to the top-level context? - octave::history_system& history_sys = interp.get_history_system (); + history_system& history_sys = interp.get_history_system (); // Call do_history even if nargout is zero to display history list. @@ -732,7 +732,7 @@ { // FIXME: should this be limited to the top-level context? - octave::history_system& history_sys = interp.get_history_system (); + history_system& history_sys = interp.get_history_system (); if (args.length () > 2) print_usage (); @@ -768,14 +768,14 @@ { octave_value retval; - std::string old_history_control = octave::command_history::histcontrol (); + std::string old_history_control = command_history::histcontrol (); std::string tmp = old_history_control; retval = set_internal_variable (tmp, args, nargout, "history_control"); if (tmp != old_history_control) - octave::command_history::process_histcontrol (tmp); + command_history::process_histcontrol (tmp); return retval; } @@ -794,7 +794,7 @@ { octave_value retval; - int old_history_size = octave::command_history::size (); + int old_history_size = command_history::size (); int tmp = old_history_size; @@ -803,7 +803,7 @@ std::numeric_limits<int>::max ()); if (tmp != old_history_size) - octave::command_history::set_size (tmp); + command_history::set_size (tmp); return retval; } @@ -849,14 +849,14 @@ { octave_value retval; - std::string old_history_file = octave::command_history::file (); + std::string old_history_file = command_history::file (); std::string tmp = old_history_file; retval = set_internal_variable (tmp, args, nargout, "history_file"); if (tmp != old_history_file) - octave::command_history::set_file (tmp); + command_history::set_file (tmp); return retval; } @@ -882,7 +882,7 @@ @seealso{strftime, history_file, history_size, history_save} @end deftypefn */) { - octave::history_system& history_sys = interp.get_history_system (); + history_system& history_sys = interp.get_history_system (); return history_sys.timestamp_format_string (args, nargout); } @@ -912,14 +912,14 @@ { octave_value retval; - bool old_history_save = ! octave::command_history::ignoring_entries (); + bool old_history_save = ! command_history::ignoring_entries (); bool tmp = old_history_save; retval = set_internal_variable (tmp, args, nargout, "history_save"); if (tmp != old_history_save) - octave::command_history::ignore_entries (! tmp); + command_history::ignore_entries (! tmp); return retval; }
--- a/libinterp/corefcn/ordqz.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/ordqz.cc Sat Aug 14 22:48:52 2021 -0400 @@ -193,8 +193,8 @@ "ordqz: at most four output arguments possible"); // Matrix A: check dimensions. - F77_INT nn = octave::to_f77_int (args(0).rows ()); - F77_INT nc = octave::to_f77_int (args(0).columns ()); + F77_INT nn = to_f77_int (args(0).rows ()); + F77_INT nc = to_f77_int (args(0).columns ()); if (args(0).isempty ()) { @@ -214,8 +214,8 @@ aa = args(0).matrix_value (); // Extract argument 2 (bb, or cbb if complex). - F77_INT b_nr = octave::to_f77_int (args(1).rows ()); - F77_INT b_nc = octave::to_f77_int (args(1).columns ()); + F77_INT b_nr = to_f77_int (args(1).rows ()); + F77_INT b_nc = to_f77_int (args(1).columns ()); if (nn != b_nc || nn != b_nr) ::err_nonconformant (); @@ -229,8 +229,8 @@ bb = args(1).matrix_value (); // Extract argument 3 (qq, or cqq if complex). - F77_INT q_nr = octave::to_f77_int (args(2).rows ()); - F77_INT q_nc = octave::to_f77_int (args(2).columns ()); + F77_INT q_nr = to_f77_int (args(2).rows ()); + F77_INT q_nc = to_f77_int (args(2).columns ()); if (nn != q_nc || nn != q_nr) ::err_nonconformant (); @@ -244,8 +244,8 @@ qq = args(2).matrix_value ().transpose (); // Extract argument 4 (zz, or czz if complex). - F77_INT z_nr = octave::to_f77_int (args(3).rows ()); - F77_INT z_nc = octave::to_f77_int (args(3).columns ()); + F77_INT z_nr = to_f77_int (args(3).rows ()); + F77_INT z_nc = to_f77_int (args(3).columns ()); if (nn != z_nc || nn != z_nr) ::err_nonconformant ();
--- a/libinterp/corefcn/ordschur.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/ordschur.cc Sat Aug 14 22:48:52 2021 -0400 @@ -119,10 +119,10 @@ \ retval = ovl (U, S); - F77_INT n = octave::to_f77_int (sel_n); + F77_INT n = to_f77_int (sel_n); Array<F77_INT> sel (dim_vector (n, 1)); for (F77_INT i = 0; i < n; i++) - sel.xelem (i) = octave::to_f77_int (sel_arg.xelem (i)); + sel.xelem (i) = to_f77_int (sel_arg.xelem (i)); if (double_type) {
--- a/libinterp/corefcn/pager.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/pager.cc Sat Aug 14 22:48:52 2021 -0400 @@ -542,7 +542,7 @@ if (nargin > 1) print_usage (); - octave::output_system& output_sys = interp.get_output_system (); + output_system& output_sys = interp.get_output_system (); if (nargout > 0) { @@ -602,7 +602,7 @@ if (nargin > 1) print_usage (); - octave::output_system& output_sys = interp.get_output_system (); + output_system& output_sys = interp.get_output_system (); if (nargin > 0) { @@ -640,8 +640,8 @@ RowVector size (2, 0.0); - size(0) = octave::command_editor::terminal_rows (); - size(1) = octave::command_editor::terminal_cols (); + size(0) = command_editor::terminal_rows (); + size(1) = command_editor::terminal_cols (); if (nargin == 1) { @@ -650,13 +650,13 @@ if (m.numel () != 2) error ("terminal_size: argument must be a 2-element array"); - int rows = octave::math::x_nint (m(0)); - int cols = octave::math::x_nint (m(1)); + int rows = math::x_nint (m(0)); + int cols = math::x_nint (m(1)); if (rows <= 0 || cols <= 0) error ("terminal_size: rows and columns must be positive integers"); - octave::command_editor::set_screen_size (rows, cols); + command_editor::set_screen_size (rows, cols); } return ovl (size); @@ -681,7 +681,7 @@ @seealso{page_screen_output, more, PAGER, PAGER_FLAGS} @end deftypefn */) { - octave::output_system& output_sys = interp.get_output_system (); + output_system& output_sys = interp.get_output_system (); return output_sys.page_output_immediately (args, nargout); } @@ -705,7 +705,7 @@ @seealso{more, page_output_immediately, PAGER, PAGER_FLAGS} @end deftypefn */) { - octave::output_system& output_sys = interp.get_output_system (); + output_system& output_sys = interp.get_output_system (); return output_sys.page_screen_output (args, nargout); } @@ -728,7 +728,7 @@ @seealso{PAGER_FLAGS, page_output_immediately, more, page_screen_output} @end deftypefn */) { - octave::output_system& output_sys = interp.get_output_system (); + output_system& output_sys = interp.get_output_system (); return output_sys.PAGER (args, nargout); } @@ -747,7 +747,7 @@ @seealso{PAGER, more, page_screen_output, page_output_immediately} @end deftypefn */) { - octave::output_system& output_sys = interp.get_output_system (); + output_system& output_sys = interp.get_output_system (); return output_sys.PAGER_FLAGS (args, nargout); }
--- a/libinterp/corefcn/pr-output.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/pr-output.cc Sat Aug 14 22:48:52 2021 -0400 @@ -3244,7 +3244,7 @@ arg = arg.reshape (dv); } - octave::unwind_protect frame; + unwind_protect frame; frame.protect_var (rat_string_len); @@ -3390,11 +3390,11 @@ if (args.length () != 2) print_usage (); - octave::stream_list& streams = interp.get_stream_list (); + stream_list& streams = interp.get_stream_list (); int fid = streams.get_file_number (args(0)); - octave::stream os = streams.lookup (fid, "fdisp"); + stream os = streams.lookup (fid, "fdisp"); std::ostream *osp = os.output_stream (); @@ -3516,12 +3516,12 @@ // disp is done. bool print_newlines = false; - if (octave::valid_identifier (name)) + if (valid_identifier (name)) print_newlines = value.print_name_tag (octave_stdout, name); // Use feval so that dispatch will also work for disp. - octave::feval ("disp", ovl (value)); + feval ("disp", ovl (value)); if (print_newlines) octave_stdout << std::endl; @@ -3590,7 +3590,7 @@ int idx = 1; std::string format; - octave::unwind_protect frame; + unwind_protect frame; frame.protect_var (bank_format); frame.protect_var (bit_format);
--- a/libinterp/corefcn/psi.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/psi.cc Sat Aug 14 22:48:52 2021 -0400 @@ -96,7 +96,7 @@ E *psi_zv = psi_z.fortran_vec (); \ const octave_idx_type n = z.numel (); \ for (octave_idx_type i = 0; i < n; i++) \ - *psi_zv++ = octave::math::psi (*zv++); \ + *psi_zv++ = math::psi (*zv++); \ \ retval = psi_z; \ } @@ -137,7 +137,7 @@ if (*zv < 0) \ error ("psi: Z must be non-negative for polygamma (K > 0)"); \ \ - *psi_zv++ = octave::math::psi (k, *zv++); \ + *psi_zv++ = math::psi (k, *zv++); \ } \ retval = psi_z; \ }
--- a/libinterp/corefcn/qr.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/qr.cc Sat Aug 14 22:48:52 2021 -0400 @@ -60,7 +60,7 @@ template <typename MT> static octave_value -get_qr_r (const octave::math::qr<MT>& fact) +get_qr_r (const math::qr<MT>& fact) { MT R = fact.R (); if (R.issquare () && fact.regular ()) @@ -70,15 +70,15 @@ } template <typename T> -static typename octave::math::qr<T>::type +static typename math::qr<T>::type qr_type (int nargout, bool economy) { if (nargout == 0 || nargout == 1) - return octave::math::qr<T>::raw; + return math::qr<T>::raw; else if (economy) - return octave::math::qr<T>::economy; + return math::qr<T>::economy; else - return octave::math::qr<T>::std; + return math::qr<T>::std; } // dense X @@ -371,25 +371,25 @@ if (! args(1).issparse () && args(1).iscomplex ()) retval = ovl - (octave::math::sparse_qr<SparseComplexMatrix>::solve + (math::sparse_qr<SparseComplexMatrix>::solve <MArray<Complex>, ComplexMatrix> (arg.sparse_complex_matrix_value (), args(1).complex_matrix_value (), info)); else if (args(1).issparse () && args(1).iscomplex ()) retval = ovl - (octave::math::sparse_qr<SparseComplexMatrix>::solve + (math::sparse_qr<SparseComplexMatrix>::solve <SparseComplexMatrix, SparseComplexMatrix> (arg.sparse_complex_matrix_value (), args(1).sparse_complex_matrix_value (), info)); else if (! args(1).issparse () && ! args(1).iscomplex ()) retval = ovl - (octave::math::sparse_qr<SparseComplexMatrix>::solve + (math::sparse_qr<SparseComplexMatrix>::solve <MArray<double>, ComplexMatrix> (arg.sparse_complex_matrix_value (), args(1).matrix_value (), info)); else if (args(1).issparse () && ! args(1).iscomplex ()) retval = ovl - (octave::math::sparse_qr<SparseComplexMatrix>::solve + (math::sparse_qr<SparseComplexMatrix>::solve <SparseMatrix, SparseComplexMatrix> (arg.sparse_complex_matrix_value (), args(1).sparse_matrix_value (), info)); @@ -398,14 +398,14 @@ } else if (have_b && nargout == 2) { - octave::math::sparse_qr<SparseComplexMatrix> + math::sparse_qr<SparseComplexMatrix> q (arg.sparse_complex_matrix_value (), 0); retval = ovl (q.C (args(1).complex_matrix_value (), economy), q.R (economy)); } else if (have_b && nargout == 3) { - octave::math::sparse_qr<SparseComplexMatrix> + math::sparse_qr<SparseComplexMatrix> q (arg.sparse_complex_matrix_value ()); if (vector_p) retval = ovl (q.C (args(1).complex_matrix_value (), economy), @@ -418,7 +418,7 @@ { if (nargout > 2) { - octave::math::sparse_qr<SparseComplexMatrix> + math::sparse_qr<SparseComplexMatrix> q (arg.sparse_complex_matrix_value ()); if (vector_p) retval = ovl (q.Q (economy), q.R (economy), q.E ()); @@ -428,13 +428,13 @@ } else if (nargout > 1) { - octave::math::sparse_qr<SparseComplexMatrix> + math::sparse_qr<SparseComplexMatrix> q (arg.sparse_complex_matrix_value (), 0); retval = ovl (q.Q (economy), q.R (economy)); } else { - octave::math::sparse_qr<SparseComplexMatrix> + math::sparse_qr<SparseComplexMatrix> q (arg.sparse_complex_matrix_value (), 0); retval = ovl (q.R (economy)); } @@ -446,22 +446,22 @@ { octave_idx_type info; if (args(1).issparse () && ! args(1).iscomplex ()) - retval = ovl (octave::math::sparse_qr<SparseMatrix>::solve + retval = ovl (math::sparse_qr<SparseMatrix>::solve <SparseMatrix, SparseMatrix> (arg.sparse_matrix_value (), args (1).sparse_matrix_value (), info)); else if (! args(1).issparse () && args(1).iscomplex ()) - retval = ovl (octave::math::sparse_qr<SparseMatrix>::solve + retval = ovl (math::sparse_qr<SparseMatrix>::solve <MArray<Complex>, ComplexMatrix> (arg.sparse_matrix_value (), args (1).complex_matrix_value (), info)); else if (! args(1).issparse () && ! args(1).iscomplex ()) - retval = ovl (octave::math::sparse_qr<SparseMatrix>::solve + retval = ovl (math::sparse_qr<SparseMatrix>::solve <MArray<double>, Matrix> (arg.sparse_matrix_value (), args (1).matrix_value (), info)); else if (args(1).issparse () && args(1).iscomplex ()) - retval = ovl (octave::math::sparse_qr<SparseMatrix>::solve + retval = ovl (math::sparse_qr<SparseMatrix>::solve <SparseComplexMatrix, SparseComplexMatrix> (arg.sparse_matrix_value (), args(1).sparse_complex_matrix_value (), @@ -471,14 +471,14 @@ } else if (have_b && nargout == 2) { - octave::math::sparse_qr<SparseMatrix> + math::sparse_qr<SparseMatrix> q (arg.sparse_matrix_value (), 0); retval = ovl (q.C (args(1).matrix_value (), economy), q.R (economy)); } else if (have_b && nargout == 3) { - octave::math::sparse_qr<SparseMatrix> + math::sparse_qr<SparseMatrix> q (arg.sparse_matrix_value ()); if (vector_p) retval = ovl (q.C (args(1).matrix_value (), economy), @@ -492,7 +492,7 @@ { if (nargout > 2) { - octave::math::sparse_qr<SparseMatrix> + math::sparse_qr<SparseMatrix> q (arg.sparse_matrix_value ()); if (vector_p) retval = ovl (q.Q (economy), q.R (economy), q.E ()); @@ -502,13 +502,13 @@ } else if (nargout > 1) { - octave::math::sparse_qr<SparseMatrix> + math::sparse_qr<SparseMatrix> q (arg.sparse_matrix_value (), 0); retval = ovl (q.Q (economy), q.R (economy)); } else { - octave::math::sparse_qr<SparseMatrix> + math::sparse_qr<SparseMatrix> q (arg.sparse_matrix_value (), 0); retval = ovl (q.R (economy)); } @@ -524,7 +524,7 @@ { if (arg.isreal ()) { - octave::math::qr<FloatMatrix>::type type + math::qr<FloatMatrix>::type type = qr_type<FloatMatrix> (nargout, economy); FloatMatrix m = arg.float_matrix_value (); @@ -534,14 +534,14 @@ case 0: case 1: { - octave::math::qr<FloatMatrix> fact (m, type); + math::qr<FloatMatrix> fact (m, type); retval = ovl (fact.R ()); } break; case 2: { - octave::math::qr<FloatMatrix> fact (m, type); + math::qr<FloatMatrix> fact (m, type); retval = ovl (fact.Q (), get_qr_r (fact)); if (have_b) { @@ -557,7 +557,7 @@ default: { - octave::math::qrp<FloatMatrix> fact (m, type); + math::qrp<FloatMatrix> fact (m, type); if (economy || vector_p) retval = ovl (fact.Q (), get_qr_r (fact), fact.Pvec ()); @@ -569,7 +569,7 @@ } else if (arg.iscomplex ()) { - octave::math::qr<FloatComplexMatrix>::type type + math::qr<FloatComplexMatrix>::type type = qr_type<FloatComplexMatrix> (nargout, economy); FloatComplexMatrix m = arg.float_complex_matrix_value (); @@ -579,14 +579,14 @@ case 0: case 1: { - octave::math::qr<FloatComplexMatrix> fact (m, type); + math::qr<FloatComplexMatrix> fact (m, type); retval = ovl (fact.R ()); } break; case 2: { - octave::math::qr<FloatComplexMatrix> fact (m, type); + math::qr<FloatComplexMatrix> fact (m, type); retval = ovl (fact.Q (), get_qr_r (fact)); if (have_b) retval(0) = conj (fact.Q ().transpose ()) @@ -596,7 +596,7 @@ default: { - octave::math::qrp<FloatComplexMatrix> fact (m, type); + math::qrp<FloatComplexMatrix> fact (m, type); if (economy || vector_p) retval = ovl (fact.Q (), get_qr_r (fact), fact.Pvec ()); else @@ -610,7 +610,7 @@ { if (arg.isreal ()) { - octave::math::qr<Matrix>::type type + math::qr<Matrix>::type type = qr_type<Matrix> (nargout, economy); Matrix m = arg.matrix_value (); @@ -620,14 +620,14 @@ case 0: case 1: { - octave::math::qr<Matrix> fact (m, type); + math::qr<Matrix> fact (m, type); retval = ovl (fact.R ()); } break; case 2: { - octave::math::qr<Matrix> fact (m, type); + math::qr<Matrix> fact (m, type); retval = ovl (fact.Q (), get_qr_r (fact)); if (have_b) { @@ -643,7 +643,7 @@ default: { - octave::math::qrp<Matrix> fact (m, type); + math::qrp<Matrix> fact (m, type); if (economy || vector_p) retval = ovl (fact.Q (), get_qr_r (fact), fact.Pvec ()); else @@ -654,7 +654,7 @@ } else if (arg.iscomplex ()) { - octave::math::qr<ComplexMatrix>::type type + math::qr<ComplexMatrix>::type type = qr_type<ComplexMatrix> (nargout, economy); ComplexMatrix m = arg.complex_matrix_value (); @@ -664,14 +664,14 @@ case 0: case 1: { - octave::math::qr<ComplexMatrix> fact (m, type); + math::qr<ComplexMatrix> fact (m, type); retval = ovl (fact.R ()); } break; case 2: { - octave::math::qr<ComplexMatrix> fact (m, type); + math::qr<ComplexMatrix> fact (m, type); retval = ovl (fact.Q (), get_qr_r (fact)); if (have_b) retval(0) = conj (fact.Q ().transpose ()) @@ -681,7 +681,7 @@ default: { - octave::math::qrp<ComplexMatrix> fact (m, type); + math::qrp<ComplexMatrix> fact (m, type); if (economy || vector_p) retval = ovl (fact.Q (), get_qr_r (fact), fact.Pvec ()); else @@ -1312,7 +1312,7 @@ FloatMatrix u = argu.float_matrix_value (); FloatMatrix v = argv.float_matrix_value (); - octave::math::qr<FloatMatrix> fact (Q, R); + math::qr<FloatMatrix> fact (Q, R); fact.update (u, v); retval = ovl (fact.Q (), get_qr_r (fact)); @@ -1324,7 +1324,7 @@ Matrix u = argu.matrix_value (); Matrix v = argv.matrix_value (); - octave::math::qr<Matrix> fact (Q, R); + math::qr<Matrix> fact (Q, R); fact.update (u, v); retval = ovl (fact.Q (), get_qr_r (fact)); @@ -1341,7 +1341,7 @@ FloatComplexMatrix u = argu.float_complex_matrix_value (); FloatComplexMatrix v = argv.float_complex_matrix_value (); - octave::math::qr<FloatComplexMatrix> fact (Q, R); + math::qr<FloatComplexMatrix> fact (Q, R); fact.update (u, v); retval = ovl (fact.Q (), get_qr_r (fact)); @@ -1353,7 +1353,7 @@ ComplexMatrix u = argu.complex_matrix_value (); ComplexMatrix v = argv.complex_matrix_value (); - octave::math::qr<ComplexMatrix> fact (Q, R); + math::qr<ComplexMatrix> fact (Q, R); fact.update (u, v); retval = ovl (fact.Q (), get_qr_r (fact)); @@ -1500,7 +1500,7 @@ FloatMatrix R = argr.float_matrix_value (); FloatMatrix x = argx.float_matrix_value (); - octave::math::qr<FloatMatrix> fact (Q, R); + math::qr<FloatMatrix> fact (Q, R); if (col) fact.insert_col (x, j-one); @@ -1515,7 +1515,7 @@ Matrix R = argr.matrix_value (); Matrix x = argx.matrix_value (); - octave::math::qr<Matrix> fact (Q, R); + math::qr<Matrix> fact (Q, R); if (col) fact.insert_col (x, j-one); @@ -1535,7 +1535,7 @@ FloatComplexMatrix R = argr.float_complex_matrix_value (); FloatComplexMatrix x = argx.float_complex_matrix_value (); - octave::math::qr<FloatComplexMatrix> fact (Q, R); + math::qr<FloatComplexMatrix> fact (Q, R); if (col) fact.insert_col (x, j-one); @@ -1550,7 +1550,7 @@ ComplexMatrix R = argr.complex_matrix_value (); ComplexMatrix x = argx.complex_matrix_value (); - octave::math::qr<ComplexMatrix> fact (Q, R); + math::qr<ComplexMatrix> fact (Q, R); if (col) fact.insert_col (x, j-one); @@ -1691,7 +1691,7 @@ FloatMatrix Q = argq.float_matrix_value (); FloatMatrix R = argr.float_matrix_value (); - octave::math::qr<FloatMatrix> fact (Q, R); + math::qr<FloatMatrix> fact (Q, R); if (col) fact.delete_col (j-one); @@ -1705,7 +1705,7 @@ Matrix Q = argq.matrix_value (); Matrix R = argr.matrix_value (); - octave::math::qr<Matrix> fact (Q, R); + math::qr<Matrix> fact (Q, R); if (col) fact.delete_col (j-one); @@ -1723,7 +1723,7 @@ FloatComplexMatrix Q = argq.float_complex_matrix_value (); FloatComplexMatrix R = argr.float_complex_matrix_value (); - octave::math::qr<FloatComplexMatrix> fact (Q, R); + math::qr<FloatComplexMatrix> fact (Q, R); if (col) fact.delete_col (j-one); @@ -1737,7 +1737,7 @@ ComplexMatrix Q = argq.complex_matrix_value (); ComplexMatrix R = argr.complex_matrix_value (); - octave::math::qr<ComplexMatrix> fact (Q, R); + math::qr<ComplexMatrix> fact (Q, R); if (col) fact.delete_col (j-one); @@ -1918,7 +1918,7 @@ FloatMatrix Q = argq.float_matrix_value (); FloatMatrix R = argr.float_matrix_value (); - octave::math::qr<FloatMatrix> fact (Q, R); + math::qr<FloatMatrix> fact (Q, R); fact.shift_cols (i-1, j-1); retval = ovl (fact.Q (), get_qr_r (fact)); @@ -1928,7 +1928,7 @@ Matrix Q = argq.matrix_value (); Matrix R = argr.matrix_value (); - octave::math::qr<Matrix> fact (Q, R); + math::qr<Matrix> fact (Q, R); fact.shift_cols (i-1, j-1); retval = ovl (fact.Q (), get_qr_r (fact)); @@ -1943,7 +1943,7 @@ FloatComplexMatrix Q = argq.float_complex_matrix_value (); FloatComplexMatrix R = argr.float_complex_matrix_value (); - octave::math::qr<FloatComplexMatrix> fact (Q, R); + math::qr<FloatComplexMatrix> fact (Q, R); fact.shift_cols (i-1, j-1); retval = ovl (fact.Q (), get_qr_r (fact)); @@ -1953,7 +1953,7 @@ ComplexMatrix Q = argq.complex_matrix_value (); ComplexMatrix R = argr.complex_matrix_value (); - octave::math::qr<ComplexMatrix> fact (Q, R); + math::qr<ComplexMatrix> fact (Q, R); fact.shift_cols (i-1, j-1); retval = ovl (fact.Q (), get_qr_r (fact));
--- a/libinterp/corefcn/quad.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/quad.cc Sat Aug 14 22:48:52 2021 -0400 @@ -46,6 +46,8 @@ #include "Quad-opts.cc" +OCTAVE_NAMESPACE_BEGIN + // Global pointer for user defined function required by quadrature functions. static octave_value quad_fcn; @@ -55,7 +57,7 @@ // Is this a recursive call? static int call_depth = 0; -double +static double quad_user_function (double x) { double retval = 0.0; @@ -69,9 +71,9 @@ try { - tmp = octave::feval (quad_fcn, args, 1); + tmp = feval (quad_fcn, args, 1); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { err_user_supplied_eval (ee, "quad"); } @@ -91,7 +93,7 @@ return retval; } -float +static float quad_float_user_function (float x) { float retval = 0.0; @@ -105,9 +107,9 @@ try { - tmp = octave::feval (quad_fcn, args, 1); + tmp = feval (quad_fcn, args, 1); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { err_user_supplied_eval (ee, "quad"); } @@ -127,8 +129,6 @@ return retval; } -OCTAVE_NAMESPACE_BEGIN - DEFMETHODX ("quad", Fquad, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{q} =} quad (@var{f}, @var{a}, @var{b}) @@ -182,13 +182,13 @@ warned_imaginary = false; - octave::unwind_protect_var<int> restore_var (call_depth); + unwind_protect_var<int> restore_var (call_depth); call_depth++; if (call_depth > 1) error ("quad: invalid recursive call"); - quad_fcn = octave::get_function_handle (interp, args(0), "x"); + quad_fcn = get_function_handle (interp, args(0), "x"); octave_value_list retval; @@ -201,18 +201,18 @@ FloatIndefQuad::IntegralType indef_type = FloatIndefQuad::doubly_infinite; float bound = 0.0; - if (octave::math::isinf (a) && octave::math::isinf (b)) + if (math::isinf (a) && math::isinf (b)) { indefinite = 1; indef_type = FloatIndefQuad::doubly_infinite; } - else if (octave::math::isinf (a)) + else if (math::isinf (a)) { indefinite = 1; bound = b; indef_type = FloatIndefQuad::neg_inf_to_bound; } - else if (octave::math::isinf (b)) + else if (math::isinf (b)) { indefinite = 1; bound = a; @@ -297,18 +297,18 @@ int indefinite = 0; IndefQuad::IntegralType indef_type = IndefQuad::doubly_infinite; double bound = 0.0; - if (octave::math::isinf (a) && octave::math::isinf (b)) + if (math::isinf (a) && math::isinf (b)) { indefinite = 1; indef_type = IndefQuad::doubly_infinite; } - else if (octave::math::isinf (a)) + else if (math::isinf (a)) { indefinite = 1; bound = b; indef_type = IndefQuad::neg_inf_to_bound; } - else if (octave::math::isinf (b)) + else if (math::isinf (b)) { indefinite = 1; bound = a;
--- a/libinterp/corefcn/quadcc.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/quadcc.cc Sat Aug 14 22:48:52 2021 -0400 @@ -45,6 +45,8 @@ // Extended debugging. #define DEBUG_QUADCC 0 +OCTAVE_NAMESPACE_BEGIN + // Define the minimum size of the interval heap. static const int MIN_CQUAD_HEAPSIZE = 200; @@ -1484,8 +1486,6 @@ } } -OCTAVE_NAMESPACE_BEGIN - // The actual integration routine. DEFMETHOD (quadcc, interp, args, , @@ -1596,7 +1596,7 @@ if (nargin < 3) print_usage (); - fcn = octave::get_function_handle (interp, args(0), "x"); + fcn = get_function_handle (interp, args(0), "x"); if (! args(1).is_real_scalar ()) error ("quadcc: lower limit of integration (A) must be a real scalar"); @@ -1675,11 +1675,11 @@ } // If a or b are +/-Inf, transform the integral. - if (octave::math::isinf (a) || octave::math::isinf (b)) + if (math::isinf (a) || math::isinf (b)) { wrap = true; for (i = 0; i < nivals + 1; i++) - if (octave::math::isinf (iivals[i])) + if (math::isinf (iivals[i])) iivals[i] = std::copysign (1.0, iivals[i]); else iivals[i] = 2.0 * atan (iivals[i]) / M_PI; @@ -1711,7 +1711,7 @@ ex(i) = m + xi[i]*h; } fargs(0) = ex; - fvals = octave::feval (fcn, fargs, 1); + fvals = feval (fcn, fargs, 1); if (fvals.length () != 1 || ! fvals(0).is_real_matrix ()) error ("quadcc: integrand F must return a single, real-valued vector"); @@ -1728,7 +1728,7 @@ iv->fx[i] *= (1.0 + xw*xw) * M_PI/2; } neval++; - if (! octave::math::isfinite (iv->fx[i])) + if (! math::isfinite (iv->fx[i])) { nans[nnans++] = i; iv->fx[i] = 0.0; @@ -1738,7 +1738,7 @@ Vinvfx (iv->fx, &(iv->c[idx[2]]), 2); Vinvfx (iv->fx, &(iv->c[0]), 0); for (i = 0; i < nnans; i++) - iv->fx[nans[i]] = octave::numeric_limits<double>::NaN (); + iv->fx[nans[i]] = numeric_limits<double>::NaN (); iv->a = iivals[j]; iv->b = iivals[j + 1]; iv->depth = 3; @@ -1821,7 +1821,7 @@ ex(i) = m + xi[(2*i + 1) * skip[d]] * h; } fargs(0) = ex; - fvals = octave::feval (fcn, fargs, 1); + fvals = feval (fcn, fargs, 1); if (fvals.length () != 1 || ! fvals(0).is_real_matrix ()) error ("quadcc: integrand F must return a single, real-valued vector"); @@ -1844,7 +1844,7 @@ nnans = 0; for (i = 0; i <= 32; i += skip[d]) { - if (! octave::math::isfinite (iv->fx[i])) + if (! math::isfinite (iv->fx[i])) { nans[nnans++] = i; iv->fx[i] = 0.0; @@ -1858,7 +1858,7 @@ { downdate (&(iv->c[idx[d]]), n[d], d, nans, nnans); for (i = 0; i < nnans; i++) - iv->fx[nans[i]] = octave::numeric_limits<double>::NaN (); + iv->fx[nans[i]] = numeric_limits<double>::NaN (); } // Compute the error estimate. @@ -1954,7 +1954,7 @@ ex(i) = ml + xi[(i + 1) * skip[0]] * hl; } fargs(0) = ex; - fvals = octave::feval (fcn, fargs, 1); + fvals = feval (fcn, fargs, 1); if (fvals.length () != 1 || ! fvals(0).is_real_matrix ()) error ("quadcc: integrand F must return a single, real-valued vector"); @@ -1977,7 +1977,7 @@ nnans = 0; for (i = 0; i <= 32; i += skip[0]) { - if (! octave::math::isfinite (ivl->fx[i])) + if (! math::isfinite (ivl->fx[i])) { nans[nnans++] = i; ivl->fx[i] = 0.0; @@ -1988,7 +1988,7 @@ { downdate (ivl->c, n[0], 0, nans, nnans); for (i = 0; i < nnans; i++) - ivl->fx[nans[i]] = octave::numeric_limits<double>::NaN (); + ivl->fx[nans[i]] = numeric_limits<double>::NaN (); } for (i = 0; i <= n[d]; i++) { @@ -2014,7 +2014,7 @@ && ivl->c[0] / iv->c[0] > 2); if (ivl->ndiv > ndiv_max && 2*ivl->ndiv > ivl->rdepth) { - igral = std::copysign (octave::numeric_limits<double>::Inf (), igral); + igral = std::copysign (numeric_limits<double>::Inf (), igral); warning ("quadcc: divergent integral detected"); break; } @@ -2045,7 +2045,7 @@ ex(i) = mr + xi[(i + 1) * skip[0]] * hr; } fargs(0) = ex; - fvals = octave::feval (fcn, fargs, 1); + fvals = feval (fcn, fargs, 1); if (fvals.length () != 1 || ! fvals(0).is_real_matrix ()) error ("quadcc: integrand F must return a single, real-valued vector"); @@ -2068,7 +2068,7 @@ nnans = 0; for (i = 0; i <= 32; i += skip[0]) { - if (! octave::math::isfinite (ivr->fx[i])) + if (! math::isfinite (ivr->fx[i])) { nans[nnans++] = i; ivr->fx[i] = 0.0; @@ -2079,7 +2079,7 @@ { downdate (ivr->c, n[0], 0, nans, nnans); for (i = 0; i < nnans; i++) - ivr->fx[nans[i]] = octave::numeric_limits<double>::NaN (); + ivr->fx[nans[i]] = numeric_limits<double>::NaN (); } for (i = 0; i <= n[d]; i++) { @@ -2105,7 +2105,7 @@ && ivr->c[0] / iv->c[0] > 2); if (ivr->ndiv > ndiv_max && 2*ivr->ndiv > ivr->rdepth) { - igral = std::copysign (octave::numeric_limits<double>::Inf (), igral); + igral = std::copysign (numeric_limits<double>::Inf (), igral); warning ("quadcc: divergent integral detected"); break; }
--- a/libinterp/corefcn/qz.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/qz.cc Sat Aug 14 22:48:52 2021 -0400 @@ -243,8 +243,8 @@ #endif // Matrix A: check dimensions. - F77_INT nn = octave::to_f77_int (args(0).rows ()); - F77_INT nc = octave::to_f77_int (args(0).columns ()); + F77_INT nn = to_f77_int (args(0).rows ()); + F77_INT nc = to_f77_int (args(0).columns ()); #if defined (DEBUG) octave_stdout << "Matrix A dimensions: (" << nn << ',' << nc << ')' @@ -273,8 +273,8 @@ #endif // Extract argument 2 (bb, or cbb if complex). - F77_INT b_nr = octave::to_f77_int (args(1).rows ()); - F77_INT b_nc = octave::to_f77_int (args(1).columns ()); + F77_INT b_nr = to_f77_int (args(1).rows ()); + F77_INT b_nc = to_f77_int (args(1).columns ()); if (nn != b_nc || nn != b_nr) ::err_nonconformant (); @@ -411,7 +411,7 @@ // Complex case. // The QR decomposition of cbb. - octave::math::qr<ComplexMatrix> cbqr (cbb); + math::qr<ComplexMatrix> cbqr (cbb); // The R matrix of QR decomposition for cbb. cbb = cbqr.R (); // (Q*)caa for following work. @@ -479,7 +479,7 @@ #endif // Compute the QR factorization of bb. - octave::math::qr<Matrix> bqr (bb); + math::qr<Matrix> bqr (bb); #if defined (DEBUG) octave_stdout << "qz: qr (bb) done; now performing qz decomposition" @@ -689,7 +689,7 @@ if (betar(i) != 0) tmp(i) = Complex (alphar(i), alphai(i)) / betar(i); else - tmp(i) = octave::numeric_limits<double>::Inf (); + tmp(i) = numeric_limits<double>::Inf (); } gev = tmp;
--- a/libinterp/corefcn/rand.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/rand.cc Sat Aug 14 22:48:52 2021 -0400 @@ -120,13 +120,13 @@ dim_vector dims; // Restore current distribution on any exit. - octave::unwind_action restore_distribution + unwind_action restore_distribution ([] (const std::string& old_distribution) { - octave::rand::distribution (old_distribution); - }, octave::rand::distribution ()); + rand::distribution (old_distribution); + }, rand::distribution ()); - octave::rand::distribution (distribution); + rand::distribution (distribution); switch (nargin) { @@ -155,21 +155,21 @@ std::string s_arg = tmp.string_value (); if (s_arg == "dist") - retval = octave::rand::distribution (); + retval = rand::distribution (); else if (s_arg == "seed") - retval = octave::rand::seed (); + retval = rand::seed (); else if (s_arg == "state" || s_arg == "twister") - retval = octave::rand::state (fcn); + retval = rand::state (fcn); else if (s_arg == "uniform") - octave::rand::uniform_distribution (); + rand::uniform_distribution (); else if (s_arg == "normal") - octave::rand::normal_distribution (); + rand::normal_distribution (); else if (s_arg == "exponential") - octave::rand::exponential_distribution (); + rand::exponential_distribution (); else if (s_arg == "poisson") - octave::rand::poisson_distribution (); + rand::poisson_distribution (); else if (s_arg == "gamma") - octave::rand::gamma_distribution (); + rand::gamma_distribution (); else error ("%s: unrecognized string argument", fcn); } @@ -185,7 +185,7 @@ } else if (tmp.is_range ()) { - octave::range<double> r = tmp.range_value (); + range<double> r = tmp.range_value (); if (! r.all_elements_are_ints ()) error ("%s: all elements of range must be integers", fcn); @@ -194,8 +194,8 @@ dims.resize (n); - octave_idx_type base = octave::math::nint_big (r.base ()); - octave_idx_type incr = octave::math::nint_big (r.increment ()); + octave_idx_type base = math::nint_big (r.base ()); + octave_idx_type incr = math::nint_big (r.increment ()); for (octave_idx_type i = 0; i < n; i++) { @@ -214,7 +214,7 @@ { iv = tmp.octave_idx_type_vector_value (true); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { error (ee, "%s: dimensions must be a scalar or array of integers", fcn); } @@ -251,11 +251,11 @@ { double d = args(idx+1).double_value (); - octave::rand::seed (d); + rand::seed (d); } else if (args(idx+1).is_string () && args(idx+1).string_value () == "reset") - octave::rand::reset (); + rand::reset (); else error ("%s: seed must be a real scalar", fcn); } @@ -263,7 +263,7 @@ { if (args(idx+1).is_string () && args(idx+1).string_value () == "reset") - octave::rand::reset (fcn); + rand::reset (fcn); else { ColumnVector s @@ -272,10 +272,10 @@ // Backwards compatibility with previous versions of // Octave which mapped Inf to 0. for (octave_idx_type i = 0; i < s.numel (); i++) - if (octave::math::isinf (s.xelem (i))) + if (math::isinf (s.xelem (i))) s.xelem (i) = 0.0; - octave::rand::state (s, fcn); + rand::state (s, fcn); } } else @@ -311,7 +311,7 @@ if (additional_arg) { if (a.numel () == 1) - return octave::rand::float_nd_array (dims, a(0)); + return rand::float_nd_array (dims, a(0)); else { if (a.dims () != dims) @@ -322,20 +322,20 @@ float *v = m.fortran_vec (); for (octave_idx_type i = 0; i < len; i++) - v[i] = octave::rand::float_scalar (a(i)); + v[i] = rand::float_scalar (a(i)); return m; } } else - return octave::rand::float_nd_array (dims); + return rand::float_nd_array (dims); } else { if (additional_arg) { if (a.numel () == 1) - return octave::rand::nd_array (dims, a(0)); + return rand::nd_array (dims, a(0)); else { if (a.dims () != dims) @@ -346,13 +346,13 @@ double *v = m.fortran_vec (); for (octave_idx_type i = 0; i < len; i++) - v[i] = octave::rand::scalar (a(i)); + v[i] = rand::scalar (a(i)); return m; } } else - return octave::rand::nd_array (dims); + return rand::nd_array (dims); } } @@ -547,7 +547,7 @@ %!error <dimensions must be .* array of integers> rand ([1, 1.1]) */ -static std::string current_distribution = octave::rand::distribution (); +static std::string current_distribution = rand::distribution (); DEFUN (randn, args, , doc: /* -*- texinfo -*- @@ -1140,7 +1140,7 @@ bool short_shuffle = m < n/5; // Generate random numbers. - NDArray r = octave::rand::nd_array (dim_vector (1, m)); + NDArray r = rand::nd_array (dim_vector (1, m)); double *rvec = r.fortran_vec (); octave_idx_type idx_len = (short_shuffle ? m : n); @@ -1204,8 +1204,8 @@ if (m < n) idx.resize (dim_vector (1, m)); - // Now create an array object with a cached octave::idx_vector. - return ovl (new octave_matrix (r, octave::idx_vector (idx))); + // Now create an array object with a cached idx_vector. + return ovl (new octave_matrix (r, idx_vector (idx))); } /*
--- a/libinterp/corefcn/regexp.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/regexp.cc Sat Aug 14 22:48:52 2021 -0400 @@ -312,7 +312,7 @@ } static void -parse_options (octave::regexp::opts& options, const octave_value_list& args, +parse_options (regexp::opts& options, const octave_value_list& args, const std::string& who, int skip, bool& extra_args) { extra_args = false; @@ -376,13 +376,13 @@ // Rewrite pattern for PCRE pattern = do_regexp_ptn_string_escapes (pattern, args(1).is_sq_string ()); - octave::regexp::opts options; + regexp::opts options; options.case_insensitive (case_insensitive); bool extra_options = false; parse_options (options, args, who, 2, extra_options); - const octave::regexp::match_data rx_lst - = octave::regexp::match (pattern, buffer, options, who); + const regexp::match_data rx_lst + = regexp::match (pattern, buffer, options, who); string_vector named_pats = rx_lst.named_patterns (); @@ -1396,11 +1396,11 @@ } regexpargs.resize (len); - octave::regexp::opts options; + regexp::opts options; bool extra_args = false; parse_options (options, regexpargs, who, 0, extra_args); - return octave::regexp::replace (pattern, buffer, replacement, options, who); + return regexp::replace (pattern, buffer, replacement, options, who); } DEFUN (regexprep, args, ,
--- a/libinterp/corefcn/schur.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/schur.cc Sat Aug 14 22:48:52 2021 -0400 @@ -184,12 +184,12 @@ if (nargout <= 1) { - octave::math::schur<FloatMatrix> result (tmp, ord, false); + math::schur<FloatMatrix> result (tmp, ord, false); retval = ovl (result.schur_matrix ()); } else { - octave::math::schur<FloatMatrix> result (tmp, ord, true); + math::schur<FloatMatrix> result (tmp, ord, true); retval = ovl (result.unitary_matrix (), result.schur_matrix ()); } @@ -200,12 +200,12 @@ if (nargout <= 1) { - octave::math::schur<FloatComplexMatrix> result (ctmp, ord, false); + math::schur<FloatComplexMatrix> result (ctmp, ord, false); retval = ovl (mark_upper_triangular (result.schur_matrix ())); } else { - octave::math::schur<FloatComplexMatrix> result (ctmp, ord, true); + math::schur<FloatComplexMatrix> result (ctmp, ord, true); retval = ovl (result.unitary_matrix (), mark_upper_triangular (result.schur_matrix ())); } @@ -219,12 +219,12 @@ if (nargout <= 1) { - octave::math::schur<Matrix> result (tmp, ord, false); + math::schur<Matrix> result (tmp, ord, false); retval = ovl (result.schur_matrix ()); } else { - octave::math::schur<Matrix> result (tmp, ord, true); + math::schur<Matrix> result (tmp, ord, true); retval = ovl (result.unitary_matrix (), result.schur_matrix ()); } @@ -235,12 +235,12 @@ if (nargout <= 1) { - octave::math::schur<ComplexMatrix> result (ctmp, ord, false); + math::schur<ComplexMatrix> result (ctmp, ord, false); retval = ovl (mark_upper_triangular (result.schur_matrix ())); } else { - octave::math::schur<ComplexMatrix> result (ctmp, ord, true); + math::schur<ComplexMatrix> result (ctmp, ord, true); retval = ovl (result.unitary_matrix (), mark_upper_triangular (result.schur_matrix ())); } @@ -306,8 +306,8 @@ FloatMatrix u = args(0).float_matrix_value (); FloatMatrix t = args(1).float_matrix_value (); - octave::math::schur<FloatComplexMatrix> cs - = octave::math::rsf2csf<FloatComplexMatrix, FloatMatrix> (t, u); + math::schur<FloatComplexMatrix> cs + = math::rsf2csf<FloatComplexMatrix, FloatMatrix> (t, u); return ovl (cs.unitary_matrix (), cs.schur_matrix ()); } @@ -316,8 +316,8 @@ Matrix u = args(0).matrix_value (); Matrix t = args(1).matrix_value (); - octave::math::schur<ComplexMatrix> cs - = octave::math::rsf2csf<ComplexMatrix, Matrix> (t, u); + math::schur<ComplexMatrix> cs + = math::rsf2csf<ComplexMatrix, Matrix> (t, u); return ovl (cs.unitary_matrix (), cs.schur_matrix ()); }
--- a/libinterp/corefcn/settings.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/settings.cc Sat Aug 14 22:48:52 2021 -0400 @@ -63,7 +63,7 @@ @seealso{__lexer_debug_flag__, __token_count__} @end deftypefn */) { - octave::settings& stgs = interp.get_settings (); + settings& stgs = interp.get_settings (); return stgs.display_tokens (args, nargout); } @@ -75,7 +75,7 @@ @seealso{__lexer_debug_flag__, __display_tokens__} @end deftypefn */) { - octave::settings& stgs = interp.get_settings (); + settings& stgs = interp.get_settings (); return octave_value (stgs.token_count ()); } @@ -89,7 +89,7 @@ @seealso{__display_tokens__, __token_count__, __parse_debug_flag__} @end deftypefn */) { - octave::settings& stgs = interp.get_settings (); + settings& stgs = interp.get_settings (); return stgs.lexer_debug_flag (args, nargout); }
--- a/libinterp/corefcn/sighandlers.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/sighandlers.cc Sat Aug 14 22:48:52 2021 -0400 @@ -496,7 +496,7 @@ if (args.length () != 0) print_usage (); - static octave_scalar_map m = octave::make_sig_struct (); + static octave_scalar_map m = make_sig_struct (); return ovl (m); } @@ -526,7 +526,7 @@ @seealso{debug_on_error, debug_on_warning} @end deftypefn */) { - return set_internal_variable (octave::Vdebug_on_interrupt, args, nargout, + return set_internal_variable (Vdebug_on_interrupt, args, nargout, "debug_on_interrupt"); } @@ -556,7 +556,7 @@ The original variable value is restored when exiting the function. @end deftypefn */) { - return set_internal_variable (octave::Vsighup_dumps_octave_core, + return set_internal_variable (Vsighup_dumps_octave_core, args, nargout, "sighup_dumps_octave_core"); } @@ -587,7 +587,7 @@ The original variable value is restored when exiting the function. @end deftypefn */) { - return set_internal_variable (octave::Vsigquit_dumps_octave_core, + return set_internal_variable (Vsigquit_dumps_octave_core, args, nargout, "sigquit_dumps_octave_core"); } @@ -618,7 +618,7 @@ The original variable value is restored when exiting the function. @end deftypefn */) { - return set_internal_variable (octave::Vsigterm_dumps_octave_core, + return set_internal_variable (Vsigterm_dumps_octave_core, args, nargout, "sigterm_dumps_octave_core"); }
--- a/libinterp/corefcn/sparse.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/sparse.cc Sat Aug 14 22:48:52 2021 -0400 @@ -155,7 +155,7 @@ octave_value retval; // Temporarily disable sparse_auto_mutate if set (it's obsolete anyway). - octave::unwind_protect_var<bool> restore_var (Vsparse_auto_mutate, false); + unwind_protect_var<bool> restore_var (Vsparse_auto_mutate, false); if (nargin == 1) { @@ -174,7 +174,7 @@ octave_idx_type m = 0; octave_idx_type n = 0; - octave::get_dimensions (args(0), args(1), "sparse", m, n); + get_dimensions (args(0), args(1), "sparse", m, n); if (m < 0 || n < 0) error ("sparse: dimensions must be non-negative"); @@ -207,7 +207,7 @@ if (nargin == 5) { - octave::get_dimensions (args(3), args(4), "sparse", m, n); + get_dimensions (args(3), args(4), "sparse", m, n); if (m < 0 || n < 0) error ("sparse: dimensions must be non-negative"); @@ -216,9 +216,9 @@ int k = 0; // index we're checking when index_vector throws try { - octave::idx_vector i = args(0).index_vector (); + idx_vector i = args(0).index_vector (); k = 1; - octave::idx_vector j = args(1).index_vector (); + idx_vector j = args(1).index_vector (); if (args(2).islogical ()) retval = SparseBoolMatrix (args(2).bool_array_value (), i,j, @@ -232,7 +232,7 @@ else err_wrong_type_arg ("sparse", args(2)); } - catch (octave::index_exception& ie) + catch (index_exception& ie) { // Rethrow to allow more info to be reported later. ie.set_pos_if_unset (2, k+1);
--- a/libinterp/corefcn/spparms.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/spparms.cc Sat Aug 14 22:48:52 2021 -0400 @@ -115,12 +115,12 @@ if (nargin == 0) { if (nargout == 0) - octave::sparse_params::print_info (octave_stdout, ""); + sparse_params::print_info (octave_stdout, ""); else if (nargout == 1) - retval = ovl (octave::sparse_params::get_vals ()); + retval = ovl (sparse_params::get_vals ()); else if (nargout == 2) - retval = ovl (octave::sparse_params::get_keys (), - octave::sparse_params::get_vals ()); + retval = ovl (sparse_params::get_keys (), + sparse_params::get_vals ()); else error ("spparms: too many output arguments"); } @@ -134,13 +134,13 @@ str[i] = tolower (str[i]); if (str == "default") - octave::sparse_params::defaults (); + sparse_params::defaults (); else if (str == "tight") - octave::sparse_params::tight (); + sparse_params::tight (); else { - double val = octave::sparse_params::get_key (str); - if (octave::math::isnan (val)) + double val = sparse_params::get_key (str); + if (math::isnan (val)) error ("spparms: KEY not recognized"); retval = ovl (val); @@ -152,7 +152,7 @@ if (vals.numel () > OCTAVE_SPARSE_CONTROLS_SIZE) error ("spparms: too many elements in vector VALS"); - octave::sparse_params::set_vals (vals); + sparse_params::set_vals (vals); } } else if (nargin == 2) @@ -163,7 +163,7 @@ if (str == "umfpack") warning ("spparms: request to disable umfpack solvers ignored"); - else if (! octave::sparse_params::set_key (str, val)) + else if (! sparse_params::set_key (str, val)) error ("spparms: KEY not found"); } else
--- a/libinterp/corefcn/sqrtm.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/sqrtm.cc Sat Aug 14 22:48:52 2021 -0400 @@ -150,7 +150,7 @@ } if (iscomplex) - cutoff = 10 * x.rows () * eps * octave::xnorm (x, one); + cutoff = 10 * x.rows () * eps * xnorm (x, one); } if (iscomplex) @@ -193,7 +193,7 @@ x = u * x; // original x no longer needed. ComplexMatrix res = xgemm (x, u, blas_no_trans, blas_conj_trans); - if (cutoff > 0 && octave::xnorm (imag (res), one) <= cutoff) + if (cutoff > 0 && xnorm (imag (res), one) <= cutoff) retval = real (res); else retval = res; @@ -242,10 +242,10 @@ retval(0) = arg.sqrt (); else if (arg.is_single_type ()) retval(0) = do_sqrtm<FloatMatrix, FloatComplexMatrix, - octave::math::schur<FloatComplexMatrix>> (arg); + math::schur<FloatComplexMatrix>> (arg); else if (arg.isnumeric ()) retval(0) = do_sqrtm<Matrix, ComplexMatrix, - octave::math::schur<ComplexMatrix>> (arg); + math::schur<ComplexMatrix>> (arg); if (nargout > 1) {
--- a/libinterp/corefcn/stream-euler.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/stream-euler.cc Sat Aug 14 22:48:52 2021 -0400 @@ -197,7 +197,7 @@ static inline bool is_singular2d (const Vector2 V) { - return ((octave::math::isnan (V.x) || octave::math::isnan (V.y)) || + return ((math::isnan (V.x) || math::isnan (V.y)) || ((V.x == 0) && (V.y == 0))); } @@ -369,8 +369,7 @@ static inline bool is_singular3d (const Vector3 V) { - return ((octave::math::isnan (V.x) || octave::math::isnan (V.y) || - octave::math::isnan (V.z)) || + return ((math::isnan (V.x) || math::isnan (V.y) || math::isnan (V.z)) || ((V.x == 0) && (V.y == 0) && (V.z == 0))); }
--- a/libinterp/corefcn/strfind.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/strfind.cc Sat Aug 14 22:48:52 2021 -0400 @@ -286,7 +286,7 @@ error ("strfind: first argument must be a string or cell array of strings"); } else if (argpat.iscell ()) - retval = octave::do_simple_cellfun (Fstrfind, "strfind", args); + retval = do_simple_cellfun (Fstrfind, "strfind", args); else error ("strfind: PATTERN must be a string or cell array of strings"); @@ -486,7 +486,7 @@ error ("strrep: S must be a string or cell array of strings"); } else if (argpat.iscell () || argrep.iscell ()) - retval = octave::do_simple_cellfun (Fstrrep, "strrep", args); + retval = do_simple_cellfun (Fstrrep, "strrep", args); else error ("strrep: PTN and REP arguments must be strings or cell arrays of strings");
--- a/libinterp/corefcn/strfns.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/strfns.cc Sat Aug 14 22:48:52 2021 -0400 @@ -531,12 +531,12 @@ template <typename T, typename T_size_type> static bool strcmp_ignore_n (const T& s1, const T& s2, T_size_type) -{ return octave::string::strcmp (s1, s2); } +{ return string::strcmp (s1, s2); } template <typename T, typename T_size_type> static bool strcmpi_ignore_n (const T& s1, const T& s2, T_size_type) -{ return octave::string::strcmpi (s1, s2); } +{ return string::strcmpi (s1, s2); } DEFUN (strcmp, args, , @@ -652,8 +652,8 @@ if (n > 0) return ovl (do_strcmp_fun (args(0), args(1), n, "strncmp", - octave::string::strncmp, - octave::string::strncmp)); + string::strncmp, + string::strncmp)); else error ("strncmp: N must be greater than 0"); } @@ -732,8 +732,8 @@ if (n > 0) return ovl (do_strcmp_fun (args(0), args(1), n, "strncmpi", - octave::string::strncmpi, - octave::string::strncmpi)); + string::strncmpi, + string::strncmpi)); else error ("strncmpi: N must be greater than 0"); } @@ -799,31 +799,31 @@ if (args(0).is_string ()) { if (args(0).rows () == 0 || args(0).columns () == 0) - retval = Matrix (1, 1, octave::numeric_limits<double>::NaN ()); + retval = Matrix (1, 1, numeric_limits<double>::NaN ()); else if (args(0).rows () == 1 && args(0).ndims () == 2) - retval = octave::string::str2double (args(0).string_value ()); + retval = string::str2double (args(0).string_value ()); else { const string_vector sv = args(0).string_vector_value (); - retval = sv.map<Complex> (octave::string::str2double); + retval = sv.map<Complex> (string::str2double); } } else if (args(0).iscell ()) { const Cell cell = args(0).cell_value (); - ComplexNDArray output (cell.dims (), octave::numeric_limits<double>::NaN ()); + ComplexNDArray output (cell.dims (), numeric_limits<double>::NaN ()); for (octave_idx_type i = 0; i < cell.numel (); i++) { if (cell(i).is_string ()) - output(i) = octave::string::str2double (cell(i).string_value ()); + output(i) = string::str2double (cell(i).string_value ()); } retval = output; } else - retval = Matrix (1, 1, octave::numeric_limits<double>::NaN ()); + retval = Matrix (1, 1, numeric_limits<double>::NaN ()); return retval; } @@ -910,7 +910,7 @@ codepage, std::strerror (errno)); } - octave::unwind_action free_utf8_str ([=] () { ::free (utf8_str); }); + unwind_action free_utf8_str ([=] () { ::free (utf8_str); }); octave_idx_type len = length; @@ -955,7 +955,7 @@ codepage, std::strerror (errno)); } - octave::unwind_action free_native_bytes ([=] () { ::free (native_bytes); }); + unwind_action free_native_bytes ([=] () { ::free (native_bytes); }); octave_idx_type len = length; @@ -1126,15 +1126,15 @@ if (nargin == 2) mode = args(1).xstring_value ("__u8_validate__: MODE must be a string"); - octave::string::u8_fallback_type fb_type; + string::u8_fallback_type fb_type; if (mode == "replace") - fb_type = octave::string::U8_REPLACEMENT_CHAR; + fb_type = string::U8_REPLACEMENT_CHAR; else if (mode == "unicode") - fb_type = octave::string::U8_ISO_8859_1; + fb_type = string::U8_ISO_8859_1; else error (R"(__u8_validate__: MODE must be either "replace" or "unicode")"); - octave::string::u8_validate ("__u8_validate__", in_str, fb_type); + string::u8_validate ("__u8_validate__", in_str, fb_type); return ovl (in_str); }
--- a/libinterp/corefcn/sub2ind.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/sub2ind.cc Sat Aug 14 22:48:52 2021 -0400 @@ -117,7 +117,7 @@ dim_vector dv = get_dim_vector (args(0), "sub2ind"); - Array<octave::idx_vector> idxa (dim_vector (nargin-1, 1)); + Array<idx_vector> idxa (dim_vector (nargin-1, 1)); for (int j = 0; j < nargin - 1; j++) { @@ -131,7 +131,7 @@ if (j > 0 && args(j+1).dims () != args(1).dims ()) error ("sub2ind: all subscripts must be of the same size"); } - catch (octave::index_exception& ie) + catch (index_exception& ie) { ie.set_pos_if_unset (nargin-1, j+1); ie.set_var (); @@ -271,7 +271,7 @@ { retval = Array<octave_value> (ind2sub (dv, args(1).index_vector ())); } - catch (const octave::index_exception& ie) + catch (const index_exception& ie) { error ("ind2sub: invalid index %s", ie.what ()); }
--- a/libinterp/corefcn/svd.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/svd.cc Sat Aug 14 22:48:52 2021 -0400 @@ -42,34 +42,34 @@ static std::string Vsvd_driver = "gesvd"; template <typename T> -static typename octave::math::svd<T>::Type +static typename math::svd<T>::Type svd_type (int nargin, int nargout, const octave_value_list & args, const T & A) { if (nargout == 0 || nargout == 1) - return octave::math::svd<T>::Type::sigma_only; + return math::svd<T>::Type::sigma_only; else if (nargin == 1) - return octave::math::svd<T>::Type::std; + return math::svd<T>::Type::std; else if (! args(1).is_real_scalar ()) - return octave::math::svd<T>::Type::economy; + return math::svd<T>::Type::economy; else { if (A.rows () > A.columns ()) - return octave::math::svd<T>::Type::economy; + return math::svd<T>::Type::economy; else - return octave::math::svd<T>::Type::std; + return math::svd<T>::Type::std; } } template <typename T> -static typename octave::math::svd<T>::Driver +static typename math::svd<T>::Driver svd_driver (void) { if (Vsvd_driver == "gejsv") - return octave::math::svd<T>::Driver::GEJSV; + return math::svd<T>::Driver::GEJSV; else if (Vsvd_driver == "gesdd") - return octave::math::svd<T>::Driver::GESDD; + return math::svd<T>::Driver::GESDD; else - return octave::math::svd<T>::Driver::GESVD; // default + return math::svd<T>::Driver::GESVD; // default } DEFUN (svd, args, nargout, @@ -198,7 +198,7 @@ if (tmp.any_element_is_inf_or_nan ()) error ("svd: cannot take SVD of matrix containing Inf or NaN values"); - octave::math::svd<FloatMatrix> result + math::svd<FloatMatrix> result (tmp, svd_type<FloatMatrix> (nargin, nargout, args, tmp), svd_driver<FloatMatrix> ()); @@ -222,7 +222,7 @@ if (ctmp.any_element_is_inf_or_nan ()) error ("svd: cannot take SVD of matrix containing Inf or NaN values"); - octave::math::svd<FloatComplexMatrix> result + math::svd<FloatComplexMatrix> result (ctmp, svd_type<FloatComplexMatrix> (nargin, nargout, args, ctmp), svd_driver<FloatComplexMatrix> ()); @@ -249,7 +249,7 @@ if (tmp.any_element_is_inf_or_nan ()) error ("svd: cannot take SVD of matrix containing Inf or NaN values"); - octave::math::svd<Matrix> result + math::svd<Matrix> result (tmp, svd_type<Matrix> (nargin, nargout, args, tmp), svd_driver<Matrix> ()); @@ -273,7 +273,7 @@ if (ctmp.any_element_is_inf_or_nan ()) error ("svd: cannot take SVD of matrix containing Inf or NaN values"); - octave::math::svd<ComplexMatrix> result + math::svd<ComplexMatrix> result (ctmp, svd_type<ComplexMatrix> (nargin, nargout, args, ctmp), svd_driver<ComplexMatrix> ());
--- a/libinterp/corefcn/symbfact.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/symbfact.cc Sat Aug 14 22:48:52 2021 -0400 @@ -207,17 +207,17 @@ if (A->stype && A->nrow != A->ncol) err_square_matrix_required ("symbfact", "S"); - OCTAVE_LOCAL_BUFFER (octave::suitesparse_integer, Parent, n); - OCTAVE_LOCAL_BUFFER (octave::suitesparse_integer, Post, n); - OCTAVE_LOCAL_BUFFER (octave::suitesparse_integer, ColCount, n); - OCTAVE_LOCAL_BUFFER (octave::suitesparse_integer, First, n); + OCTAVE_LOCAL_BUFFER (suitesparse_integer, Parent, n); + OCTAVE_LOCAL_BUFFER (suitesparse_integer, Post, n); + OCTAVE_LOCAL_BUFFER (suitesparse_integer, ColCount, n); + OCTAVE_LOCAL_BUFFER (suitesparse_integer, First, n); OCTAVE_LOCAL_BUFFER (octave_idx_type, Level, n); cholmod_common Common; cholmod_common *cm = &Common; CHOLMOD_NAME(start) (cm); - double spu = octave::sparse_params::get_key ("spumoni"); + double spu = sparse_params::get_key ("spumoni"); if (spu == 0.0) { cm->print = -1; @@ -265,7 +265,7 @@ } CHOLMOD_NAME(rowcolcounts) (Alo, nullptr, 0, Parent, Post, nullptr, ColCount, - First, octave::to_suitesparse_intptr (Level), cm); + First, to_suitesparse_intptr (Level), cm); if (cm->status < CHOLMOD_OK) { @@ -316,7 +316,7 @@ L.xcidx(n) = lnz; // create a copy of the column pointers - octave::suitesparse_integer *W = First; + suitesparse_integer *W = First; for (octave_idx_type j = 0 ; j < n ; j++) W[j] = L.xcidx (j);
--- a/libinterp/corefcn/symtab.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/symtab.cc Sat Aug 14 22:48:52 2021 -0400 @@ -826,7 +826,7 @@ if (nargin > 1) print_usage (); - octave::symbol_table& symtab = interp.get_symbol_table (); + symbol_table& symtab = interp.get_symbol_table (); if (nargin == 0) return symtab.dump (); @@ -834,7 +834,7 @@ { std::string fname = args(0).xstring_value ("__dump_symtab_info__: argument must be a function name"); - octave::fcn_info *finfo = symtab.get_fcn_info (fname); + fcn_info *finfo = symtab.get_fcn_info (fname); if (finfo) return finfo->dump (); @@ -854,7 +854,7 @@ std::string name = args(0).xstring_value ("__get_cmdline_fcn_txt__: first argument must be function name"); - octave::symbol_table& symtab = interp.get_symbol_table (); + symbol_table& symtab = interp.get_symbol_table (); octave_value ov = symtab.find_cmdline_function (name); @@ -866,7 +866,7 @@ { std::ostringstream buf; - octave::tree_print_code tpc (buf); + tree_print_code tpc (buf); f->accept (tpc); @@ -885,7 +885,7 @@ // // std::string name = args(0).xstring_value ("set_variable: variable NAME must be a string"); // -// octave::symbol_table& symtab = interp.get_symbol_table (); +// symbol_table& symtab = interp.get_symbol_table (); // // symtab.assign (name, args(1)); // @@ -901,7 +901,7 @@ // // std::string name = args(0).xstring_value ("variable_value: variable NAME must be a string"); // -// octave::symbol_table& symtab = interp.get_symbol_table (); +// symbol_table& symtab = interp.get_symbol_table (); // // retval = symtab.varval (name); //
--- a/libinterp/corefcn/syscalls.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/syscalls.cc Sat Aug 14 22:48:52 2021 -0400 @@ -63,16 +63,16 @@ OCTAVE_NAMESPACE_BEGIN static octave_scalar_map -mk_stat_map (const octave::sys::base_file_stat& fs) +mk_stat_map (const sys::base_file_stat& fs) { static bool have_rdev - = octave::sys::base_file_stat::have_struct_stat_st_rdev (); + = sys::base_file_stat::have_struct_stat_st_rdev (); static bool have_blksize - = octave::sys::base_file_stat::have_struct_stat_st_blksize (); + = sys::base_file_stat::have_struct_stat_st_blksize (); static bool have_blocks - = octave::sys::base_file_stat::have_struct_stat_st_blocks (); + = sys::base_file_stat::have_struct_stat_st_blocks (); - static double nan = octave::numeric_limits<double>::NaN (); + static double nan = numeric_limits<double>::NaN (); octave_scalar_map m; @@ -103,7 +103,7 @@ } static octave_value_list -mk_stat_result (const octave::sys::base_file_stat& fs) +mk_stat_result (const sys::base_file_stat& fs) { if (fs) return ovl (octave_value (mk_stat_map (fs)), 0, ""); @@ -125,11 +125,11 @@ if (args.length () != 2) print_usage (); - octave::stream_list& streams = interp.get_stream_list (); + stream_list& streams = interp.get_stream_list (); - octave::stream old_stream = streams.lookup (args(0), "dup2"); + stream old_stream = streams.lookup (args(0), "dup2"); - octave::stream new_stream = streams.lookup (args(1), "dup2"); + stream new_stream = streams.lookup (args(1), "dup2"); int i_old = old_stream.file_number (); int i_new = new_stream.file_number (); @@ -138,7 +138,7 @@ { std::string msg; - int status = octave::sys::dup2 (i_old, i_new, msg); + int status = sys::dup2 (i_old, i_new, msg); return ovl (status, msg); } @@ -196,16 +196,16 @@ exec_args[0] = exec_file; } - octave::history_system& history_sys = interp.get_history_system (); + history_system& history_sys = interp.get_history_system (); history_sys.write_timestamp (); - if (! octave::command_history::ignoring_entries ()) - octave::command_history::clean_up_and_save (); + if (! command_history::ignoring_entries ()) + command_history::clean_up_and_save (); std::string msg; - int status = octave::sys::execvp (exec_file, exec_args, msg); + int status = sys::execvp (exec_file, exec_args, msg); return ovl (status, msg); } @@ -292,7 +292,7 @@ std::string msg; pid_t pid; - pid = octave::sys::popen2 (exec_file, arg_list, sync_mode, filedesc, msg); + pid = sys::popen2 (exec_file, arg_list, sync_mode, filedesc, msg); if (pid < 0) error ("%s", msg.c_str ()); @@ -300,13 +300,13 @@ FILE *ifile = fdopen (filedesc[1], "r"); FILE *ofile = fdopen (filedesc[0], "w"); - octave::stream is + stream is = octave_stdiostream::create (exec_file + "-in", ifile, std::ios::in); - octave::stream os + stream os = octave_stdiostream::create (exec_file + "-out", ofile, std::ios::out); - octave::stream_list& streams = interp.get_stream_list (); + stream_list& streams = interp.get_stream_list (); return ovl (streams.insert (os), streams.insert (is), pid); } @@ -442,9 +442,9 @@ if (args.length () != 3) print_usage (); - octave::stream_list& streams = interp.get_stream_list (); + stream_list& streams = interp.get_stream_list (); - octave::stream strm = streams.lookup (args(0), "fcntl"); + stream strm = streams.lookup (args(0), "fcntl"); int fid = strm.file_number (); @@ -460,7 +460,7 @@ octave_value_list retval; std::string msg; - int status = octave::sys::fcntl (fid, req, arg, msg); + int status = sys::fcntl (fid, req, arg, msg); if (nargout == 0) { @@ -509,7 +509,7 @@ std::string msg; - pid_t pid = octave::sys::fork (msg); + pid_t pid = sys::fork (msg); return ovl (pid, msg); } @@ -525,7 +525,7 @@ std::string msg; - pid_t pid = octave::sys::getpgrp (msg); + pid_t pid = sys::getpgrp (msg); return ovl (pid, msg); } @@ -540,7 +540,7 @@ if (args.length () != 0) print_usage (); - return ovl (octave::sys::getpid ()); + return ovl (sys::getpid ()); } DEFUNX ("getppid", Fgetppid, args, , @@ -553,7 +553,7 @@ if (args.length () != 0) print_usage (); - return ovl (octave::sys::getppid ()); + return ovl (sys::getppid ()); } DEFUNX ("getegid", Fgetegid, args, , @@ -566,7 +566,7 @@ if (args.length () != 0) print_usage (); - return ovl (octave::sys::getegid ()); + return ovl (sys::getegid ()); } DEFUNX ("getgid", Fgetgid, args, , @@ -579,7 +579,7 @@ if (args.length () != 0) print_usage (); - return ovl (octave::sys::getgid ()); + return ovl (sys::getgid ()); } DEFUNX ("geteuid", Fgeteuid, args, , @@ -592,7 +592,7 @@ if (args.length () != 0) print_usage (); - return ovl (octave::sys::geteuid ()); + return ovl (sys::geteuid ()); } DEFUNX ("getuid", Fgetuid, args, , @@ -605,7 +605,7 @@ if (args.length () != 0) print_usage (); - return ovl (octave::sys::getuid ()); + return ovl (sys::getuid ()); } DEFUNX ("kill", Fkill, args, nargout, @@ -643,7 +643,7 @@ octave_value_list retval; std::string msg; - int status = octave::sys::kill (pid, sig, msg); + int status = sys::kill (pid, sig, msg); if (nargout == 0) { @@ -677,7 +677,7 @@ std::string fname = args(0).xstring_value ("lstat: NAME must be a string"); - octave::sys::file_stat fs (fname, false); + sys::file_stat fs (fname, false); return mk_stat_result (fs); } @@ -740,7 +740,7 @@ octave_value_list retval; std::string msg; - int status = octave::sys::mkfifo (name, mode, msg); + int status = sys::mkfifo (name, mode, msg); if (nargout == 0) { @@ -789,7 +789,7 @@ int fid[2]; std::string msg; - int status = octave::sys::pipe (fid, msg); + int status = sys::pipe (fid, msg); if (status < 0) return ovl (-1, -1, -1, msg); @@ -798,13 +798,13 @@ FILE *ifile = fdopen (fid[0], "r"); FILE *ofile = fdopen (fid[1], "w"); - octave::stream is + stream is = octave_stdiostream::create ("pipe-in", ifile, std::ios::in); - octave::stream os + stream os = octave_stdiostream::create ("pipe-out", ofile, std::ios::out); - octave::stream_list& streams = interp.get_stream_list (); + stream_list& streams = interp.get_stream_list (); return ovl (streams.insert (is), streams.insert (os), status, msg); } @@ -913,11 +913,11 @@ if (args(0).is_scalar_type ()) { - octave::stream_list& streams = interp.get_stream_list (); + stream_list& streams = interp.get_stream_list (); int fid = streams.get_file_number (args(0)); - octave::sys::file_fstat fs (fid); + sys::file_fstat fs (fid); retval = mk_stat_result (fs); } @@ -925,7 +925,7 @@ { std::string fname = args(0).xstring_value ("stat: NAME must be a string"); - octave::sys::file_stat fs (fname); + sys::file_stat fs (fname); retval = mk_stat_result (fs); } @@ -948,7 +948,7 @@ double mode = args(0).xdouble_value ("S_ISREG: invalid MODE value"); - return ovl (octave::sys::file_stat::is_reg (static_cast<mode_t> (mode))); + return ovl (sys::file_stat::is_reg (static_cast<mode_t> (mode))); } DEFUNX ("S_ISDIR", FS_ISDIR, args, , @@ -966,7 +966,7 @@ double mode = args(0).xdouble_value ("S_ISDIR: invalid MODE value"); - return ovl (octave::sys::file_stat::is_dir (static_cast<mode_t> (mode))); + return ovl (sys::file_stat::is_dir (static_cast<mode_t> (mode))); } DEFUNX ("S_ISCHR", FS_ISCHR, args, , @@ -984,7 +984,7 @@ double mode = args(0).xdouble_value ("S_ISCHR: invalid MODE value"); - return ovl (octave::sys::file_stat::is_chr (static_cast<mode_t> (mode))); + return ovl (sys::file_stat::is_chr (static_cast<mode_t> (mode))); } DEFUNX ("S_ISBLK", FS_ISBLK, args, , @@ -1002,7 +1002,7 @@ double mode = args(0).xdouble_value ("S_ISBLK: invalid MODE value"); - return ovl (octave::sys::file_stat::is_blk (static_cast<mode_t> (mode))); + return ovl (sys::file_stat::is_blk (static_cast<mode_t> (mode))); } DEFUNX ("S_ISFIFO", FS_ISFIFO, args, , @@ -1020,7 +1020,7 @@ double mode = args(0).xdouble_value ("S_ISFIFO: invalid MODE value"); - return ovl (octave::sys::file_stat::is_fifo (static_cast<mode_t> (mode))); + return ovl (sys::file_stat::is_fifo (static_cast<mode_t> (mode))); } DEFUNX ("S_ISLNK", FS_ISLNK, args, , @@ -1038,7 +1038,7 @@ double mode = args(0).xdouble_value ("S_ISLNK: invalid MODE value"); - return ovl (octave::sys::file_stat::is_lnk (static_cast<mode_t> (mode))); + return ovl (sys::file_stat::is_lnk (static_cast<mode_t> (mode))); } DEFUNX ("S_ISSOCK", FS_ISSOCK, args, , @@ -1056,7 +1056,7 @@ double mode = args(0).xdouble_value ("S_ISSOCK: invalid MODE value"); - return ovl (octave::sys::file_stat::is_sock (static_cast<mode_t> (mode))); + return ovl (sys::file_stat::is_sock (static_cast<mode_t> (mode))); } DEFUN (gethostname, args, , @@ -1068,7 +1068,7 @@ if (args.length () != 0) print_usage (); - return ovl (octave::sys::env::get_host_name ()); + return ovl (sys::env::get_host_name ()); } DEFUN (uname, args, , @@ -1099,7 +1099,7 @@ if (args.length () != 0) print_usage (); - octave::sys::uname sysinfo; + sys::uname sysinfo; octave_scalar_map m; @@ -1141,11 +1141,11 @@ octave_value_list retval; std::string msg; - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); evmgr.file_remove (name, ""); - int status = octave::sys::unlink (name, msg); + int status = sys::unlink (name, msg); evmgr.file_renamed (status == 0); @@ -1246,7 +1246,7 @@ std::string msg; int status; - pid_t result = octave::sys::waitpid (pid, &status, options, msg); + pid_t result = sys::waitpid (pid, &status, options, msg); return ovl (result, status, msg); } @@ -1264,7 +1264,7 @@ int status = args(0).xint_value ("WIFEXITED: STATUS must be an integer"); - return ovl (octave::sys::wifexited (status)); + return ovl (sys::wifexited (status)); } DEFUNX ("WEXITSTATUS", FWEXITSTATUS, args, , @@ -1282,7 +1282,7 @@ int status = args(0).xint_value ("WEXITSTATUS: STATUS must be an integer"); - return ovl (octave::sys::wexitstatus (status)); + return ovl (sys::wexitstatus (status)); } DEFUNX ("WIFSIGNALED", FWIFSIGNALED, args, , @@ -1298,7 +1298,7 @@ int status = args(0).xint_value ("WIFSIGNALED: STATUS must be an integer"); - return ovl (octave::sys::wifsignaled (status)); + return ovl (sys::wifsignaled (status)); } DEFUNX ("WTERMSIG", FWTERMSIG, args, , @@ -1316,7 +1316,7 @@ int status = args(0).xint_value ("WTERMSIG: STATUS must be an integer"); - return ovl (octave::sys::wtermsig (status)); + return ovl (sys::wtermsig (status)); } DEFUNX ("WCOREDUMP", FWCOREDUMP, args, , @@ -1336,7 +1336,7 @@ int status = args(0).xint_value ("WCOREDUMP: STATUS must be an integer"); - return ovl (octave::sys::wcoredump (status)); + return ovl (sys::wcoredump (status)); } DEFUNX ("WIFSTOPPED", FWIFSTOPPED, args, , @@ -1355,7 +1355,7 @@ int status = args(0).xint_value ("WIFSTOPPED: STATUS must be an integer"); - return ovl (octave::sys::wifstopped (status)); + return ovl (sys::wifstopped (status)); } DEFUNX ("WSTOPSIG", FWSTOPSIG, args, , @@ -1373,7 +1373,7 @@ int status = args(0).xint_value ("WSTOPSIG: STATUS must be an integer"); - return ovl (octave::sys::wstopsig (status)); + return ovl (sys::wstopsig (status)); } DEFUNX ("WIFCONTINUED", FWIFCONTINUED, args, , @@ -1389,7 +1389,7 @@ int status = args(0).xint_value ("WIFCONTINUED: STATUS must be an integer"); - return ovl (octave::sys::wifcontinued (status)); + return ovl (sys::wifcontinued (status)); } DEFUNX ("canonicalize_file_name", Fcanonicalize_file_name, args, , @@ -1409,7 +1409,7 @@ std::string msg; - std::string result = octave::sys::canonicalize_file_name (name, msg); + std::string result = sys::canonicalize_file_name (name, msg); return ovl (result, msg.empty () ? 0 : -1, msg); } @@ -1699,7 +1699,7 @@ @seealso{waitpid, WUNTRACED, WCONTINUE} @end deftypefn */) { - return const_value (args, octave::sys::wnohang ()); + return const_value (args, sys::wnohang ()); } DEFUNX ("WUNTRACED", FWUNTRACED, args, , @@ -1713,7 +1713,7 @@ @seealso{waitpid, WNOHANG, WCONTINUE} @end deftypefn */) { - return const_value (args, octave::sys::wuntraced ()); + return const_value (args, sys::wuntraced ()); } DEFUNX ("WCONTINUE", FWCONTINUE, args, , @@ -1727,7 +1727,7 @@ @seealso{waitpid, WNOHANG, WUNTRACED} @end deftypefn */) { - return const_value (args, octave::sys::wcontinue ()); + return const_value (args, sys::wcontinue ()); } OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/sysdep.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/sysdep.cc Sat Aug 14 22:48:52 2021 -0400 @@ -201,7 +201,7 @@ std::string file = args(0).xstring_value ("__open_with_system_app__: argument must be a filename"); #if defined (OCTAVE_USE_WINDOWS_API) - std::wstring wfile = octave::sys::u8_to_wstring (file); + std::wstring wfile = sys::u8_to_wstring (file); HINSTANCE status = ShellExecuteW (0, 0, wfile.c_str (), 0, 0, SW_SHOWNORMAL); // ShellExecute returns a value greater than 32 if successful. @@ -810,7 +810,7 @@ { bool skip_redisplay = true; - octave::command_editor::clear_screen (skip_redisplay); + command_editor::clear_screen (skip_redisplay); return ovl (); } @@ -838,7 +838,7 @@ std::string name = args(0).string_value (); - return ovl (octave::sys::env::getenv (name)); + return ovl (sys::env::getenv (name)); } /* @@ -868,7 +868,7 @@ ? args(1).xstring_value ("setenv: VALUE must be a string") : ""); - octave::sys::env::putenv (var, val); + sys::env::putenv (var, val); return ovl (); } @@ -898,7 +898,7 @@ std::string tmp = args(0).string_value (); - return ovl (octave::sys::unsetenv_wrapper (tmp)); + return ovl (sys::unsetenv_wrapper (tmp)); } /* @@ -1119,7 +1119,7 @@ { std::list<std::string> fields; - LONG retval = octave::get_regkey_names (h_rootkey, subkey_name, fields); + LONG retval = get_regkey_names (h_rootkey, subkey_name, fields); if (retval != ERROR_SUCCESS) error ("winqueryreg: error %ld reading names from registry", retval); @@ -1134,7 +1134,7 @@ else { octave_value key_val; - LONG retval = octave::get_regkey_value (h_rootkey, subkey_name, + LONG retval = get_regkey_value (h_rootkey, subkey_name, value_name, key_val); if (retval == ERROR_FILE_NOT_FOUND) error ("winqueryreg: no value found for '%s' at %s\\%s", @@ -1232,7 +1232,7 @@ Fdrawnow (interp); - int c = octave::kbhit (args.length () == 0); + int c = kbhit (args.length () == 0); if (c == -1) c = 0; @@ -1330,13 +1330,13 @@ else dval = args(0).xdouble_value ("pause: N must be a scalar real value"); - if (octave::math::isnan (dval)) + if (math::isnan (dval)) warning ("pause: NaN is an invalid delay"); else { Fdrawnow (interp); - octave::sleep (dval, true); + sleep (dval, true); } } @@ -1362,11 +1362,10 @@ No actual tests are performed. @end deftypefn */) { - octave::mach_info::float_format flt_fmt - = octave::mach_info::native_float_format (); + mach_info::float_format flt_fmt = mach_info::native_float_format (); - return ovl (flt_fmt == octave::mach_info::flt_fmt_ieee_little_endian - || flt_fmt == octave::mach_info::flt_fmt_ieee_big_endian); + return ovl (flt_fmt == mach_info::flt_fmt_ieee_little_endian + || flt_fmt == mach_info::flt_fmt_ieee_big_endian); } /* @@ -1379,10 +1378,9 @@ Return the native floating point format as a string. @end deftypefn */) { - octave::mach_info::float_format flt_fmt - = octave::mach_info::native_float_format (); + mach_info::float_format flt_fmt = mach_info::native_float_format (); - return ovl (octave::mach_info::float_format_as_string (flt_fmt)); + return ovl (mach_info::float_format_as_string (flt_fmt)); } /* @@ -1424,7 +1422,7 @@ string_vector sv = arg.xstring_vector_value ("tilde_expand: argument must be char or cellstr object"); - sv = octave::sys::file_ops::tilde_expand (sv); + sv = sys::file_ops::tilde_expand (sv); if (arg.iscellstr ()) return ovl (Cell (arg.dims (), sv)); @@ -1452,7 +1450,7 @@ @seealso{getenv} @end deftypefn */) { - return ovl (octave::sys::env::get_home_directory ()); + return ovl (sys::env::get_home_directory ()); } /* @@ -1468,7 +1466,7 @@ Undocumented internal function. @end deftypefn */) { - return ovl (octave::sys::blas_version ()); + return ovl (sys::blas_version ()); } DEFUN (__lapack_version__, , , @@ -1477,7 +1475,7 @@ Undocumented internal function. @end deftypefn */) { - return ovl (octave::sys::lapack_version ()); + return ovl (sys::lapack_version ()); } OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/time.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/time.cc Sat Aug 14 22:48:52 2021 -0400 @@ -41,7 +41,7 @@ // Date and time functions. static octave_scalar_map -mk_tm_map (const octave::sys::base_tm& t) +mk_tm_map (const sys::base_tm& t) { octave_scalar_map m; @@ -87,10 +87,10 @@ return retval; } -static octave::sys::base_tm +static sys::base_tm extract_tm (const octave_scalar_map& m, const char *who) { - octave::sys::base_tm tm; + sys::base_tm tm; tm.usec (intfield (m, "usec", who)); tm.sec (intfield (m, "sec", who)); @@ -122,7 +122,7 @@ if (args.length () != 0) print_usage (); - return ovl (octave::sys::time ()); + return ovl (sys::time ()); } /* @@ -166,7 +166,7 @@ double tmp = args(0).double_value (); - return ovl (mk_tm_map (octave::sys::gmtime (tmp))); + return ovl (mk_tm_map (sys::gmtime (tmp))); } /* @@ -221,7 +221,7 @@ double tmp = args(0).double_value (); - return ovl (mk_tm_map (octave::sys::localtime (tmp))); + return ovl (mk_tm_map (sys::localtime (tmp))); } /* @@ -265,9 +265,9 @@ octave_scalar_map map = args(0).xscalar_map_value ("mktime: TM_STRUCT argument must be a structure"); - octave::sys::base_tm tm = extract_tm (map, "mktime"); + sys::base_tm tm = extract_tm (map, "mktime"); - return ovl (octave::sys::time (tm)); + return ovl (sys::time (tm)); } /* @@ -452,7 +452,7 @@ octave_scalar_map map = args(1).xscalar_map_value ("strftime: TM_STRUCT must be a structure"); - octave::sys::base_tm tm = extract_tm (map, "strftime"); + sys::base_tm tm = extract_tm (map, "strftime"); return ovl (tm.strftime (fmt)); } @@ -489,7 +489,7 @@ std::string fmt = args(1).xstring_value ("strptime: FMT must be a string"); - octave::sys::strptime t (str, fmt); + sys::strptime t (str, fmt); return ovl (mk_tm_map (t), t.characters_converted ()); }
--- a/libinterp/corefcn/toplev.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/toplev.cc Sat Aug 14 22:48:52 2021 -0400 @@ -109,14 +109,14 @@ run_command_and_return_output (const std::string& cmd_str) { octave_value_list retval; - octave::unwind_protect frame; + unwind_protect frame; iprocstream *cmd = new iprocstream (cmd_str.c_str ()); frame.add_delete (cmd); - octave::child_list& kids - = octave::__get_child_list__ ("run_command_and_return_output"); - frame.add (&octave::child_list::remove, kids, cmd->pid ()); + child_list& kids + = __get_child_list__ ("run_command_and_return_output"); + frame.add (&child_list::remove, kids, cmd->pid ()); if (! *cmd) error ("system: unable to start subprocess for '%s'", cmd_str.c_str ()); @@ -147,8 +147,8 @@ int cmd_status = cmd->close (); - if (octave::sys::wifexited (cmd_status)) - cmd_status = octave::sys::wexitstatus (cmd_status); + if (sys::wifexited (cmd_status)) + cmd_status = sys::wexitstatus (cmd_status); else cmd_status = 127; @@ -269,7 +269,7 @@ { return_output = args(1).is_true (); } - catch (octave::execution_exception& ee) + catch (execution_exception& ee) { error (ee, "system: RETURN_OUTPUT must be boolean value true or false"); } @@ -286,7 +286,7 @@ cmd_str = '"' + cmd_str + '"'; #endif - octave::unwind_action restore_mask + unwind_action restore_mask ([] (void *mask) { restore_signal_mask (mask); }, get_signal_mask ()); octave_unblock_async_signals (); @@ -298,15 +298,15 @@ retval = run_command_and_return_output (cmd_str); else { - int status = octave::sys::system (cmd_str); + int status = sys::system (cmd_str); // The value in status is as returned by waitpid. If // the process exited normally, extract the actual exit // status of the command. Otherwise, return 127 as a // failure code. - if (octave::sys::wifexited (status)) - status = octave::sys::wexitstatus (status); + if (sys::wifexited (status)) + status = sys::wexitstatus (status); retval(0) = status; } @@ -362,7 +362,7 @@ if (! initialized) { std::map<std::string, octave_value> conf_info_map - = {{ "DEFAULT_PAGER", octave::config::default_pager () }, + = {{ "DEFAULT_PAGER", config::default_pager () }, #if defined (OCTAVE_ENABLE_64) { "ENABLE_64", true }, @@ -395,180 +395,180 @@ #endif { "api_version", OCTAVE_API_VERSION }, - { "archlibdir", octave::config::arch_lib_dir () }, - { "bindir", octave::config::bin_dir () }, - { "canonical_host_type", octave::config::canonical_host_type () }, - { "datadir", octave::config::data_dir () }, - { "datarootdir", octave::config::dataroot_dir () }, - { "fcnfiledir", octave::config::fcn_file_dir () }, - { "fftw_version", octave::fftw_version () }, - { "fftwf_version", octave::fftwf_version () }, - { "imagedir", octave::config::image_dir () }, - { "includedir", octave::config::include_dir () }, - { "infodir", octave::config::info_dir () }, - { "libdir", octave::config::lib_dir () }, - { "libexecdir", octave::config::libexec_dir () }, + { "archlibdir", config::arch_lib_dir () }, + { "bindir", config::bin_dir () }, + { "canonical_host_type", config::canonical_host_type () }, + { "datadir", config::data_dir () }, + { "datarootdir", config::dataroot_dir () }, + { "fcnfiledir", config::fcn_file_dir () }, + { "fftw_version", fftw_version () }, + { "fftwf_version", fftwf_version () }, + { "imagedir", config::image_dir () }, + { "includedir", config::include_dir () }, + { "infodir", config::info_dir () }, + { "libdir", config::lib_dir () }, + { "libexecdir", config::libexec_dir () }, // Each library and executable has its own definition of the hg // id. We check for consistency when Octave starts so we just // store and report one of them here. { "hg_id", liboctinterp_hg_id () }, - { "localapiarchlibdir", octave::config::local_api_arch_lib_dir () }, - { "localapifcnfiledir", octave::config::local_api_fcn_file_dir () }, - { "localapioctfiledir", octave::config::local_api_oct_file_dir () }, - { "localarchlibdir", octave::config::local_arch_lib_dir () }, - { "localfcnfiledir", octave::config::local_fcn_file_dir () }, - { "localoctfiledir", octave::config::local_oct_file_dir () }, - { "localstartupfiledir", octave::config::local_startupfile_dir () }, - { "localverarchlibdir", octave::config::local_ver_arch_lib_dir () }, - { "localverfcnfiledir", octave::config::local_ver_fcn_file_dir () }, - { "localveroctfiledir", octave::config::local_ver_oct_file_dir () }, + { "localapiarchlibdir", config::local_api_arch_lib_dir () }, + { "localapifcnfiledir", config::local_api_fcn_file_dir () }, + { "localapioctfiledir", config::local_api_oct_file_dir () }, + { "localarchlibdir", config::local_arch_lib_dir () }, + { "localfcnfiledir", config::local_fcn_file_dir () }, + { "localoctfiledir", config::local_oct_file_dir () }, + { "localstartupfiledir", config::local_startupfile_dir () }, + { "localverarchlibdir", config::local_ver_arch_lib_dir () }, + { "localverfcnfiledir", config::local_ver_fcn_file_dir () }, + { "localveroctfiledir", config::local_ver_oct_file_dir () }, { "major_version", STRINGIFY (OCTAVE_MAJOR_VERSION) }, - { "man1dir", octave::config::man1_dir () }, - { "man1ext", octave::config::man1_ext () }, - { "mandir", octave::config::man_dir () }, + { "man1dir", config::man1_dir () }, + { "man1ext", config::man1_ext () }, + { "mandir", config::man_dir () }, { "minor_version", STRINGIFY (OCTAVE_MINOR_VERSION) }, - { "octdatadir", octave::config::oct_data_dir () }, - { "octdocdir", octave::config::oct_doc_dir () }, - { "octetcdir", octave::config::oct_etc_dir () }, - { "octfiledir", octave::config::oct_file_dir () }, - { "octfontsdir", octave::config::oct_fonts_dir () }, - { "octincludedir", octave::config::oct_include_dir () }, - { "octlibdir", octave::config::oct_lib_dir () }, - { "octtestsdir", octave::config::oct_tests_dir () }, + { "octdatadir", config::oct_data_dir () }, + { "octdocdir", config::oct_doc_dir () }, + { "octetcdir", config::oct_etc_dir () }, + { "octfiledir", config::oct_file_dir () }, + { "octfontsdir", config::oct_fonts_dir () }, + { "octincludedir", config::oct_include_dir () }, + { "octlibdir", config::oct_lib_dir () }, + { "octtestsdir", config::oct_tests_dir () }, { "patch_version", STRINGIFY (OCTAVE_PATCH_VERSION) }, { "release_date", OCTAVE_RELEASE_DATE }, - { "startupfiledir", octave::config::startupfile_dir () }, + { "startupfiledir", config::startupfile_dir () }, { "version", OCTAVE_VERSION }}; std::map<std::string, octave_value> build_env_map - = {{ "AMD_CPPFLAGS", octave::build_env::AMD_CPPFLAGS }, - { "AMD_LDFLAGS", octave::build_env::AMD_LDFLAGS }, - { "AMD_LIBS", octave::build_env::AMD_LIBS }, - { "AR", octave::build_env::AR }, - { "ARFLAGS", octave::build_env::ARFLAGS }, - { "ARPACK_CPPFLAGS", octave::build_env::ARPACK_CPPFLAGS }, - { "ARPACK_LDFLAGS", octave::build_env::ARPACK_LDFLAGS }, - { "ARPACK_LIBS", octave::build_env::ARPACK_LIBS }, - { "BLAS_LIBS", octave::build_env::BLAS_LIBS }, - { "CAMD_CPPFLAGS", octave::build_env::CAMD_CPPFLAGS }, - { "CAMD_LDFLAGS", octave::build_env::CAMD_LDFLAGS }, - { "CAMD_LIBS", octave::build_env::CAMD_LIBS }, - { "CARBON_LIBS", octave::build_env::CARBON_LIBS }, - { "CC", octave::build_env::CC }, - { "CCOLAMD_CPPFLAGS", octave::build_env::CCOLAMD_CPPFLAGS }, - { "CCOLAMD_LDFLAGS", octave::build_env::CCOLAMD_LDFLAGS }, - { "CCOLAMD_LIBS", octave::build_env::CCOLAMD_LIBS }, - { "CFLAGS", octave::build_env::CFLAGS }, - { "CHOLMOD_CPPFLAGS", octave::build_env::CHOLMOD_CPPFLAGS }, - { "CHOLMOD_LDFLAGS", octave::build_env::CHOLMOD_LDFLAGS }, - { "CHOLMOD_LIBS", octave::build_env::CHOLMOD_LIBS }, - { "COLAMD_CPPFLAGS", octave::build_env::COLAMD_CPPFLAGS }, - { "COLAMD_LDFLAGS", octave::build_env::COLAMD_LDFLAGS }, - { "COLAMD_LIBS", octave::build_env::COLAMD_LIBS }, - { "CPICFLAG", octave::build_env::CPICFLAG }, - { "CPPFLAGS", octave::build_env::CPPFLAGS }, - { "CURL_CPPFLAGS", octave::build_env::CURL_CPPFLAGS }, - { "CURL_LDFLAGS", octave::build_env::CURL_LDFLAGS }, - { "CURL_LIBS", octave::build_env::CURL_LIBS }, - { "CXSPARSE_CPPFLAGS", octave::build_env::CXSPARSE_CPPFLAGS }, - { "CXSPARSE_LDFLAGS", octave::build_env::CXSPARSE_LDFLAGS }, - { "CXSPARSE_LIBS", octave::build_env::CXSPARSE_LIBS }, - { "CXX", octave::build_env::CXX }, - { "CXXCPP", octave::build_env::CXXCPP }, - { "CXXFLAGS", octave::build_env::CXXFLAGS }, - { "CXXPICFLAG", octave::build_env::CXXPICFLAG }, - { "DEFS", octave::build_env::DEFS }, - { "DL_LDFLAGS", octave::build_env::DL_LDFLAGS }, - { "GCC_VERSION", octave::build_env::GCC_VERSION }, - { "GXX_VERSION", octave::build_env::GXX_VERSION }, - { "EXEEXT", octave::build_env::EXEEXT }, - { "F77", octave::build_env::F77 }, - { "F77_FLOAT_STORE_FLAG", octave::build_env::F77_FLOAT_STORE_FLAG }, - { "F77_INTEGER_8_FLAG", octave::build_env::F77_INTEGER_8_FLAG }, - { "FFLAGS", octave::build_env::FFLAGS }, - { "FFTW3_CPPFLAGS", octave::build_env::FFTW3_CPPFLAGS }, - { "FFTW3_LDFLAGS", octave::build_env::FFTW3_LDFLAGS }, - { "FFTW3_LIBS", octave::build_env::FFTW3_LIBS }, - { "FFTW3F_CPPFLAGS", octave::build_env::FFTW3F_CPPFLAGS }, - { "FFTW3F_LDFLAGS", octave::build_env::FFTW3F_LDFLAGS }, - { "FFTW3F_LIBS", octave::build_env::FFTW3F_LIBS }, - { "FLIBS", octave::build_env::FLIBS }, - { "FLTK_CPPFLAGS", octave::build_env::FLTK_CPPFLAGS }, - { "FLTK_LDFLAGS", octave::build_env::FLTK_LDFLAGS }, - { "FLTK_LIBS", octave::build_env::FLTK_LIBS }, - { "FONTCONFIG_CPPFLAGS", octave::build_env::FONTCONFIG_CPPFLAGS }, - { "FONTCONFIG_LIBS", octave::build_env::FONTCONFIG_LIBS }, - { "FPICFLAG", octave::build_env::FPICFLAG }, - { "FT2_CPPFLAGS", octave::build_env::FT2_CPPFLAGS }, - { "FT2_LIBS", octave::build_env::FT2_LIBS }, - { "GLPK_CPPFLAGS", octave::build_env::GLPK_CPPFLAGS }, - { "GLPK_LDFLAGS", octave::build_env::GLPK_LDFLAGS }, - { "GLPK_LIBS", octave::build_env::GLPK_LIBS }, - { "GNUPLOT", octave::build_env::GNUPLOT }, - { "HDF5_CPPFLAGS", octave::build_env::HDF5_CPPFLAGS }, - { "HDF5_LDFLAGS", octave::build_env::HDF5_LDFLAGS }, - { "HDF5_LIBS", octave::build_env::HDF5_LIBS }, - { "LAPACK_LIBS", octave::build_env::LAPACK_LIBS }, - { "LDFLAGS", octave::build_env::LDFLAGS }, - { "LD_STATIC_FLAG", octave::build_env::LD_STATIC_FLAG }, - { "LEX", octave::build_env::LEX }, - { "LEXLIB", octave::build_env::LEXLIB }, - { "LFLAGS", octave::build_env::LFLAGS }, - { "LIBOCTAVE", octave::build_env::LIBOCTAVE }, - { "LIBOCTINTERP", octave::build_env::LIBOCTINTERP }, - { "LIBS", octave::build_env::LIBS }, - { "LN_S", octave::build_env::LN_S }, - { "MAGICK_CPPFLAGS", octave::build_env::MAGICK_CPPFLAGS }, - { "MAGICK_LDFLAGS", octave::build_env::MAGICK_LDFLAGS }, - { "MAGICK_LIBS", octave::build_env::MAGICK_LIBS }, - { "MKOCTFILE_DL_LDFLAGS", octave::build_env::MKOCTFILE_DL_LDFLAGS }, - { "OCTAVE_LINK_DEPS", octave::build_env::OCTAVE_LINK_DEPS }, - { "OCTAVE_LINK_OPTS", octave::build_env::OCTAVE_LINK_OPTS }, - { "OCT_LINK_DEPS", octave::build_env::OCT_LINK_DEPS }, - { "OCT_LINK_OPTS", octave::build_env::OCT_LINK_OPTS }, - { "OPENGL_LIBS", octave::build_env::OPENGL_LIBS }, - { "PCRE_CPPFLAGS", octave::build_env::PCRE_CPPFLAGS }, - { "PCRE_LDFLAGS", octave::build_env::PCRE_LDFLAGS }, - { "PCRE_LIBS", octave::build_env::PCRE_LIBS }, - { "PTHREAD_CFLAGS", octave::build_env::PTHREAD_CFLAGS }, - { "PTHREAD_LIBS", octave::build_env::PTHREAD_LIBS }, - { "QHULL_CPPFLAGS", octave::build_env::QHULL_CPPFLAGS }, - { "QHULL_LDFLAGS", octave::build_env::QHULL_LDFLAGS }, - { "QHULL_LIBS", octave::build_env::QHULL_LIBS }, - { "QRUPDATE_CPPFLAGS", octave::build_env::QRUPDATE_CPPFLAGS }, - { "QRUPDATE_LDFLAGS", octave::build_env::QRUPDATE_LDFLAGS }, - { "QRUPDATE_LIBS", octave::build_env::QRUPDATE_LIBS }, - { "QT_CPPFLAGS", octave::build_env::QT_CPPFLAGS }, - { "QT_LDFLAGS", octave::build_env::QT_LDFLAGS }, - { "QT_LIBS", octave::build_env::QT_LIBS }, - { "QT_OPENGL_LIBS", octave::build_env::QT_OPENGL_LIBS }, - { "RANLIB", octave::build_env::RANLIB }, - { "RDYNAMIC_FLAG", octave::build_env::RDYNAMIC_FLAG }, - { "READLINE_LIBS", octave::build_env::READLINE_LIBS }, - { "SHARED_LIBS", octave::build_env::SHARED_LIBS }, - { "SH_LDFLAGS", octave::build_env::SH_LDFLAGS }, - { "STATIC_LIBS", octave::build_env::STATIC_LIBS }, - { "SUITESPARSECONFIG_LIBS", octave::build_env::SUITESPARSECONFIG_LIBS }, - { "TERM_LIBS", octave::build_env::TERM_LIBS }, - { "UMFPACK_CPPFLAGS", octave::build_env::UMFPACK_CPPFLAGS }, - { "UMFPACK_LDFLAGS", octave::build_env::UMFPACK_LDFLAGS }, - { "UMFPACK_LIBS", octave::build_env::UMFPACK_LIBS }, - { "WARN_CFLAGS", octave::build_env::WARN_CFLAGS }, - { "WARN_CXXFLAGS", octave::build_env::WARN_CXXFLAGS }, - { "X11_INCFLAGS", octave::build_env::X11_INCFLAGS }, - { "X11_LIBS", octave::build_env::X11_LIBS }, - { "XTRA_CFLAGS", octave::build_env::XTRA_CFLAGS }, - { "XTRA_CXXFLAGS", octave::build_env::XTRA_CXXFLAGS }, - { "YACC", octave::build_env::YACC }, - { "YFLAGS", octave::build_env::YFLAGS }, - { "Z_CPPFLAGS", octave::build_env::Z_CPPFLAGS }, - { "Z_LDFLAGS", octave::build_env::Z_LDFLAGS }, - { "Z_LIBS", octave::build_env::Z_LIBS }, - { "config_opts", octave::build_env::config_opts }}; + = {{ "AMD_CPPFLAGS", build_env::AMD_CPPFLAGS }, + { "AMD_LDFLAGS", build_env::AMD_LDFLAGS }, + { "AMD_LIBS", build_env::AMD_LIBS }, + { "AR", build_env::AR }, + { "ARFLAGS", build_env::ARFLAGS }, + { "ARPACK_CPPFLAGS", build_env::ARPACK_CPPFLAGS }, + { "ARPACK_LDFLAGS", build_env::ARPACK_LDFLAGS }, + { "ARPACK_LIBS", build_env::ARPACK_LIBS }, + { "BLAS_LIBS", build_env::BLAS_LIBS }, + { "CAMD_CPPFLAGS", build_env::CAMD_CPPFLAGS }, + { "CAMD_LDFLAGS", build_env::CAMD_LDFLAGS }, + { "CAMD_LIBS", build_env::CAMD_LIBS }, + { "CARBON_LIBS", build_env::CARBON_LIBS }, + { "CC", build_env::CC }, + { "CCOLAMD_CPPFLAGS", build_env::CCOLAMD_CPPFLAGS }, + { "CCOLAMD_LDFLAGS", build_env::CCOLAMD_LDFLAGS }, + { "CCOLAMD_LIBS", build_env::CCOLAMD_LIBS }, + { "CFLAGS", build_env::CFLAGS }, + { "CHOLMOD_CPPFLAGS", build_env::CHOLMOD_CPPFLAGS }, + { "CHOLMOD_LDFLAGS", build_env::CHOLMOD_LDFLAGS }, + { "CHOLMOD_LIBS", build_env::CHOLMOD_LIBS }, + { "COLAMD_CPPFLAGS", build_env::COLAMD_CPPFLAGS }, + { "COLAMD_LDFLAGS", build_env::COLAMD_LDFLAGS }, + { "COLAMD_LIBS", build_env::COLAMD_LIBS }, + { "CPICFLAG", build_env::CPICFLAG }, + { "CPPFLAGS", build_env::CPPFLAGS }, + { "CURL_CPPFLAGS", build_env::CURL_CPPFLAGS }, + { "CURL_LDFLAGS", build_env::CURL_LDFLAGS }, + { "CURL_LIBS", build_env::CURL_LIBS }, + { "CXSPARSE_CPPFLAGS", build_env::CXSPARSE_CPPFLAGS }, + { "CXSPARSE_LDFLAGS", build_env::CXSPARSE_LDFLAGS }, + { "CXSPARSE_LIBS", build_env::CXSPARSE_LIBS }, + { "CXX", build_env::CXX }, + { "CXXCPP", build_env::CXXCPP }, + { "CXXFLAGS", build_env::CXXFLAGS }, + { "CXXPICFLAG", build_env::CXXPICFLAG }, + { "DEFS", build_env::DEFS }, + { "DL_LDFLAGS", build_env::DL_LDFLAGS }, + { "GCC_VERSION", build_env::GCC_VERSION }, + { "GXX_VERSION", build_env::GXX_VERSION }, + { "EXEEXT", build_env::EXEEXT }, + { "F77", build_env::F77 }, + { "F77_FLOAT_STORE_FLAG", build_env::F77_FLOAT_STORE_FLAG }, + { "F77_INTEGER_8_FLAG", build_env::F77_INTEGER_8_FLAG }, + { "FFLAGS", build_env::FFLAGS }, + { "FFTW3_CPPFLAGS", build_env::FFTW3_CPPFLAGS }, + { "FFTW3_LDFLAGS", build_env::FFTW3_LDFLAGS }, + { "FFTW3_LIBS", build_env::FFTW3_LIBS }, + { "FFTW3F_CPPFLAGS", build_env::FFTW3F_CPPFLAGS }, + { "FFTW3F_LDFLAGS", build_env::FFTW3F_LDFLAGS }, + { "FFTW3F_LIBS", build_env::FFTW3F_LIBS }, + { "FLIBS", build_env::FLIBS }, + { "FLTK_CPPFLAGS", build_env::FLTK_CPPFLAGS }, + { "FLTK_LDFLAGS", build_env::FLTK_LDFLAGS }, + { "FLTK_LIBS", build_env::FLTK_LIBS }, + { "FONTCONFIG_CPPFLAGS", build_env::FONTCONFIG_CPPFLAGS }, + { "FONTCONFIG_LIBS", build_env::FONTCONFIG_LIBS }, + { "FPICFLAG", build_env::FPICFLAG }, + { "FT2_CPPFLAGS", build_env::FT2_CPPFLAGS }, + { "FT2_LIBS", build_env::FT2_LIBS }, + { "GLPK_CPPFLAGS", build_env::GLPK_CPPFLAGS }, + { "GLPK_LDFLAGS", build_env::GLPK_LDFLAGS }, + { "GLPK_LIBS", build_env::GLPK_LIBS }, + { "GNUPLOT", build_env::GNUPLOT }, + { "HDF5_CPPFLAGS", build_env::HDF5_CPPFLAGS }, + { "HDF5_LDFLAGS", build_env::HDF5_LDFLAGS }, + { "HDF5_LIBS", build_env::HDF5_LIBS }, + { "LAPACK_LIBS", build_env::LAPACK_LIBS }, + { "LDFLAGS", build_env::LDFLAGS }, + { "LD_STATIC_FLAG", build_env::LD_STATIC_FLAG }, + { "LEX", build_env::LEX }, + { "LEXLIB", build_env::LEXLIB }, + { "LFLAGS", build_env::LFLAGS }, + { "LIBOCTAVE", build_env::LIBOCTAVE }, + { "LIBOCTINTERP", build_env::LIBOCTINTERP }, + { "LIBS", build_env::LIBS }, + { "LN_S", build_env::LN_S }, + { "MAGICK_CPPFLAGS", build_env::MAGICK_CPPFLAGS }, + { "MAGICK_LDFLAGS", build_env::MAGICK_LDFLAGS }, + { "MAGICK_LIBS", build_env::MAGICK_LIBS }, + { "MKOCTFILE_DL_LDFLAGS", build_env::MKOCTFILE_DL_LDFLAGS }, + { "OCTAVE_LINK_DEPS", build_env::OCTAVE_LINK_DEPS }, + { "OCTAVE_LINK_OPTS", build_env::OCTAVE_LINK_OPTS }, + { "OCT_LINK_DEPS", build_env::OCT_LINK_DEPS }, + { "OCT_LINK_OPTS", build_env::OCT_LINK_OPTS }, + { "OPENGL_LIBS", build_env::OPENGL_LIBS }, + { "PCRE_CPPFLAGS", build_env::PCRE_CPPFLAGS }, + { "PCRE_LDFLAGS", build_env::PCRE_LDFLAGS }, + { "PCRE_LIBS", build_env::PCRE_LIBS }, + { "PTHREAD_CFLAGS", build_env::PTHREAD_CFLAGS }, + { "PTHREAD_LIBS", build_env::PTHREAD_LIBS }, + { "QHULL_CPPFLAGS", build_env::QHULL_CPPFLAGS }, + { "QHULL_LDFLAGS", build_env::QHULL_LDFLAGS }, + { "QHULL_LIBS", build_env::QHULL_LIBS }, + { "QRUPDATE_CPPFLAGS", build_env::QRUPDATE_CPPFLAGS }, + { "QRUPDATE_LDFLAGS", build_env::QRUPDATE_LDFLAGS }, + { "QRUPDATE_LIBS", build_env::QRUPDATE_LIBS }, + { "QT_CPPFLAGS", build_env::QT_CPPFLAGS }, + { "QT_LDFLAGS", build_env::QT_LDFLAGS }, + { "QT_LIBS", build_env::QT_LIBS }, + { "QT_OPENGL_LIBS", build_env::QT_OPENGL_LIBS }, + { "RANLIB", build_env::RANLIB }, + { "RDYNAMIC_FLAG", build_env::RDYNAMIC_FLAG }, + { "READLINE_LIBS", build_env::READLINE_LIBS }, + { "SHARED_LIBS", build_env::SHARED_LIBS }, + { "SH_LDFLAGS", build_env::SH_LDFLAGS }, + { "STATIC_LIBS", build_env::STATIC_LIBS }, + { "SUITESPARSECONFIG_LIBS", build_env::SUITESPARSECONFIG_LIBS }, + { "TERM_LIBS", build_env::TERM_LIBS }, + { "UMFPACK_CPPFLAGS", build_env::UMFPACK_CPPFLAGS }, + { "UMFPACK_LDFLAGS", build_env::UMFPACK_LDFLAGS }, + { "UMFPACK_LIBS", build_env::UMFPACK_LIBS }, + { "WARN_CFLAGS", build_env::WARN_CFLAGS }, + { "WARN_CXXFLAGS", build_env::WARN_CXXFLAGS }, + { "X11_INCFLAGS", build_env::X11_INCFLAGS }, + { "X11_LIBS", build_env::X11_LIBS }, + { "XTRA_CFLAGS", build_env::XTRA_CFLAGS }, + { "XTRA_CXXFLAGS", build_env::XTRA_CXXFLAGS }, + { "YACC", build_env::YACC }, + { "YFLAGS", build_env::YFLAGS }, + { "Z_CPPFLAGS", build_env::Z_CPPFLAGS }, + { "Z_LDFLAGS", build_env::Z_LDFLAGS }, + { "Z_LIBS", build_env::Z_LIBS }, + { "config_opts", build_env::config_opts }}; config = octave_scalar_map (conf_info_map); build_env = octave_scalar_map (build_env_map); - build_features = octave::build_env::features (); + build_features = build_env::features (); bool unix_system = true; bool mac_system = false; @@ -589,15 +589,15 @@ config.assign ("mac", octave_value (mac_system)); config.assign ("windows", octave_value (windows_system)); - octave::mach_info::float_format ff = octave::mach_info::native_float_format (); + mach_info::float_format ff = mach_info::native_float_format (); config.assign ("float_format", - octave_value (octave::mach_info::float_format_as_string (ff))); + octave_value (mach_info::float_format_as_string (ff))); config.assign ("words_big_endian", - octave_value (octave::mach_info::words_big_endian ())); + octave_value (mach_info::words_big_endian ())); config.assign ("words_little_endian", - octave_value (octave::mach_info::words_little_endian ())); + octave_value (mach_info::words_little_endian ())); config.assign ("build_environment", octave_value (build_env));
--- a/libinterp/corefcn/tril.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/tril.cc Sat Aug 14 22:48:52 2021 -0400 @@ -288,7 +288,7 @@ octave_value_list ov_idx; std::list<octave_value_list> idx_tmp; ov_idx(1) = static_cast<double> (nc+1); - ov_idx(0) = octave::range<double> (1, nr); + ov_idx(0) = range<double> (1, nr); idx_tmp.push_back (ov_idx); ov_idx(1) = static_cast<double> (nc); tmp = tmp.resize (dim_vector (0,0)); @@ -305,7 +305,7 @@ { octave_idx_type nr_limit = std::max (one, j - k); ov_idx(1) = static_cast<double> (j); - ov_idx(0) = octave::range<double> (nr_limit, nr); + ov_idx(0) = range<double> (nr_limit, nr); std::list<octave_value_list> idx; idx.push_back (ov_idx); @@ -320,7 +320,7 @@ { octave_idx_type nr_limit = std::min (nr, j - k); ov_idx(1) = static_cast<double> (j); - ov_idx(0) = octave::range<double> (1, nr_limit); + ov_idx(0) = range<double> (1, nr_limit); std::list<octave_value_list> idx; idx.push_back (ov_idx);
--- a/libinterp/corefcn/typecast.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/typecast.cc Sat Aug 14 22:48:52 2021 -0400 @@ -57,7 +57,7 @@ const void *& data, octave_idx_type& byte_size, dim_vector& old_dims, - octave::unwind_protect& frame) + unwind_protect& frame) { // The array given may be a temporary, constructed from a scalar or sparse // array. This will ensure the data will be deallocated after we exit. @@ -166,7 +166,7 @@ octave_value retval; - octave::unwind_protect frame; + unwind_protect frame; const void *data = nullptr; octave_idx_type byte_size = 0;
--- a/libinterp/corefcn/urlwrite.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/urlwrite.cc Sat Aug 14 22:48:52 2021 -0400 @@ -136,18 +136,18 @@ // create it, and the download fails. We use unwind_protect to do // it so that the deletion happens no matter how we exit the function. - octave::sys::file_stat fs (filename); + sys::file_stat fs (filename); std::ofstream ofile = - octave::sys::ofstream (filename.c_str (), std::ios::out | std::ios::binary); + sys::ofstream (filename.c_str (), std::ios::out | std::ios::binary); if (! ofile.is_open ()) error ("urlwrite: unable to open file"); - int(*unlink_fptr)(const std::string&) = octave::sys::unlink; - octave::unwind_action_safe unlink_action (unlink_fptr, filename); + int(*unlink_fptr)(const std::string&) = sys::unlink; + unwind_action_safe unlink_action (unlink_fptr, filename); - octave::url_transfer url_xfer (url, ofile); + url_transfer url_xfer (url, ofile); octave_value_list retval; @@ -164,7 +164,7 @@ if (nargout > 0) { if (url_xfer.good ()) - retval = ovl (octave::sys::env::make_absolute (filename), true, ""); + retval = ovl (sys::env::make_absolute (filename), true, ""); else retval = ovl ("", false, url_xfer.lasterror ()); } @@ -245,7 +245,7 @@ std::ostringstream buf; - octave::url_transfer url_xfer = octave::url_transfer (url, buf); + url_transfer url_xfer = url_transfer (url, buf); if (! url_xfer.is_valid ()) error ("support for URL transfers was disabled when Octave was built"); @@ -282,7 +282,7 @@ std::ostringstream content; - octave::url_transfer url_xfer (url, content); + url_transfer url_xfer (url, content); if (! url_xfer.is_valid ()) error ("support for URL transfers was disabled when Octave was built"); @@ -291,10 +291,10 @@ std::string data, method; - struct octave::weboptions options; + struct weboptions options; - octave::cdef_object object = args (nargin - 1).classdef_object_value () - -> get_object (); + cdef_object object + = args (nargin - 1).classdef_object_value () -> get_object (); // We could've used object.map_value () instead to return a map but that // shows a warning about about overriding access restrictions.
--- a/libinterp/corefcn/utils.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/utils.cc Sat Aug 14 22:48:52 2021 -0400 @@ -110,8 +110,8 @@ { std::string varname = args(0).string_value (); - retval = (octave::valid_identifier (varname) - && ! octave::iskeyword (varname)); + retval = (valid_identifier (varname) + && ! iskeyword (varname)); } return retval; @@ -241,8 +241,8 @@ { m_prefix = args(i + 1).xstring_value ("makeValidName: " "'Prefix' value must be a string"); - if (! octave::valid_identifier (m_prefix) - || octave::iskeyword (m_prefix)) + if (! valid_identifier (m_prefix) + || iskeyword (m_prefix)) error ("makeValidName: invalid 'Prefix' value '%s'", m_prefix.c_str ()); } @@ -268,12 +268,12 @@ if (nargin < 1) print_usage (); - octave::make_valid_name_options options (args.slice (1, nargin - 1)); + make_valid_name_options options (args.slice (1, nargin - 1)); if (args(0).is_string ()) { std::string varname = args(0).string_value (); - bool is_modified = octave::make_valid_name (varname, options); + bool is_modified = make_valid_name (varname, options); return ovl (varname, is_modified); } else if (args(0).iscellstr ()) @@ -281,7 +281,7 @@ Array<std::string> varnames = args(0).cellstr_value (); Array<bool> is_modified (varnames.dims ()); for (auto i = 0; i < varnames.numel (); i++) - is_modified(i) = octave::make_valid_name (varnames(i), options); + is_modified(i) = make_valid_name (varnames(i), options); return ovl (varnames, is_modified); } else @@ -335,7 +335,7 @@ std::string file1 = args(0).string_value (); std::string file2 = args(1).string_value (); - retval = octave::same_file (file1, file2); + retval = same_file (file1, file2); } else if ((s1_string && s2_cellstr) || (s1_cellstr && s2_string)) { @@ -358,7 +358,7 @@ boolNDArray output (cellstr.dims (), false); for (octave_idx_type idx = 0; idx < cellstr.numel (); idx++) - output(idx) = octave::same_file (str, cellstr(idx)); + output(idx) = same_file (str, cellstr(idx)); retval = output; } @@ -376,7 +376,7 @@ boolNDArray output (size1, false); for (octave_idx_type idx = 0; idx < cellstr1.numel (); idx++) - output(idx) = octave::same_file (cellstr1(idx), cellstr2(idx)); + output(idx) = same_file (cellstr1(idx), cellstr2(idx)); retval = output; } @@ -578,10 +578,10 @@ if (names.empty ()) error ("file_in_loadpath: FILE argument must not be empty"); - octave::load_path& lp = interp.get_load_path (); + load_path& lp = interp.get_load_path (); if (nargin == 1) - return ovl (octave::sys::env::make_absolute (lp.find_first_of (names))); + return ovl (sys::env::make_absolute (lp.find_first_of (names))); else { std::string opt = args(1).xstring_value ("file_in_loadpath: optional second argument must be a string"); @@ -589,7 +589,7 @@ if (opt != "all") error (R"(file_in_loadpath: "all" is only valid second argument)"); - return ovl (Cell (octave::make_absolute (lp.find_all_first_of (names)))); + return ovl (Cell (make_absolute (lp.find_all_first_of (names)))); } } @@ -652,7 +652,7 @@ error ("file_in_path: FILE argument must not be empty"); if (nargin == 2) - return ovl (octave::search_path_for_file (path, names)); + return ovl (search_path_for_file (path, names)); else { std::string opt = args(2).xstring_value ("file_in_path: optional third argument must be a string"); @@ -660,7 +660,7 @@ if (opt != "all") error (R"(file_in_path: "all" is only valid third argument)"); - return ovl (Cell (octave::make_absolute (octave::search_path_for_all_files (path, names)))); + return ovl (Cell (make_absolute (search_path_for_all_files (path, names)))); } } @@ -940,7 +940,7 @@ std::string str = args(0).xstring_value ("do_string_escapes: STRING argument must be of type string"); - return ovl (octave::do_string_escapes (str)); + return ovl (do_string_escapes (str)); } /* @@ -1073,7 +1073,7 @@ std::string str = args(0).xstring_value ("undo_string_escapes: S argument must be a string"); - return ovl (octave::undo_string_escapes (str)); + return ovl (undo_string_escapes (str)); } /* @@ -1109,7 +1109,7 @@ print_usage (); return ovl (args(0).is_string () - && octave::sys::env::absolute_pathname (args(0).string_value ())); + && sys::env::absolute_pathname (args(0).string_value ())); } /* @@ -1130,7 +1130,7 @@ print_usage (); return ovl (args(0).is_string () - && octave::sys::env::rooted_relative_pathname (args(0).string_value ())); + && sys::env::rooted_relative_pathname (args(0).string_value ())); } /* @@ -1156,7 +1156,7 @@ std::string nm = args(0).xstring_value ("make_absolute_filename: FILE argument must be a filename"); - return ovl (octave::sys::env::make_absolute (nm)); + return ovl (sys::env::make_absolute (nm)); } /* @@ -1198,7 +1198,7 @@ dir = args(0).xstring_value ("dir_in_loadpath: DIR must be a directory name"); - octave::load_path& lp = interp.get_load_path (); + load_path& lp = interp.get_load_path (); if (nargin == 1) return ovl (lp.find_dir (dir)); @@ -1657,14 +1657,14 @@ try { - octave::idx_vector idx = args(0).index_vector (true); + idx_vector idx = args(0).index_vector (true); if (nargin == 2) retval = idx.extent (n) <= n; else retval = true; } - catch (const octave::execution_exception&) + catch (const execution_exception&) { interp.recover_from_exception ();
--- a/libinterp/corefcn/variables.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/corefcn/variables.cc Sat Aug 14 22:48:52 2021 -0400 @@ -199,10 +199,10 @@ */ static int -symbol_exist (octave::interpreter& interp, const std::string& name, +symbol_exist (interpreter& interp, const std::string& name, const std::string& type = "any") { - if (octave::iskeyword (name)) + if (iskeyword (name)) return 0; bool search_any = type == "any"; @@ -216,7 +216,7 @@ || search_builtin || search_class)) error (R"(exist: unrecognized type argument "%s")", type.c_str ()); - octave::symbol_table& symtab = interp.get_symbol_table (); + symbol_table& symtab = interp.get_symbol_table (); if (search_any || search_var) { @@ -259,7 +259,7 @@ if (search_any || search_file) { - octave::load_path& lp = interp.get_load_path (); + load_path& lp = interp.get_load_path (); // Class constructor. file_name = lp.find_method (xname, xname); @@ -290,7 +290,7 @@ if (! have_fcn_ext && file_name.empty ()) { - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); file_name = tw.lookup_autoload (name); } @@ -315,16 +315,16 @@ } } - file_name = octave::file_in_path (name, ""); + file_name = file_in_path (name, ""); if (file_name.empty ()) file_name = name; // "stat" doesn't work on UNC shares and drive letters. - if ((search_any || search_file) && octave::drive_or_unc_share (file_name)) + if ((search_any || search_file) && drive_or_unc_share (file_name)) return 7; - octave::sys::file_stat fs (file_name); + sys::file_stat fs (file_name); if (fs) { @@ -989,7 +989,7 @@ { if (have_regexp) { - if (octave::regexp::is_match (patstr, nm)) + if (regexp::is_match (patstr, nm)) { retval = true; break; @@ -1019,7 +1019,7 @@ } static void -do_clear_functions (octave::interpreter& interp, +do_clear_functions (interpreter& interp, const string_vector& argv, int argc, int idx, bool exclusive = false) { @@ -1046,7 +1046,7 @@ } static void -do_clear_globals (octave::interpreter& interp, +do_clear_globals (interpreter& interp, const string_vector& argv, int argc, int idx, bool exclusive = false) { @@ -1089,7 +1089,7 @@ } static void -do_clear_variables (octave::interpreter& interp, +do_clear_variables (interpreter& interp, const string_vector& argv, int argc, int idx, bool exclusive = false, bool have_regexp = false) { @@ -1121,7 +1121,7 @@ } static void -do_clear_symbols (octave::interpreter& interp, +do_clear_symbols (interpreter& interp, const string_vector& argv, int argc, int idx, bool exclusive = false) { @@ -1150,7 +1150,7 @@ } static void -do_matlab_compatible_clear (octave::interpreter& interp, +do_matlab_compatible_clear (interpreter& interp, const string_vector& argv, int argc, int idx) { // This is supposed to be mostly Matlab compatible. @@ -1288,7 +1288,7 @@ { do_clear_variables (interp, argv, argc, true); - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); evmgr.clear_workspace (); } @@ -1534,9 +1534,9 @@ // We need this kluge to implement inputname in a .m file. if (name == ".argn.") { - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); - return tw.get_auto_fcn_var (octave::stack_frame::ARG_NAMES); + return tw.get_auto_fcn_var (stack_frame::ARG_NAMES); } return interp.varval (name);
--- a/libinterp/dldfcn/__delaunayn__.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/dldfcn/__delaunayn__.cc Sat Aug 14 22:48:52 2021 -0400 @@ -173,7 +173,7 @@ if (! errfile) error ("__delaunayn__: unable to redirect Qhull errors to /dev/null"); - octave::unwind_action close_errfile ([=] () { std::fclose (errfile); }); + unwind_action close_errfile ([=] () { std::fclose (errfile); }); qhT context = { }; qhT *qh = &context; @@ -181,7 +181,7 @@ int exitcode = qh_new_qhull (qh, dim, n, pt_array, ismalloc, &cmd[0], outfile, errfile); - octave::unwind_action free_memory ([qh] () { free_qhull_memory (qh); }); + unwind_action free_memory ([qh] () { free_qhull_memory (qh); }); if (exitcode) error ("__delaunayn__: qhull failed");
--- a/libinterp/dldfcn/__fltk_uigetfile__.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/dldfcn/__fltk_uigetfile__.cc Sat Aug 14 22:48:52 2021 -0400 @@ -136,10 +136,10 @@ } if (multi_type == Fl_File_Chooser::DIRECTORY) - retval(0) = octave::sys::file_ops::native_separator_path (std::string (fc.value ())); + retval(0) = sys::file_ops::native_separator_path (std::string (fc.value ())); else { - retval(1) = octave::sys::file_ops::native_separator_path (std::string (fc.directory ()) + sep); + retval(1) = sys::file_ops::native_separator_path (std::string (fc.directory ()) + sep); retval(2) = fc.filter_value () + 1; } }
--- a/libinterp/dldfcn/__glpk__.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/dldfcn/__glpk__.cc Sat Aug 14 22:48:52 2021 -0400 @@ -429,10 +429,10 @@ Array<int> freeLB (dim_vector (mrowsc, 1)); for (int i = 0; i < mrowsc; i++) { - if (octave::math::isinf (lb[i])) + if (math::isinf (lb[i])) { freeLB(i) = 1; - lb[i] = -octave::numeric_limits<double>::Inf (); + lb[i] = -numeric_limits<double>::Inf (); } else freeLB(i) = 0; @@ -450,10 +450,10 @@ Array<int> freeUB (dim_vector (mrowsc, 1)); for (int i = 0; i < mrowsc; i++) { - if (octave::math::isinf (ub[i])) + if (math::isinf (ub[i])) { freeUB(i) = 1; - ub[i] = octave::numeric_limits<double>::Inf (); + ub[i] = numeric_limits<double>::Inf (); } else freeUB(i) = 0;
--- a/libinterp/dldfcn/__init_gnuplot__.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/dldfcn/__init_gnuplot__.cc Sat Aug 14 22:48:52 2021 -0400 @@ -258,9 +258,9 @@ error ("__init_gnuplot__: the gnuplot program is not available, see 'gnuplot_binary'"); else if (! interp.mislocked ("__init_gnuplot__")) { - octave::gtk_manager& gtk_mgr = interp.get_gtk_manager (); + gtk_manager& gtk_mgr = interp.get_gtk_manager (); - octave::graphics_toolkit tk (new gnuplot_graphics_toolkit (interp)); + graphics_toolkit tk (new gnuplot_graphics_toolkit (interp)); gtk_mgr.load_toolkit (tk); interp.mlock ();
--- a/libinterp/dldfcn/__ode15__.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/dldfcn/__ode15__.cc Sat Aug 14 22:48:52 2021 -0400 @@ -1304,8 +1304,7 @@ if (num_event_args != 2 && num_event_args != 3) error ("__ode15__: number of input arguments in event callback must be 2 or 3"); - return octave::do_ode15 (ida_fcn, tspan, numt, t0, y0, yp0, options, - num_event_args); + return do_ode15 (ida_fcn, tspan, numt, t0, y0, yp0, options, num_event_args); #else
--- a/libinterp/dldfcn/__voronoi__.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/dldfcn/__voronoi__.cc Sat Aug 14 22:48:52 2021 -0400 @@ -166,7 +166,7 @@ int exitcode = qh_new_qhull (qh, dim, num_points, points.fortran_vec (), ismalloc, &cmd[0], outfile, errfile); - octave::unwind_action free_memory ([qh] () { free_qhull_memory (qh); }); + unwind_action free_memory ([qh] () { free_qhull_memory (qh); }); if (exitcode) error ("%s: qhull failed", caller.c_str ()); @@ -250,7 +250,7 @@ Matrix F (num_voronoi_vertices+1, dim); for (octave_idx_type d = 0; d < dim; d++) - F(0,d) = octave::numeric_limits<double>::Inf (); + F(0,d) = numeric_limits<double>::Inf (); // The cell array of vectors of indices into F that represent the // vertices of the Voronoi regions (cells).
--- a/libinterp/dldfcn/audiodevinfo.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/dldfcn/audiodevinfo.cc Sat Aug 14 22:48:52 2021 -0400 @@ -599,8 +599,8 @@ error ("audioplayer callback function called without player"); octave_value_list retval - = octave::feval (player->octave_callback_function, - ovl (static_cast<double> (frames)), 1); + = feval (player->octave_callback_function, + ovl (static_cast<double> (frames)), 1); if (retval.length () < 2) error ("audioplayer callback function failed"); @@ -657,7 +657,7 @@ { static double scale_factor = std::pow (2.0, 23) - 1.0; - static int big_endian = octave::mach_info::words_big_endian (); + static int big_endian = mach_info::words_big_endian (); uint8_t *buffer = static_cast<uint8_t *> (output); @@ -767,7 +767,7 @@ { static double scale_factor = std::pow (2.0, 23) - 1.0; - static int big_endian = octave::mach_info::words_big_endian (); + static int big_endian = mach_info::words_big_endian (); uint8_t *buffer = static_cast<uint8_t *> (output); @@ -1154,7 +1154,7 @@ start = get_sample_number (); end = get_end_sample (); - octave::unwind_action stop_audioplayer ([=] () { stop (); }); + unwind_action stop_audioplayer ([=] () { stop (); }); for (unsigned int i = start; i < end; i += buffer_size) { @@ -1436,7 +1436,7 @@ } octave_value_list retval - = octave::feval (recorder->octave_callback_function, ovl (sound), 1); + = feval (recorder->octave_callback_function, ovl (sound), 1); return retval(0).int_value (); } @@ -1826,7 +1826,7 @@ unsigned int frames = seconds * get_fs (); - octave::unwind_action stop_audiorecorder ([=] () { stop (); }); + unwind_action stop_audiorecorder ([=] () { stop (); }); for (unsigned int i = 0; i < frames; i += buffer_size) { @@ -1960,7 +1960,7 @@ #if defined (HAVE_PORTAUDIO) static audiorecorder * -get_recorder (octave::interpreter& interp, const octave_value& ov) +get_recorder (interpreter& interp, const octave_value& ov) { interp.mlock (); @@ -2407,7 +2407,7 @@ #if defined (HAVE_PORTAUDIO) static audioplayer * -get_player (octave::interpreter& interp, const octave_value& ov) +get_player (interpreter& interp, const octave_value& ov) { interp.mlock ();
--- a/libinterp/dldfcn/audioread.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/dldfcn/audioread.cc Sat Aug 14 22:48:52 2021 -0400 @@ -90,7 +90,7 @@ error ("audioread: failed to open input file '%s': %s", filename.c_str (), sf_strerror (file)); - octave::unwind_action close_open_file ([=] () { sf_close (file); }); + unwind_action close_open_file ([=] () { sf_close (file); }); // FIXME: It would be nicer to use a C++ expandable data container and // read a file of unknown length into memory in chunks and determine the @@ -112,12 +112,12 @@ if (range.numel () != 2) error ("audioread: invalid specification for range of frames"); - double dstart = (octave::math::isinf (range(0)) ? info.frames : range(0)); - double dend = (octave::math::isinf (range(1)) ? info.frames : range(1)); + double dstart = (math::isinf (range(0)) ? info.frames : range(0)); + double dend = (math::isinf (range(1)) ? info.frames : range(1)); if (dstart < 1 || dstart > dend || dend > info.frames - || octave::math::x_nint (dstart) != dstart - || octave::math::x_nint (dend) != dend) + || math::x_nint (dstart) != dstart + || math::x_nint (dend) != dend) error ("audioread: invalid specification for range of frames"); start = dstart - 1; @@ -408,7 +408,7 @@ double value = value_arg.xdouble_value ("audiowrite: Quality value must be a numeric scalar between 0 and 100"); - if (octave::math::isnan (value) || value < 0 || value > 100) + if (math::isnan (value) || value < 0 || value > 100) error ("audiowrite: Quality value must be a number between 0 and 100"); quality = value / 100; @@ -429,7 +429,7 @@ error ("audiowrite: failed to open output file '%s': %s", filename.c_str (), sf_strerror (file)); - octave::unwind_action close_open_file ([=] () { sf_close (file); }); + unwind_action close_open_file ([=] () { sf_close (file); }); sf_command (file, SFC_SET_NORM_DOUBLE, nullptr, SF_TRUE); sf_command (file, SFC_SET_CLIPPING, nullptr, SF_TRUE) ; @@ -610,7 +610,7 @@ std::string filename = args(0).xstring_value ("audioinfo: FILENAME must be a string"); - octave::sys::file_stat fs (filename); + sys::file_stat fs (filename); if (! fs.exists ()) error ("audioinfo: FILENAME '%s' not found", filename.c_str ()); @@ -622,11 +622,11 @@ error ("audioinfo: failed to open input file '%s': %s", filename.c_str (), sf_strerror (file)); - octave::unwind_action close_open_file ([=] () { sf_close (file); }); + unwind_action close_open_file ([=] () { sf_close (file); }); octave_scalar_map result; - std::string full_name = octave::sys::canonicalize_file_name (filename); + std::string full_name = sys::canonicalize_file_name (filename); result.assign ("Filename", full_name); result.assign ("CompressionMethod", "");
--- a/libinterp/dldfcn/convhulln.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/dldfcn/convhulln.cc Sat Aug 14 22:48:52 2021 -0400 @@ -180,8 +180,8 @@ int exitcode = qh_new_qhull (qh, dim, num_points, points.fortran_vec (), ismalloc, &cmd[0], outfile, errfile); - - octave::unwind_action free_memory ([qh] () { free_qhull_memory (qh); }); + + unwind_action free_memory ([qh] () { free_qhull_memory (qh); }); if (exitcode) error ("convhulln: qhull failed");
--- a/libinterp/dldfcn/fftw.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/dldfcn/fftw.cc Sat Aug 14 22:48:52 2021 -0400 @@ -162,65 +162,65 @@ std::string arg1 = args(1).xstring_value ("fftw: METHOD must be a string"); std::transform (arg1.begin (), arg1.end (), arg1.begin (), tolower); - octave::fftw_planner::FftwMethod meth - = octave::fftw_planner::UNKNOWN; - octave::float_fftw_planner::FftwMethod methf - = octave::float_fftw_planner::UNKNOWN; + fftw_planner::FftwMethod meth + = fftw_planner::UNKNOWN; + float_fftw_planner::FftwMethod methf + = float_fftw_planner::UNKNOWN; if (arg1 == "estimate") { - meth = octave::fftw_planner::ESTIMATE; - methf = octave::float_fftw_planner::ESTIMATE; + meth = fftw_planner::ESTIMATE; + methf = float_fftw_planner::ESTIMATE; } else if (arg1 == "measure") { - meth = octave::fftw_planner::MEASURE; - methf = octave::float_fftw_planner::MEASURE; + meth = fftw_planner::MEASURE; + methf = float_fftw_planner::MEASURE; } else if (arg1 == "patient") { - meth = octave::fftw_planner::PATIENT; - methf = octave::float_fftw_planner::PATIENT; + meth = fftw_planner::PATIENT; + methf = float_fftw_planner::PATIENT; } else if (arg1 == "exhaustive") { - meth = octave::fftw_planner::EXHAUSTIVE; - methf = octave::float_fftw_planner::EXHAUSTIVE; + meth = fftw_planner::EXHAUSTIVE; + methf = float_fftw_planner::EXHAUSTIVE; } else if (arg1 == "hybrid") { - meth = octave::fftw_planner::HYBRID; - methf = octave::float_fftw_planner::HYBRID; + meth = fftw_planner::HYBRID; + methf = float_fftw_planner::HYBRID; } else error ("fftw: unrecognized planner METHOD"); - meth = octave::fftw_planner::method (meth); - octave::float_fftw_planner::method (methf); + meth = fftw_planner::method (meth); + float_fftw_planner::method (methf); - if (meth == octave::fftw_planner::MEASURE) + if (meth == fftw_planner::MEASURE) retval = octave_value ("measure"); - else if (meth == octave::fftw_planner::PATIENT) + else if (meth == fftw_planner::PATIENT) retval = octave_value ("patient"); - else if (meth == octave::fftw_planner::EXHAUSTIVE) + else if (meth == fftw_planner::EXHAUSTIVE) retval = octave_value ("exhaustive"); - else if (meth == octave::fftw_planner::HYBRID) + else if (meth == fftw_planner::HYBRID) retval = octave_value ("hybrid"); else retval = octave_value ("estimate"); } else //planner getter { - octave::fftw_planner::FftwMethod meth - = octave::fftw_planner::method (); + fftw_planner::FftwMethod meth + = fftw_planner::method (); - if (meth == octave::fftw_planner::MEASURE) + if (meth == fftw_planner::MEASURE) retval = octave_value ("measure"); - else if (meth == octave::fftw_planner::PATIENT) + else if (meth == fftw_planner::PATIENT) retval = octave_value ("patient"); - else if (meth == octave::fftw_planner::EXHAUSTIVE) + else if (meth == fftw_planner::EXHAUSTIVE) retval = octave_value ("exhaustive"); - else if (meth == octave::fftw_planner::HYBRID) + else if (meth == fftw_planner::HYBRID) retval = octave_value ("hybrid"); else retval = octave_value ("estimate"); @@ -309,19 +309,19 @@ error ("fftw: number of threads must be >=1"); #if defined (HAVE_FFTW3_THREADS) - octave::fftw_planner::threads (nthreads); + fftw_planner::threads (nthreads); #else err_disabled_feature ("fftw", "multithreaded FFTW"); #endif #if defined (HAVE_FFTW3F_THREADS) - octave::float_fftw_planner::threads (nthreads); + float_fftw_planner::threads (nthreads); #else err_disabled_feature ("fftw", "multithreaded FFTW"); #endif } else //threads getter #if defined (HAVE_FFTW3_THREADS) - retval = octave_value (octave::fftw_planner::threads()); + retval = octave_value (fftw_planner::threads()); #else retval = 1; #endif
--- a/libinterp/dldfcn/gzip.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/dldfcn/gzip.cc Sat Aug 14 22:48:52 2021 -0400 @@ -623,7 +623,7 @@ { #if defined (HAVE_Z) - return octave::xzip<octave::gz> ("gzip", args); + return xzip<gz> ("gzip", args); #else @@ -666,7 +666,7 @@ { #if defined (HAVE_BZ2) - return octave::xzip<octave::bz2> ("bzip2", args); + return xzip<bz2> ("bzip2", args); #else
--- a/libinterp/octave-value/ov-cell.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/octave-value/ov-cell.cc Sat Aug 14 22:48:52 2021 -0400 @@ -1260,7 +1260,7 @@ break; case 1: - octave::get_dimensions (args(0), "cell", dims); + get_dimensions (args(0), "cell", dims); break; default: @@ -1276,7 +1276,7 @@ dims.chop_trailing_singletons (); - octave::check_dimensions (dims, "cell"); + check_dimensions (dims, "cell"); return ovl (Cell (dims)); }
--- a/libinterp/octave-value/ov-class.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/octave-value/ov-class.cc Sat Aug 14 22:48:52 2021 -0400 @@ -1752,7 +1752,7 @@ // Called as class constructor std::string id = args(1).xstring_value ("class: ID (class name) must be a string"); - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); octave_function *fcn = tw.caller_function (); @@ -1977,7 +1977,7 @@ @seealso{inferiorto} @end deftypefn */) { - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); octave_function *fcn = tw.caller_function (); @@ -1993,7 +1993,7 @@ if (is_built_in_class (inf_class)) break; - octave::symbol_table& symtab = interp.get_symbol_table (); + symbol_table& symtab = interp.get_symbol_table (); std::string sup_class = fcn->name (); if (! symtab.set_class_relationship (sup_class, inf_class)) @@ -2015,7 +2015,7 @@ @seealso{superiorto} @end deftypefn */) { - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); octave_function *fcn = tw.caller_function (); @@ -2030,7 +2030,7 @@ error ("inferiorto: cannot give user-defined class lower " "precedence than built-in class"); - octave::symbol_table& symtab = interp.get_symbol_table (); + symbol_table& symtab = interp.get_symbol_table (); std::string inf_class = fcn->name (); if (! symtab.set_class_relationship (sup_class, inf_class)) @@ -2080,14 +2080,14 @@ // execute the inline function and that will push a stack frame. octave_value_list - call (octave::tree_evaluator& tw, int nargout = 0, + call (tree_evaluator& tw, int nargout = 0, const octave_value_list& args = octave_value_list ()) { return execute (tw, nargout, args); } octave_value_list - execute (octave::tree_evaluator& tw, int nargout = 0, + execute (tree_evaluator& tw, int nargout = 0, const octave_value_list& args = octave_value_list ()); private: @@ -2137,10 +2137,10 @@ }; octave_value_list -octave_inline_fcn::execute (octave::tree_evaluator& tw, int nargout, +octave_inline_fcn::execute (tree_evaluator& tw, int nargout, const octave_value_list& args) { - octave::interpreter& interp = tw.get_interpreter (); + interpreter& interp = tw.get_interpreter (); return interp.feval (octave_value (m_inline_obj, true), args, nargout); }
--- a/libinterp/octave-value/ov-classdef.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/octave-value/ov-classdef.cc Sat Aug 14 22:48:52 2021 -0400 @@ -599,7 +599,7 @@ std::string cname = args(0).xstring_value ("PACKAGE_NAME must be a string"); - return octave::to_ov (octave::lookup_package (cname)); + return to_ov (lookup_package (cname)); } DEFUN (metaclass, args, , @@ -611,9 +611,9 @@ if (args.length () != 1) print_usage (); - octave::cdef_object obj = octave::to_cdef (args(0)); + cdef_object obj = to_cdef (args(0)); - return octave::to_ov (obj.get_class ()); + return to_ov (obj.get_class ()); } // FIXME: What about dynamic properties if obj is a scalar, or the @@ -651,14 +651,14 @@ else err_wrong_type_arg ("properties", arg); - octave::cdef_class cls; + cdef_class cls; - cls = octave::lookup_class (class_name, false, true); + cls = lookup_class (class_name, false, true); if (! cls.ok ()) error ("invalid class: %s", class_name.c_str ()); - std::map<std::string, octave::cdef_property> property_map = + std::map<std::string, cdef_property> property_map = cls.get_property_map (); std::list<std::string> property_names; @@ -668,7 +668,7 @@ // FIXME: this loop duplicates a significant portion of the loops // in octave_classdef::print_raw. - const octave::cdef_property& prop = pname_prop.second; + const cdef_property& prop = pname_prop.second; std::string nm = prop.get_name (); @@ -731,11 +731,11 @@ string_vector sv; - octave::cdef_class cls = octave::lookup_class (class_name, false, true); + cdef_class cls = lookup_class (class_name, false, true); if (cls.ok ()) { - std::map<std::string, octave::cdef_method> method_map + std::map<std::string, cdef_method> method_map = cls.get_method_map (false, true); std::list<std::string> method_names; @@ -752,7 +752,7 @@ // The following will also find methods for legacy @CLASS objects. - octave::load_path& lp = interp.get_load_path (); + load_path& lp = interp.get_load_path (); sv.append (lp.methods (class_name));
--- a/libinterp/octave-value/ov-fcn-handle.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/octave-value/ov-fcn-handle.cc Sat Aug 14 22:48:52 2021 -0400 @@ -85,6 +85,7 @@ const std::string octave_fcn_handle::anonymous ("@<anonymous>"); OCTAVE_NAMESPACE_BEGIN + class invalid_fcn_handle : public base_fcn_handle { public: @@ -3547,7 +3548,7 @@ warning_with_id ("Octave:str2func-global-argument", "str2func: second argument ignored"); - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); return tw.make_fcn_handle (nm); }
--- a/libinterp/octave-value/ov-struct.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/octave-value/ov-struct.cc Sat Aug 14 22:48:52 2021 -0400 @@ -2126,7 +2126,7 @@ } octave_map map (rdv); - Array<octave::idx_vector> ia (dim_vector (nd, 1), octave::idx_vector::colon); + Array<idx_vector> ia (dim_vector (nd, 1), idx_vector::colon); for (octave_idx_type i = 0; i < ext; i++) {
--- a/libinterp/octave-value/ov-typeinfo.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/octave-value/ov-typeinfo.cc Sat Aug 14 22:48:52 2021 -0400 @@ -922,7 +922,7 @@ if (nargin == 0) { - octave::type_info& type_info = interp.get_type_info (); + type_info& type_info = interp.get_type_info (); return ovl (Cell (type_info.installed_type_names ())); } @@ -1038,7 +1038,7 @@ if (args.length () > 0) print_usage (); - octave::type_info& type_info = interp.get_type_info (); + type_info& type_info = interp.get_type_info (); return ovl (type_info.installed_type_info ()); }
--- a/libinterp/octave-value/ov-usr-fcn.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/octave-value/ov-usr-fcn.cc Sat Aug 14 22:48:52 2021 -0400 @@ -697,7 +697,7 @@ if (func.is_string ()) { - octave::symbol_table& symtab = interp.get_symbol_table (); + symbol_table& symtab = interp.get_symbol_table (); std::string name = func.string_value (); func = symtab.find_function (name); @@ -721,7 +721,7 @@ type.c_str ()); } - octave::tree_parameter_list *m_param_list = fcn->parameter_list (); + tree_parameter_list *m_param_list = fcn->parameter_list (); retval = (m_param_list ? m_param_list->length () : 0); if (fcn->takes_varargs ()) @@ -729,9 +729,9 @@ } else { - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); - retval = tw.get_auto_fcn_var (octave::stack_frame::NARGIN); + retval = tw.get_auto_fcn_var (stack_frame::NARGIN); if (retval.is_undefined ()) retval = 0; @@ -808,7 +808,7 @@ if (func.is_string ()) { - octave::symbol_table& symtab = interp.get_symbol_table (); + symbol_table& symtab = interp.get_symbol_table (); std::string name = func.string_value (); func = symtab.find_function (name); @@ -843,7 +843,7 @@ type.c_str ()); } - octave::tree_parameter_list *m_ret_list = fcn->return_list (); + tree_parameter_list *m_ret_list = fcn->return_list (); retval = (m_ret_list ? m_ret_list->length () : 0); @@ -855,9 +855,9 @@ if (interp.at_top_level ()) error ("nargout: invalid call at top level"); - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); - retval = tw.get_auto_fcn_var (octave::stack_frame::NARGOUT); + retval = tw.get_auto_fcn_var (stack_frame::NARGOUT); if (retval.is_undefined ()) retval = 0; @@ -897,7 +897,7 @@ static bool isargout1 (int nargout, const Matrix& ignored, double k) { - if (k != octave::math::fix (k) || k <= 0) + if (k != math::fix (k) || k <= 0) error ("isargout: K must be a positive integer"); return (k == 1 || k <= nargout) && ! val_in_table (ignored, k); @@ -927,17 +927,17 @@ if (interp.at_top_level ()) error ("isargout: invalid call at top level"); - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); octave_value tmp; int nargout1 = 0; - tmp = tw.get_auto_fcn_var (octave::stack_frame::NARGOUT); + tmp = tw.get_auto_fcn_var (stack_frame::NARGOUT); if (tmp.is_defined ()) nargout1 = tmp.int_value (); Matrix ignored; - tmp = tw.get_auto_fcn_var (octave::stack_frame::IGNORED); + tmp = tw.get_auto_fcn_var (stack_frame::IGNORED); if (tmp.is_defined ()) ignored = tmp.matrix_value ();
--- a/libinterp/octave.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/octave.cc Sat Aug 14 22:48:52 2021 -0400 @@ -289,9 +289,9 @@ // Note: Although the application destructor doesn't explicitly // perform any actions, it can't be declared "default" in the header - // file if the octave::interpreter is an incomplete type. Providing + // file if the interpreter is an incomplete type. Providing // an explicit definition of the destructor here is much simpler than - // including the full declaration of octave::interpreter in the + // including the full declaration of interpreter in the // octave.h header file. application::~application (void) { } @@ -440,7 +440,7 @@ // FIXME: This isn't quite right, it just says that we intended to // start the GUI, not that it is actually running. - return ovl (octave::application::is_gui_running ()); + return ovl (application::is_gui_running ()); } /* @@ -471,7 +471,7 @@ if (args.length () != 0) print_usage (); - return ovl (Cell (octave::application::argv ())); + return ovl (Cell (application::argv ())); } /* @@ -489,12 +489,12 @@ if (args.length () != 0) print_usage (); - octave::application *app = octave::application::app (); + application *app = application::app (); if (! app) error ("invalid application context!"); - octave::cmdline_options opts = app->options (); + cmdline_options opts = app->options (); return ovl (opts.as_octave_value ()); } @@ -514,7 +514,7 @@ if (args.length () != 0) print_usage (); - return ovl (octave::application::program_invocation_name ()); + return ovl (application::program_invocation_name ()); } /* @@ -533,7 +533,7 @@ if (args.length () != 0) print_usage (); - return ovl (octave::application::program_name ()); + return ovl (application::program_name ()); } /*
--- a/libinterp/parse-tree/lex.ll Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/parse-tree/lex.ll Sat Aug 14 22:48:52 2021 -0400 @@ -2142,7 +2142,7 @@ { std::string kword = wordlist[i].name; - // FIXME: The following check is duplicated in octave::iskeyword. + // FIXME: The following check is duplicated in iskeyword. if (! (kword == "set" || kword == "get" || kword == "arguments" || kword == "enumeration" || kword == "events" || kword == "methods" || kword == "properties")) @@ -2156,7 +2156,7 @@ else { std::string name = args(0).xstring_value ("iskeyword: NAME must be a string"); - retval = octave::iskeyword (name); + retval = iskeyword (name); } return retval;
--- a/libinterp/parse-tree/oct-parse.yy Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/parse-tree/oct-parse.yy Sat Aug 14 22:48:52 2021 -0400 @@ -5898,7 +5898,7 @@ if (nargin == 1 || nargin > 3) print_usage (); - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); if (nargin == 0) return octave_value (tw.get_autoload_map ()); @@ -6127,7 +6127,7 @@ const std::string name (args(0).xstring_value ("builtin: function name (F) must be a string")); - octave::symbol_table& symtab = interp.get_symbol_table (); + symbol_table& symtab = interp.get_symbol_table (); octave_value fcn = symtab.builtin_find (name); @@ -6375,7 +6375,7 @@ // the eval, then the message is stored in the exception object and we // will display it later, after the buffers have been restored. - octave::unwind_action act ([=] (void) + unwind_action act ([=] (void) { octave_stdout.rdbuf (old_out_buf); std::cerr.rdbuf (old_err_buf); @@ -6518,9 +6518,9 @@ std::string file = args(0).xstring_value ("__parse_file__: expecting filename as argument"); - std::string full_file = octave::sys::file_ops::tilde_expand (file); - - full_file = octave::sys::env::make_absolute (full_file); + std::string full_file = sys::file_ops::tilde_expand (file); + + full_file = sys::env::make_absolute (full_file); std::string dir_name; @@ -6530,10 +6530,10 @@ || (file_len > 4 && file.substr (file_len-4) == ".mex") || (file_len > 2 && file.substr (file_len-2) == ".m")) { - file = octave::sys::env::base_pathname (file); + file = sys::env::base_pathname (file); file = file.substr (0, file.find_last_of ('.')); - std::size_t pos = file.find_last_of (octave::sys::file_ops::dir_sep_str ()); + std::size_t pos = file.find_last_of (sys::file_ops::dir_sep_str ()); if (pos != std::string::npos) { dir_name = file.substr (0, pos);
--- a/libinterp/parse-tree/profiler.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/parse-tree/profiler.cc Sat Aug 14 22:48:52 2021 -0400 @@ -394,7 +394,7 @@ if (nargin > 1) print_usage (); - octave::profiler& profiler = interp.get_profiler (); + profiler& profiler = interp.get_profiler (); if (nargin == 1) { @@ -404,7 +404,7 @@ if (args(0).bool_value ()) status = "on"; - octave::event_manager& evmgr = interp.get_event_manager (); + event_manager& evmgr = interp.get_event_manager (); evmgr.gui_status_update ("profiler", status); // tell GUI } @@ -421,7 +421,7 @@ if (args.length () != 0) print_usage (); - octave::profiler& profiler = interp.get_profiler (); + profiler& profiler = interp.get_profiler (); profiler.reset (); @@ -438,7 +438,7 @@ if (args.length () != 0) print_usage (); - octave::profiler& profiler = interp.get_profiler (); + profiler& profiler = interp.get_profiler (); if (nargout > 1) return ovl (profiler.get_flat (), profiler.get_hierarchical ());
--- a/libinterp/parse-tree/pt-eval.cc Sat Aug 14 21:50:26 2021 -0400 +++ b/libinterp/parse-tree/pt-eval.cc Sat Aug 14 22:48:52 2021 -0400 @@ -2260,7 +2260,7 @@ @seealso{for, parfor, if, do, while, function, switch, try, unwind_protect} @end deftypefn */) { - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); return tw.evaluate_end_expression (args); } @@ -3943,7 +3943,7 @@ unwind_protect frame; - octave::interpreter_try (frame); + interpreter_try (frame); // The catch code is *not* added to unwind_protect stack; it // doesn't need to be run on interrupts. @@ -5108,7 +5108,7 @@ @seealso{max_stack_depth} @end deftypefn */) { - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); return tw.max_recursion_depth (args, nargout); } @@ -5201,7 +5201,7 @@ @seealso{whos} @end deftypefn */) { - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); return tw.whos_line_format (args, nargout); } @@ -5223,7 +5223,7 @@ The original variable value is restored when exiting the function. @end deftypefn */) { - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); return tw.silent_functions (args, nargout); } @@ -5266,7 +5266,7 @@ The original variable value is restored when exiting the function. @end deftypefn */) { - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); return tw.string_fill_char (args, nargout); } @@ -5306,7 +5306,7 @@ @seealso{echo, PS1, PS2} @end deftypefn */) { - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); return tw.PS4 (args, nargout); } @@ -5352,7 +5352,7 @@ @seealso{PS4} @end deftypefn */) { - octave::tree_evaluator& tw = interp.get_evaluator (); + tree_evaluator& tw = interp.get_evaluator (); return tw.echo (args, nargout); }