Mercurial > octave
changeset 29958:32c3a5805893
move DEFUN and DEFMETHOD functions inside octave namespace
* mk-opts.pl: Surround emitted function definitions with
OCTAVE_NAMESPACE_BEGIN and OCTAVE_NAMESPACE_END tags.
* mk-builtins.pl: Surround emitted function declarations with
OCTAVE_NAMESPACE_BEGIN and OCTAVE_NAMESPACE_END tags. Emit deprecated
global inline functions.
* __betainc__.cc, __contourc__.cc, __dsearchn__.cc, __eigs__.cc,
__expint__.cc, __ftp__.cc, __gammainc__.cc, __ichol__.cc, __ilu__.cc,
__lin_interpn__.cc, __magick_read__.cc, __pchip_deriv__.cc, __qp__.cc,
amd.cc, balance.cc, besselj.cc, bitfcns.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, debug.cc, defaults.cc,
defun.cc, det.cc, dirfns.cc, display.cc, dlmread.cc, dmperm.cc,
dot.cc, eig.cc, ellipj.cc, environment.cc, error.cc, event-manager.cc,
fcn-info.cc, fft.cc, fft2.cc, fftn.cc, file-io.cc, filter.cc, find.cc,
gcd.cc, getgrent.cc, getpwent.cc, getrusage.cc, givens.cc,
graphics.cc, gsvd.cc, hash.cc, help.cc, hess.cc, hex2num.cc, input.cc,
interpreter.cc, inv.cc, jsondecode.cc, jsonencode.cc, kron.cc,
load-path.cc, load-save.cc, lookup.cc, ls-oct-text.cc, lsode.cc,
lu.cc, mappers.cc, matrix_type.cc, max.cc, mgorth.cc, nproc.cc,
oct-hist.cc, ordqz.cc, ordschur.cc, pager.cc, pinv.cc, pr-flt-fmt.cc,
pr-output.cc, psi.cc, qr.cc, quad.cc, quadcc.cc, qz.cc, rand.cc,
rcond.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, sylvester.cc, symbfact.cc, symrcm.cc, symtab.cc,
syscalls.cc, sysdep.cc, time.cc, toplev.cc, tril.cc, tsearch.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-base.cc, ov-bool-mat.cc, ov-cell.cc, ov-class.cc,
ov-classdef.cc, ov-fcn-handle.cc, ov-java.cc, ov-null-mat.cc,
ov-oncleanup.cc, ov-struct.cc, ov-typeinfo.cc, ov-usr-fcn.cc, ov.cc,
octave.cc, lex.ll, oct-parse.yy, profiler.cc, pt-eval.cc: Surround
DEFUN and DEFMETHOD function defnitions with OCTAVE_NAMESPACE_BEGIN
and OCTAVE_NAMESPACE_END tags.
line wrap: on
line diff
--- a/build-aux/mk-opts.pl Sat Aug 14 18:35:57 2021 -0400 +++ b/build-aux/mk-opts.pl Fri Aug 13 21:53:51 2021 -0400 @@ -913,6 +913,8 @@ sub emit_options_function { print <<"_END_EMIT_OPTIONS_FUNCTION_HDR_"; +OCTAVE_NAMESPACE_BEGIN + DEFUN ($OPT_FCN_NAME, args, , doc: /* -*- texinfo -*- \@deftypefn {} {} $OPT_FCN_NAME () @@ -959,6 +961,9 @@ return retval; } + +OCTAVE_NAMESPACE_END + _END_EMIT_OPTIONS_FUNCTION_BODY_ }
--- a/libinterp/corefcn/__betainc__.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/__betainc__.cc Fri Aug 13 21:53:51 2021 -0400 @@ -31,6 +31,8 @@ #include "dNDArray.h" #include "fNDArray.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (__betainc__, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{y} =} __betainc__ (@var{x}, @var{a}, @var{b}) @@ -200,3 +202,5 @@ return retval; } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/__contourc__.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/__contourc__.cc Fri Aug 13 21:53:51 2021 -0400 @@ -46,6 +46,8 @@ #include "defun.h" #include "ov.h" +OCTAVE_NAMESPACE_BEGIN + // FIXME: this looks like trouble... static Matrix this_contour; static Matrix contourc; @@ -298,6 +300,7 @@ drawcn (X, Y, Z, lvl, r, c, 0.0, 0.0, 255, true, mark); } + DEFUN (__contourc__, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{c} =} __contourc__ (@var{x}, @var{y}, @var{z}, @var{levels}) @@ -323,3 +326,5 @@ ## No test needed for internal helper function. %!assert (1) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/__dsearchn__.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/__dsearchn__.cc Fri Aug 13 21:53:51 2021 -0400 @@ -35,6 +35,8 @@ #include "error.h" #include "ovl.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (__dsearchn__, args, , doc: /* -*- texinfo -*- @deftypefn {} {[@var{idx}, @var{d}] =} dsearch (@var{x}, @var{xi}) @@ -100,3 +102,5 @@ ## No test needed for internal helper function. %!assert (1) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/__eigs__.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/__eigs__.cc Fri Aug 13 21:53:51 2021 -0400 @@ -141,6 +141,8 @@ #endif +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (__eigs__, interp, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {@var{d} =} __eigs__ (@var{A}) @@ -699,3 +701,5 @@ ## No test needed for internal helper function. %!assert (1) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/__expint__.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/__expint__.cc Fri Aug 13 21:53:51 2021 -0400 @@ -31,6 +31,8 @@ #include "defun.h" #include "fCNDArray.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (__expint__, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{y} =} __expint__ (@var{x}) @@ -170,3 +172,5 @@ return retval; } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/__ftp__.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/__ftp__.cc Fri Aug 13 21:53:51 2021 -0400 @@ -52,6 +52,8 @@ #include "unwind-prot.h" #include "url-handle-manager.h" +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (__ftp__, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{handle} =} __ftp__ (@var{host}) @@ -477,3 +479,5 @@ return ovl (); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/__gammainc__.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/__gammainc__.cc Fri Aug 13 21:53:51 2021 -0400 @@ -30,6 +30,8 @@ #include "defun.h" #include "fNDArray.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (__gammainc__, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{y} =} __gammainc__ (@var{x}, @var{a}) @@ -164,3 +166,5 @@ return retval; } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/__ichol__.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/__ichol__.cc Fri Aug 13 21:53:51 2021 -0400 @@ -35,6 +35,8 @@ #include "builtin-defun-decls.h" +OCTAVE_NAMESPACE_BEGIN + // Secondary functions for complex and real case used in ichol algorithms. Complex ichol_mult_complex (Complex a, Complex b) { @@ -466,3 +468,5 @@ %! L = ichol (A, opts); %! assert (norm (A - L*L.'), 0, 2*eps); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/__ilu__.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/__ilu__.cc Fri Aug 13 21:53:51 2021 -0400 @@ -35,6 +35,8 @@ #include "builtin-defun-decls.h" +OCTAVE_NAMESPACE_BEGIN + // This function implements the IKJ and JKI variants of Gaussian elimination to // perform the ILU0 decomposition. The behavior is controlled by milu // parameter. If milu = ['off'|'col'] the JKI version is performed taking @@ -1005,3 +1007,5 @@ ## No test needed for internal helper function. %!assert (1) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/__lin_interpn__.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/__lin_interpn__.cc Fri Aug 13 21:53:51 2021 -0400 @@ -35,6 +35,8 @@ #include "error.h" #include "ovl.h" +OCTAVE_NAMESPACE_BEGIN + // equivalent to isvector.m template <typename T> @@ -321,3 +323,5 @@ ## No test needed for internal helper function. %!assert (1) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/__magick_read__.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/__magick_read__.cc Fri Aug 13 21:53:51 2021 -0400 @@ -43,6 +43,8 @@ #include <Magick++.h> #include <clocale> +OCTAVE_NAMESPACE_BEGIN + // In theory, it should be enough to check the class: // Magick::ClassType // PseudoClass: @@ -2406,3 +2408,5 @@ ## No test needed for internal helper function. %!assert (1) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/__pchip_deriv__.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/__pchip_deriv__.cc Fri Aug 13 21:53:51 2021 -0400 @@ -36,6 +36,8 @@ #include "utils.h" #include "f77-fcn.h" +OCTAVE_NAMESPACE_BEGIN + // Wrapper for SLATEC/PCHIP function DPCHIM to calculate the derivates // for piecewise polynomials. @@ -138,3 +140,5 @@ ## No test needed for internal helper function. %!assert (1) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/__qp__.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/__qp__.cc Fri Aug 13 21:53:51 2021 -0400 @@ -43,6 +43,8 @@ #include "pr-output.h" #include "utils.h" +OCTAVE_NAMESPACE_BEGIN + static octave_idx_type min_index (const ColumnVector& x) { @@ -520,3 +522,5 @@ ## No test needed for internal helper function. %!assert (1) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/amd.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/amd.cc Fri Aug 13 21:53:51 2021 -0400 @@ -46,6 +46,8 @@ #include "ovl.h" #include "parse.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (amd, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {@var{p} =} amd (@var{S}) @@ -200,3 +202,5 @@ %!error <S must be a square matrix|was unavailable or disabled> amd (A) %!error amd (A2, 2) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/balance.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/balance.cc Fri Aug 13 21:53:51 2021 -0400 @@ -44,6 +44,8 @@ #include "ovl.h" #include "utils.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (balance, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {@var{AA} =} balance (@var{A}) @@ -222,7 +224,7 @@ bal_job = args(2).xstring_value ("balance: OPT argument must be a string"); if ((nn != args(1).columns ()) || (nn != args(1).rows ())) - err_nonconformant (); + ::err_nonconformant (); Matrix bb; ComplexMatrix cbb; @@ -371,3 +373,5 @@ return retval; } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/besselj.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/besselj.cc Fri Aug 13 21:53:51 2021 -0400 @@ -35,6 +35,8 @@ #include "ovl.h" #include "utils.h" +OCTAVE_NAMESPACE_BEGIN + enum bessel_type { BESSEL_J, @@ -1313,3 +1315,5 @@ %! assert (j, jt, -1e-9); %! assert (y, yt, -1e-9); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/bitfcns.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/bitfcns.cc Fri Aug 13 21:53:51 2021 -0400 @@ -76,6 +76,8 @@ } #endif +OCTAVE_NAMESPACE_BEGIN + template <typename OP, typename T> octave_value bitopxx (const OP& op, const std::string& fname, @@ -973,3 +975,5 @@ %!error sizemax (0) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/bsxfun.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/bsxfun.cc Fri Aug 13 21:53:51 2021 -0400 @@ -320,6 +320,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (bsxfun, interp,args, , doc: /* -*- texinfo -*- @deftypefn {} {} bsxfun (@var{f}, @var{A}, @var{B}) @@ -812,3 +814,5 @@ %! assert (r(:,:,1), repmat (single ([0, 0, 1+i, 1+i]), [4, 1])); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/call-stack.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/call-stack.cc Fri Aug 13 21:53:51 2021 -0400 @@ -1135,6 +1135,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (max_stack_depth, interp, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {@var{val} =} max_stack_depth () @@ -1301,3 +1303,5 @@ return tw.do_who (argc, argv, nargout == 1, true); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/ccolamd.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/ccolamd.cc Fri Aug 13 21:53:51 2021 -0400 @@ -44,6 +44,8 @@ #include "ov.h" #include "pager.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (ccolamd, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {@var{p} =} ccolamd (@var{S}) @@ -581,3 +583,5 @@ #endif } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/cellfun.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/cellfun.cc Fri Aug 13 21:53:51 2021 -0400 @@ -65,6 +65,8 @@ #include "ov-fcn-handle.h" +OCTAVE_NAMESPACE_BEGIN + static octave_value_list get_output_list (octave::error_system& es, octave_idx_type count, octave_idx_type nargout, @@ -2492,3 +2494,5 @@ return octave_value (y); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/chol.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/chol.cc Fri Aug 13 21:53:51 2021 -0400 @@ -41,6 +41,8 @@ #include "ov.h" #include "ovl.h" +OCTAVE_NAMESPACE_BEGIN + template <typename CHOLT> static octave_value get_chol (const CHOLT& fact) @@ -1329,3 +1331,5 @@ %! assert (norm (triu (R1)-R1, Inf), 0); %! assert (norm (R1'*R1 - single (Ac(p,p)), Inf) < 1e1*eps ("single")); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/colamd.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/colamd.cc Fri Aug 13 21:53:51 2021 -0400 @@ -46,6 +46,8 @@ #include "ovl.h" #include "pager.h" +OCTAVE_NAMESPACE_BEGIN + // The symmetric column elimination tree code take from the Davis LDL code. // Copyright given elsewhere in this file. static void @@ -783,3 +785,5 @@ %!error <TYP must be a string> etree (speye (2), 3) %!error <is not square> etree (sprand (2, 4, .25)) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/colloc.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/colloc.cc Fri Aug 13 21:53:51 2021 -0400 @@ -38,6 +38,8 @@ #include "ovl.h" #include "utils.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (colloc, args, , doc: /* -*- texinfo -*- @deftypefn {} {[@var{r}, @var{amat}, @var{bmat}, @var{q}] =} colloc (@var{n}, "left", "right") @@ -113,3 +115,5 @@ %!error <total number of roots .* must be .= 1> colloc (0) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/conv2.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/conv2.cc Fri Aug 13 21:53:51 2021 -0400 @@ -34,6 +34,8 @@ #include "ovl.h" #include "utils.h" +OCTAVE_NAMESPACE_BEGIN + enum Shape { SHAPE_FULL, SHAPE_SAME, SHAPE_VALID }; DEFUN (conv2, args, , @@ -568,3 +570,5 @@ %!error <SHAPE type not valid> convn (1,2, "NOT_A_SHAPE") %!error convn (rand (3), 1, 1) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/daspk.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/daspk.cc Fri Aug 13 21:53:51 2021 -0400 @@ -156,6 +156,8 @@ 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}) @@ -404,3 +406,5 @@ return retval; } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/dasrt.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/dasrt.cc Fri Aug 13 21:53:51 2021 -0400 @@ -194,6 +194,8 @@ 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}) @@ -522,3 +524,5 @@ return retval; } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/dassl.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/dassl.cc Fri Aug 13 21:53:51 2021 -0400 @@ -155,6 +155,8 @@ 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}) @@ -491,3 +493,5 @@ %!error dassl_options ("foo", 1, 2) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/data.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/data.cc Fri Aug 13 21:53:51 2021 -0400 @@ -66,6 +66,8 @@ #include "variables.h" #include "xnorm.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (all, args, , doc: /* -*- texinfo -*- @deftypefn {} {} all (@var{x}) @@ -927,7 +929,6 @@ */ - #define DATA_REDUCTION(FCN) \ \ int nargin = args.length (); \ @@ -1707,8 +1708,6 @@ return retval; } -OCTAVE_NAMESPACE_BEGIN - octave_value do_class_concat (const octave_value_list& ovl, std::string cattype, int dim) { @@ -1777,8 +1776,6 @@ return retval; } -OCTAVE_NAMESPACE_END - static octave_value do_cat (const octave_value_list& xargs, int dim, std::string fname) { @@ -8377,3 +8374,5 @@ %!error __base64_decode_bytes__ (1, "this is not a valid set of dimensions") %!error <input was not valid base64> __base64_decode_bytes__ (1) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/debug.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/debug.cc Fri Aug 13 21:53:51 2021 -0400 @@ -59,6 +59,8 @@ #include "utils.h" #include "variables.h" +OCTAVE_NAMESPACE_BEGIN + static octave_value bp_lines_to_ov (const octave::bp_table::bp_lines& lines) { @@ -1206,3 +1208,5 @@ return ovl (); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/defaults.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/defaults.cc Fri Aug 13 21:53:51 2021 -0400 @@ -449,6 +449,7 @@ } } +OCTAVE_NAMESPACE_BEGIN DEFUN (OCTAVE_HOME, args, , doc: /* -*- texinfo -*- @@ -544,3 +545,4 @@ %!error user_data_dir (1) */ +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/defun-int.h Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/defun-int.h Fri Aug 13 21:53:51 2021 -0400 @@ -34,13 +34,13 @@ #include "ov-dld-fcn.h" #include "version.h" +class octave_value; + namespace octave { class interpreter; } -class octave_value; - OCTAVE_NAMESPACE_BEGIN extern OCTINTERP_API void print_usage (void); @@ -86,7 +86,6 @@ auto_shlib (const dynamic_library& shl) : dynamic_library (shl) { } }; - } // Some of these functions are widely used, so maybe we should avoid
--- a/libinterp/corefcn/det.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/det.cc Fri Aug 13 21:53:51 2021 -0400 @@ -45,6 +45,8 @@ #include "ov-flt-cx-diag.h" #include "ov-perm.h" +OCTAVE_NAMESPACE_BEGIN + #define MAYBE_CAST(VAR, CLASS) \ const CLASS *VAR = (arg.type_id () == CLASS::static_type_id () \ ? dynamic_cast<const CLASS *> (&arg.get_rep ()) \ @@ -234,3 +236,5 @@ %!error det (1, 2) %!error <must be a square matrix> det ([1, 2; 3, 4; 5, 6]) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/dirfns.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/dirfns.cc Fri Aug 13 21:53:51 2021 -0400 @@ -62,6 +62,8 @@ #include "utils.h" #include "variables.h" +OCTAVE_NAMESPACE_BEGIN + // TRUE means we ask for confirmation before recursively removing a // directory tree. static bool Vconfirm_recursive_rmdir = true; @@ -723,3 +725,5 @@ { return SET_INTERNAL_VARIABLE (confirm_recursive_rmdir); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/display.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/display.cc Fri Aug 13 21:53:51 2021 -0400 @@ -54,6 +54,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (have_window_system, interp, , , doc: /* -*- texinfo -*- @deftypefn {} {} have_window_system () @@ -66,3 +68,5 @@ return ovl (dpy_info.display_available ()); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/dlmread.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/dlmread.cc Fri Aug 13 21:53:51 2021 -0400 @@ -167,6 +167,8 @@ return stat; } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (dlmread, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{data} =} dlmread (@var{file}) @@ -764,3 +766,5 @@ %! end_unwind_protect */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/dmperm.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/dmperm.cc Fri Aug 13 21:53:51 2021 -0400 @@ -38,6 +38,8 @@ #include "ovl.h" #include "utils.h" +OCTAVE_NAMESPACE_BEGIN + #if defined (OCTAVE_ENABLE_64) # define CXSPARSE_NAME(name) cs_dl ## name #else @@ -257,3 +259,5 @@ %!error sprank (1,2) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/dot.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/dot.cc Fri Aug 13 21:53:51 2021 -0400 @@ -35,6 +35,8 @@ #include "error.h" #include "parse.h" +OCTAVE_NAMESPACE_BEGIN + static void get_red_dims (const dim_vector& x, const dim_vector& y, int dim, dim_vector& z, F77_INT& m, F77_INT& n, F77_INT& k) @@ -430,3 +432,5 @@ %!error <A and B must be numeric> blkmm ([3,4], {1,2}) %!error <A and B dimensions don't match> blkmm (ones (2,2), ones (3,3)) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/eig.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/eig.cc Fri Aug 13 21:53:51 2021 -0400 @@ -36,6 +36,8 @@ #include "fEIG.h" #include "oct-string.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (eig, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {@var{lambda} =} eig (@var{A}) @@ -638,3 +640,5 @@ %!error <wrong type argument> %! eig ([1 2 ; 2 3], [1 2 ; 2 3], [1 2 ; 2 3]) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/ellipj.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/ellipj.cc Fri Aug 13 21:53:51 2021 -0400 @@ -31,6 +31,8 @@ #include "error.h" #include "lo-specfun.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (ellipj, args, , doc: /* -*- texinfo -*- @deftypefn {} {[@var{sn}, @var{cn}, @var{dn}, @var{err}] =} ellipj (@var{u}, @var{m}) @@ -847,3 +849,5 @@ %!error <Invalid size combination for U and M> ellipj (complex (1:4,1:4), [1:3]) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/environment.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/environment.cc Fri Aug 13 21:53:51 2021 -0400 @@ -154,6 +154,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (EDITOR, interp, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {@var{val} =} EDITOR () @@ -257,3 +259,5 @@ %!error IMAGE_PATH (1, 2) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/error.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/error.cc Fri Aug 13 21:53:51 2021 -0400 @@ -141,7 +141,7 @@ if (have_fmt) { - octave_value_list tmp = Fsprintf (args, 1); + octave_value_list tmp = octave::Fsprintf (args, 1); arg = tmp(0); } else @@ -1138,8 +1138,6 @@ ::defun_usage_message ("%s", msg.c_str ()); } -OCTAVE_NAMESPACE_END - DEFMETHOD (rethrow, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {} rethrow (@var{err}) @@ -1328,7 +1326,7 @@ if (have_fmt) { - octave_value_list tmp = Fsprintf (nargs, 1); + octave_value_list tmp = octave::Fsprintf (nargs, 1); arg = tmp(0); } else @@ -1816,8 +1814,6 @@ */ -OCTAVE_NAMESPACE_BEGIN - octave_value_list set_warning_state (const std::string& id, const std::string& state) { @@ -1829,7 +1825,7 @@ octave::interpreter& interp = octave::__get_interpreter__ ("set_warning_state"); - return Fwarning (interp, args, 1); + return octave::Fwarning (interp, args, 1); } octave_value_list @@ -1838,7 +1834,7 @@ octave::interpreter& interp = octave::__get_interpreter__ ("set_warning_state"); - return Fwarning (interp, args, 1); + return octave::Fwarning (interp, args, 1); } int @@ -1857,8 +1853,6 @@ es.disable_warning (id); } -OCTAVE_NAMESPACE_END - DEFMETHOD (lasterror, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{lasterr} =} lasterror () @@ -2185,8 +2179,6 @@ return es.debug_on_warning (args, nargout); } -OCTAVE_NAMESPACE_BEGIN - void interpreter_try (octave::unwind_protect& frame) {
--- a/libinterp/corefcn/event-manager.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/event-manager.cc Fri Aug 13 21:53:51 2021 -0400 @@ -190,6 +190,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + // FIXME: Should the following function be __event_manager_desktop__ // with the desktop function implemented in a .m file, similar to the // way the UI* functions work? @@ -867,3 +869,5 @@ evmgr.focus_window ("workspace"); return ovl (); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/fcn-info.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/fcn-info.cc Fri Aug 13 21:53:51 2021 -0400 @@ -1146,6 +1146,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFUN (ignore_function_time_stamp, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {@var{val} =} ignore_function_time_stamp () @@ -1227,3 +1229,5 @@ %!error ignore_function_time_stamp ("UNKNOWN_VALUE") %!error ignore_function_time_stamp (42) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/fft.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/fft.cc Fri Aug 13 21:53:51 2021 -0400 @@ -35,6 +35,8 @@ #include "ovl.h" #include "utils.h" +OCTAVE_NAMESPACE_BEGIN + static octave_value do_fft (const octave_value_list& args, const char *fcn, int type) { @@ -311,3 +313,5 @@ %! %! assert (ifft (S), s, 4*N*eps ("single")); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/fft2.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/fft2.cc Fri Aug 13 21:53:51 2021 -0400 @@ -35,6 +35,8 @@ #include "ovl.h" #include "utils.h" +OCTAVE_NAMESPACE_BEGIN + // This function should be merged with Fifft. static octave_value @@ -257,3 +259,5 @@ %! %! assert (s, answer, 30*eps ("single")); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/fftn.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/fftn.cc Fri Aug 13 21:53:51 2021 -0400 @@ -35,6 +35,8 @@ #include "ovl.h" #include "utils.h" +OCTAVE_NAMESPACE_BEGIN + // This function should be merged with Fifft. static octave_value @@ -159,3 +161,5 @@ { return do_fftn (args, "ifftn", 1); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/file-io.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/file-io.cc Fri Aug 13 21:53:51 2021 -0400 @@ -84,6 +84,8 @@ #include "utils.h" #include "variables.h" +OCTAVE_NAMESPACE_BEGIN + static void normalize_fopen_mode (std::string& mode, bool& use_zlib) { @@ -3251,6 +3253,8 @@ return const_value ("stderr", args, streams.stderr_file ()); } +OCTAVE_NAMESPACE_END + // Deprecated variables and functions. // Deprecated in Octave 6. @@ -3272,3 +3276,4 @@ interp.cleanup_tmp_files (); } +
--- a/libinterp/corefcn/filter.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/filter.cc Fri Aug 13 21:53:51 2021 -0400 @@ -41,6 +41,8 @@ #include "error.h" #include "ovl.h" +OCTAVE_NAMESPACE_BEGIN + template <typename T> MArray<T> filter (MArray<T>& b, MArray<T>& a, MArray<T>& x, MArray<T>& si, @@ -617,3 +619,5 @@ %! y = filter ([1 1 1], 1, x, [], 3); %! assert (y, y0); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/find.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/find.cc Fri Aug 13 21:53:51 2021 -0400 @@ -34,6 +34,8 @@ #include "errwarn.h" #include "ovl.h" +OCTAVE_NAMESPACE_BEGIN + // Find at most N_TO_FIND nonzero elements in NDA. Search forward if // DIRECTION is 1, backward if it is -1. NARGOUT is the number of // output arguments. If N_TO_FIND is -1, find all nonzero elements. @@ -599,3 +601,5 @@ %!error find () */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/gcd.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/gcd.cc Fri Aug 13 21:53:51 2021 -0400 @@ -38,6 +38,8 @@ #include "error.h" #include "ovl.h" +OCTAVE_NAMESPACE_BEGIN + static double simple_gcd (double a, double b) { @@ -534,3 +536,5 @@ %! s.a = 1; %! fail ("gcd (s)"); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/getgrent.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/getgrent.cc Fri Aug 13 21:53:51 2021 -0400 @@ -41,6 +41,8 @@ #include "ovl.h" #include "utils.h" +OCTAVE_NAMESPACE_BEGIN + // Group file functions. (Why not?) static octave_value @@ -167,3 +169,5 @@ return ovl (static_cast<double> (status), msg); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/getpwent.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/getpwent.cc Fri Aug 13 21:53:51 2021 -0400 @@ -41,6 +41,8 @@ #include "ovl.h" #include "utils.h" +OCTAVE_NAMESPACE_BEGIN + // Password file functions. (Why not?) static octave_value @@ -173,3 +175,5 @@ return ovl (static_cast<double> (status), msg); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/getrusage.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/getrusage.cc Fri Aug 13 21:53:51 2021 -0400 @@ -34,6 +34,8 @@ #include "ov.h" #include "ovl.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (getrusage, , , doc: /* -*- texinfo -*- @deftypefn {} {} getrusage () @@ -155,3 +157,5 @@ %! assert (isfield (r.utime, "sec")); %! assert (isfield (r.utime, "usec")); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/givens.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/givens.cc Fri Aug 13 21:53:51 2021 -0400 @@ -33,6 +33,8 @@ #include "error.h" #include "ovl.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (givens, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {@var{G} =} givens (@var{x}, @var{y}) @@ -190,3 +192,5 @@ %!error givens (1) %!error [a,b,c] = givens (1, 1) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/graphics.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/graphics.cc Fri Aug 13 21:53:51 2021 -0400 @@ -10624,6 +10624,8 @@ m_vertexnormals = Matrix (); } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (__update_normals__, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {} __update_normals__ (@var{h}) @@ -10691,6 +10693,8 @@ %! end_unwind_protect */ +OCTAVE_NAMESPACE_END + // --------------------------------------------------------------------- void @@ -12634,6 +12638,8 @@ // --------------------------------------------------------------------- +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (ishghandle, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {} ishghandle (@var{h}) @@ -13405,6 +13411,8 @@ \ return octave_value (make_graphics_object (#TYPE, false, args)); \ +OCTAVE_NAMESPACE_END + int calc_dimensions (const graphics_object& go) { @@ -13441,6 +13449,8 @@ return nd; } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (__calc_dimensions__, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {} __calc_dimensions__ (@var{axes}) @@ -14243,6 +14253,8 @@ return ovl (); } +OCTAVE_NAMESPACE_END + octave_value get_property_from_handle (double handle, const std::string& property, const std::string& func) @@ -14277,6 +14289,8 @@ return true; } +OCTAVE_NAMESPACE_BEGIN + static bool compare_property_values (const octave_value& ov1, const octave_value& ov2) { @@ -14772,3 +14786,5 @@ return ovl (txt_renderer.get_system_fonts ()); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/gsvd.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/gsvd.cc Fri Aug 13 21:53:51 2021 -0400 @@ -40,6 +40,7 @@ #include "ovl.h" #include "ov.h" +OCTAVE_NAMESPACE_BEGIN template <typename T> static typename octave::math::gsvd<T>::Type @@ -497,3 +498,5 @@ %! assert (class (R), "single"); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/hash.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/hash.cc Fri Aug 13 21:53:51 2021 -0400 @@ -49,6 +49,8 @@ #include "ov.h" #include "ovl.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (hash, args, , doc: /* -*- texinfo -*- @deftypefn {} {} hash (@var{hfun}, @var{str}) @@ -238,3 +240,5 @@ %!error hash ("sha1") %!error hash ("sha512") */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/help.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/help.cc Fri Aug 13 21:53:51 2021 -0400 @@ -717,6 +717,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (get_help_text, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {[@var{text}, @var{format}] =} get_help_text (@var{name}) @@ -1107,3 +1109,5 @@ return help_sys.texi_macros_file (args, nargout); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/hess.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/hess.cc Fri Aug 13 21:53:51 2021 -0400 @@ -34,6 +34,8 @@ #include "errwarn.h" #include "ovl.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (hess, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {@var{H} =} hess (@var{A}) @@ -151,3 +153,5 @@ %!error hess ([1, 2; 3, 4], 2) %!error <must be a square matrix> hess ([1, 2; 3, 4; 5, 6]) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/hex2num.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/hex2num.cc Fri Aug 13 21:53:51 2021 -0400 @@ -35,6 +35,8 @@ #include "ovl.h" #include "utils.h" +OCTAVE_NAMESPACE_BEGIN + static inline bool is_little_endian (bool is_float) { @@ -376,3 +378,5 @@ %!error num2hex (1,2,3) %!error num2hex (1j) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/input.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/input.cc Fri Aug 13 21:53:51 2021 -0400 @@ -1129,6 +1129,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (input, interp, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {@var{ans} =} input (@var{prompt}) @@ -1659,3 +1661,5 @@ return input_sys.auto_repeat_debug_command (args, nargout); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/interpreter.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/interpreter.cc Fri Aug 13 21:53:51 2021 -0400 @@ -93,6 +93,8 @@ // TRUE means we've processed all the init code and we are good to go. bool octave_initialized = false; +OCTAVE_NAMESPACE_BEGIN + DEFUN (__version_info__, args, , doc: /* -*- texinfo -*- @deftypefn {} {retval =} __version_info__ (@var{name}, @var{version}, @var{release}, @var{date}) @@ -306,6 +308,8 @@ return ovl (interp.traditional ()); } +OCTAVE_NAMESPACE_END + namespace octave { temporary_file_list::~temporary_file_list (void)
--- a/libinterp/corefcn/inv.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/inv.cc Fri Aug 13 21:53:51 2021 -0400 @@ -38,6 +38,8 @@ #include "ov-flt-cx-diag.h" #include "ov-perm.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (inv, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {@var{x} =} inv (@var{A}) @@ -265,3 +267,5 @@ */ DEFALIAS (inverse, inv); + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/jsondecode.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/jsondecode.cc Fri Aug 13 21:53:51 2021 -0400 @@ -426,6 +426,8 @@ #endif +OCTAVE_NAMESPACE_BEGIN + DEFUN (jsondecode, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{object} =} jsondecode (@var{JSON_txt}) @@ -562,3 +564,5 @@ %! fail ("jsondecode ('12-')", "parse error at offset 3"); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/jsonencode.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/jsonencode.cc Fri Aug 13 21:53:51 2021 -0400 @@ -185,7 +185,7 @@ octave_value_list args (obj); args.append (conversion_dims); - Cell sub_arrays = Fnum2cell (args)(0).cell_value (); + Cell sub_arrays = octave::Fnum2cell (args)(0).cell_value (); writer.StartArray (); @@ -368,7 +368,7 @@ octave_value_list args (obj); args.append (conversion_dims); - Cell sub_arrays = Fnum2cell (args)(0).cell_value (); + Cell sub_arrays = octave::Fnum2cell (args)(0).cell_value (); writer.StartArray (); @@ -442,6 +442,8 @@ #endif +OCTAVE_NAMESPACE_BEGIN + DEFUN (jsonencode, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{JSON_txt} =} jsonencode (@var{object}) @@ -668,3 +670,5 @@ %! "warning", 'the "PrettyPrint" option of RapidJSON was unavailable'); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/kron.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/kron.cc Fri Aug 13 21:53:51 2021 -0400 @@ -49,6 +49,8 @@ #include "error.h" #include "ovl.h" +OCTAVE_NAMESPACE_BEGIN + template <typename R, typename T> static MArray<T> kron (const MArray<R>& a, const MArray<T>& b) @@ -330,3 +332,5 @@ %! expected (6, 16) = 8; %! assert (kron (diag ([1, 2], 2), diag ([3, 4], 2)), expected); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/load-path.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/load-path.cc Fri Aug 13 21:53:51 2021 -0400 @@ -2401,6 +2401,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFUN (genpath, args, , doc: /* -*- texinfo -*- @deftypefn {} {} genpath (@var{dir}) @@ -2771,3 +2773,5 @@ return ovl (); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/load-save.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/load-save.cc Fri Aug 13 21:53:51 2021 -0400 @@ -1547,6 +1547,8 @@ load_save_sys.dump_octave_core (); } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (load, interp, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {} load file @@ -2054,3 +2056,5 @@ return load_save_sys.save_header_format_string (args, nargout); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/lookup.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/lookup.cc Fri Aug 13 21:53:51 2021 -0400 @@ -41,6 +41,8 @@ #include "ovl.h" #include "ov.h" +OCTAVE_NAMESPACE_BEGIN + static bool contains_char (const std::string& str, char c) @@ -347,3 +349,5 @@ %!assert (lookup ({"apple","lemon","orange"}, "potato"), 3) %!assert (lookup ({"orange","lemon","apple"}, "potato"), 0) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/ls-oct-text.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/ls-oct-text.cc Fri Aug 13 21:53:51 2021 -0400 @@ -457,6 +457,8 @@ return (static_cast<bool> (os)); } +OCTAVE_NAMESPACE_BEGIN + DEFUN (save_precision, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {@var{val} =} save_precision () @@ -481,3 +483,5 @@ return SET_INTERNAL_VARIABLE_WITH_LIMITS (save_precision, -1, std::numeric_limits<int>::max ()); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/lsode.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/lsode.cc Fri Aug 13 21:53:51 2021 -0400 @@ -142,6 +142,8 @@ return retval; } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (lsode, interp, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {[@var{x}, @var{istate}, @var{msg}] =} lsode (@var{fcn}, @var{x_0}, @var{t}) @@ -490,3 +492,5 @@ %!error lsode_options ("foo", 1, 2) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/lu.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/lu.cc Fri Aug 13 21:53:51 2021 -0400 @@ -37,6 +37,8 @@ #include "ov-re-sparse.h" #include "ov-cx-sparse.h" +OCTAVE_NAMESPACE_BEGIN + template <typename MT> static octave_value get_lu_l (const octave::math::lu<MT>& fact) @@ -832,3 +834,5 @@ %! assert (norm (vec (triu (U)-U), Inf) == 0); %! assert (norm (vec (P'*L*U - single (Ac) - single (uc)*single (vc).'), Inf) < norm (single (Ac))*1e1*eps ("single")); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/mappers.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/mappers.cc Fri Aug 13 21:53:51 2021 -0400 @@ -37,6 +37,8 @@ #include "error.h" #include "variables.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (abs, args, , doc: /* -*- texinfo -*- @deftypefn {} {} abs (@var{z}) @@ -2257,3 +2259,5 @@ */ DEFALIAS (gammaln, lgamma); + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/matrix_type.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/matrix_type.cc Fri Aug 13 21:53:51 2021 -0400 @@ -39,6 +39,8 @@ #include "MatrixType.h" #include "oct-locbuf.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (matrix_type, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{type} =} matrix_type (@var{A}) @@ -560,3 +562,5 @@ %! a = matrix_type (ones (10,10), "Singular"); %! assert (matrix_type (a), "Singular"); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/max.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/max.cc Fri Aug 13 21:53:51 2021 -0400 @@ -44,6 +44,8 @@ #include "ov-re-sparse.h" #include "ov-cx-sparse.h" +OCTAVE_NAMESPACE_BEGIN + template <typename ArrayType> static octave_value_list do_minmax_red_op (const octave_value& arg, @@ -1097,3 +1099,5 @@ %!error cummax () %!error cummax (1, 2, 3) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/mgorth.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/mgorth.cc Fri Aug 13 21:53:51 2021 -0400 @@ -32,6 +32,8 @@ #include "error.h" #include "errwarn.h" +OCTAVE_NAMESPACE_BEGIN + template <typename ColumnVector, typename Matrix, typename RowVector> static void do_mgorth (ColumnVector& x, const Matrix& V, RowVector& h) @@ -143,3 +145,5 @@ %! endfor %! assert (a' * a, eye (5), 1e10); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/nproc.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/nproc.cc Fri Aug 13 21:53:51 2021 -0400 @@ -32,6 +32,8 @@ #include "defun.h" #include "error.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (nproc, args, , doc: /* -*- texinfo -*- @deftypefn {} {} nproc () @@ -106,3 +108,5 @@ %!error nproc ("no_valid_option") */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/oct-hist.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/oct-hist.cc Fri Aug 13 21:53:51 2021 -0400 @@ -579,6 +579,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (edit_history, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {} edit_history @@ -924,3 +926,5 @@ return retval; } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/ordqz.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/ordqz.cc Fri Aug 13 21:53:51 2021 -0400 @@ -53,6 +53,8 @@ #endif +OCTAVE_NAMESPACE_BEGIN + DEFUN (ordqz, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {[@var{AR}, @var{BR}, @var{QR}, @var{ZR}] =} ordqz (@var{AA}, @var{BB}, @var{Q}, @var{Z}, @var{keyword}) @@ -216,7 +218,7 @@ F77_INT b_nc = octave::to_f77_int (args(1).columns ()); if (nn != b_nc || nn != b_nr) - err_nonconformant (); + ::err_nonconformant (); Matrix bb; ComplexMatrix cbb; @@ -231,7 +233,7 @@ F77_INT q_nc = octave::to_f77_int (args(2).columns ()); if (nn != q_nc || nn != q_nr) - err_nonconformant (); + ::err_nonconformant (); Matrix qq; ComplexMatrix cqq; @@ -246,7 +248,7 @@ F77_INT z_nc = octave::to_f77_int (args(3).columns ()); if (nn != z_nc || nn != z_nr) - err_nonconformant (); + ::err_nonconformant (); Matrix zz; ComplexMatrix czz; @@ -676,3 +678,5 @@ %! ordqz (AA, eye (2), eye (2), eye (2), "udi"); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/ordschur.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/ordschur.cc Fri Aug 13 21:53:51 2021 -0400 @@ -32,6 +32,8 @@ #include "lo-lapack-proto.h" #include "ovl.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (ordschur, args, , doc: /* -*- texinfo -*- @deftypefn {} {[@var{UR}, @var{SR}] =} ordschur (@var{U}, @var{S}, @var{select}) @@ -222,3 +224,5 @@ %! assert (diag (T)(3:4), diag (TS)(1:2), sqrt (eps ("single"))); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/pager.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/pager.cc Fri Aug 13 21:53:51 2021 -0400 @@ -504,6 +504,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (diary, interp, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {} diary @@ -752,3 +754,5 @@ return output_sys.PAGER_FLAGS (args, nargout); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/pinv.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/pinv.cc Fri Aug 13 21:53:51 2021 -0400 @@ -38,6 +38,8 @@ #include "ov-flt-cx-diag.h" #include "ov-perm.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (pinv, args, , doc: /* -*- texinfo -*- @deftypefn {} {} pinv (@var{x}) @@ -205,3 +207,5 @@ %!assert (pinv (complex (single (0),0)), single (0)) %!assert (pinv (complex (single ([0,0,0]), [0,0,0])), single ([0; 0; 0])) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/pr-flt-fmt.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/pr-flt-fmt.cc Fri Aug 13 21:53:51 2021 -0400 @@ -48,6 +48,8 @@ Voutput_precision = prec; } +OCTAVE_NAMESPACE_BEGIN + DEFUN (output_precision, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {@var{val} =} output_precision () @@ -69,3 +71,5 @@ { return SET_INTERNAL_VARIABLE_WITH_LIMITS (output_precision, 0, 16); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/pr-output.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/pr-output.cc Fri Aug 13 21:53:51 2021 -0400 @@ -3194,6 +3194,8 @@ panic_impossible (); } +OCTAVE_NAMESPACE_BEGIN + DEFUN (rats, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{s} =} rats (@var{x}) @@ -4162,3 +4164,5 @@ { return SET_INTERNAL_VARIABLE (split_long_rows); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/psi.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/psi.cc Fri Aug 13 21:53:51 2021 -0400 @@ -35,6 +35,8 @@ #include "lo-specfun.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (psi, args, , doc: /* -*- texinfo -*- @deftypefn {} {} psi (@var{z}) @@ -232,3 +234,5 @@ %!error <Z must be real value for polygamma> psi (5, 5i) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/qr.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/qr.cc Fri Aug 13 21:53:51 2021 -0400 @@ -41,6 +41,8 @@ #include "ov.h" #include "ovl.h" +OCTAVE_NAMESPACE_BEGIN + /* ## Restore all rand* "state" values %!function restore_rand_states (state) @@ -2034,3 +2036,5 @@ %! assert (norm (vec (triu (R) - R), Inf) == 0); %! assert (norm (vec (Q*R - AA(:,p)), Inf) < norm (AA)*1e1*eps ("single")); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/quad.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/quad.cc Fri Aug 13 21:53:51 2021 -0400 @@ -127,6 +127,8 @@ return retval; } +OCTAVE_NAMESPACE_BEGIN + DEFMETHODX ("quad", Fquad, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{q} =} quad (@var{f}, @var{a}, @var{b}) @@ -456,3 +458,5 @@ %!error quad_options (1, 2, 3) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/quadcc.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/quadcc.cc Fri Aug 13 21:53:51 2021 -0400 @@ -1484,6 +1484,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + // The actual integration routine. DEFMETHOD (quadcc, interp, args, , @@ -2255,3 +2257,5 @@ %!error <relative tolerance must be .=0> (quadcc (@sin, 0, pi, [1, -1])) %!error <SING.* must be .* real values> (quadcc (@sin, 0, pi, 1e-6, [ i ])) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/qz.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/qz.cc Fri Aug 13 21:53:51 2021 -0400 @@ -57,6 +57,8 @@ # include "pr-output.h" #endif +OCTAVE_NAMESPACE_BEGIN + // FIXME: Matlab does not produce lambda as the first output argument. // Compatibility problem? @@ -275,7 +277,7 @@ F77_INT b_nc = octave::to_f77_int (args(1).columns ()); if (nn != b_nc || nn != b_nr) - err_nonconformant (); + ::err_nonconformant (); Matrix bb; ComplexMatrix cbb; @@ -950,3 +952,5 @@ %! assert (abs (lambda(1) < 1)); %! assert (all (abs (lambda(2:4)) >= 1)); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/rand.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/rand.cc Fri Aug 13 21:53:51 2021 -0400 @@ -44,6 +44,8 @@ #include "utils.h" #include "ov-re-mat.h" +OCTAVE_NAMESPACE_BEGIN + /* %% Restore all rand* "seed" and "state" values in order, so that the %% new "state" algorithm remains active after these tests complete. @@ -1220,3 +1222,5 @@ %! assert (length (unique (p)), 30); %! endfor */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/rcond.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/rcond.cc Fri Aug 13 21:53:51 2021 -0400 @@ -33,6 +33,8 @@ #include "ovl.h" #include "utils.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (rcond, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{c} =} rcond (@var{A}) @@ -106,3 +108,5 @@ %!assert (rcond (sx*i) < eps ('single')) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/regexp.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/regexp.cc Fri Aug 13 21:53:51 2021 -0400 @@ -46,6 +46,8 @@ #include "ovl.h" #include "utils.h" +OCTAVE_NAMESPACE_BEGIN + // Replace backslash escapes in a string with the real values. We need // two special functions instead of the one in utils.cc because the set // of escape sequences used for regexp patterns and replacement strings @@ -1588,3 +1590,5 @@ %!test <*52810> %! assert (strcmp (regexprep ("\nabc", "^(\t*)(abc)$", "$1$2", "lineanchors"), "\nabc")) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/schur.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/schur.cc Fri Aug 13 21:53:51 2021 -0400 @@ -37,6 +37,8 @@ #include "ovl.h" #include "utils.h" +OCTAVE_NAMESPACE_BEGIN + template <typename Matrix> static octave_value mark_upper_triangular (const Matrix& a) @@ -342,3 +344,5 @@ %! [U, T] = rsf2csf (u,t); %! assert (U * T * U', A, 1e-14); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/settings.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/settings.cc Fri Aug 13 21:53:51 2021 -0400 @@ -56,6 +56,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (__display_tokens__, interp, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {} __display_tokens__ () @@ -94,3 +96,5 @@ return stgs.lexer_debug_flag (args, nargout); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/sighandlers.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/sighandlers.cc Fri Aug 13 21:53:51 2021 -0400 @@ -488,6 +488,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFUN (SIG, args, , doc: /* -*- texinfo -*- @deftypefn {} {} SIG () @@ -635,3 +637,5 @@ %!error sigterm_dumps_octave_core (1, 2) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/sparse.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/sparse.cc Fri Aug 13 21:53:51 2021 -0400 @@ -42,6 +42,8 @@ #include "ov-cx-sparse.h" #include "ov-bool-sparse.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (issparse, args, , doc: /* -*- texinfo -*- @deftypefn {} {} issparse (@var{x}) @@ -324,3 +326,5 @@ %!error <M, N, and NZ must be non-negative> spalloc (1, -1, 1) %!error <M, N, and NZ must be non-negative> spalloc (1, 1, -1) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/spparms.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/spparms.cc Fri Aug 13 21:53:51 2021 -0400 @@ -35,6 +35,8 @@ #include "oct-spparms.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (spparms, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} { } spparms () @@ -199,3 +201,5 @@ %!error spparms ("ths_rel", "hello") %!error <KEY not found> spparms ("UNKNOWN_KEY", 1) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/sqrtm.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/sqrtm.cc Fri Aug 13 21:53:51 2021 -0400 @@ -38,6 +38,8 @@ #include "utils.h" #include "xnorm.h" +OCTAVE_NAMESPACE_BEGIN + template <typename Matrix> static void sqrtm_utri_inplace (Matrix& T) @@ -275,3 +277,5 @@ %! assert (y, z); %! assert (err, 0); # Yes, this one has to hold exactly */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/stream-euler.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/stream-euler.cc Fri Aug 13 21:53:51 2021 -0400 @@ -53,6 +53,8 @@ #include "error.h" #include "ovl.h" +OCTAVE_NAMESPACE_BEGIN + // Coordinates of a point in C-Space (unit square mesh) typedef struct @@ -533,3 +535,4 @@ return streameuler3d_internal (args, "__streameuler3d__"); } +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/strfind.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/strfind.cc Fri Aug 13 21:53:51 2021 -0400 @@ -43,6 +43,8 @@ #include "unwind-prot.h" #include "utils.h" +OCTAVE_NAMESPACE_BEGIN + // This allows safe indexing with char. // In C++, char may be (and often is) signed! #define ORD(ch) static_cast<unsigned char>(ch) @@ -516,3 +518,5 @@ %!error <PTN and REP arguments must be strings> strrep ("A", 1.0, "C") %!error <PTN and REP arguments must be strings> strrep ("A", "B", 1.0) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/strfns.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/strfns.cc Fri Aug 13 21:53:51 2021 -0400 @@ -48,6 +48,8 @@ #include "oct-string.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (char, args, , doc: /* -*- texinfo -*- @deftypefn {} {} char (@var{x}) @@ -1254,3 +1256,5 @@ %!error list_in_columns (["abc", "def"], 20, " ", 3) %!error <list_in_columns: WIDTH must be an integer> list_in_columns (["abc", "def"], "a") */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/sub2ind.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/sub2ind.cc Fri Aug 13 21:53:51 2021 -0400 @@ -36,6 +36,7 @@ #include "errwarn.h" #include "ovl.h" +OCTAVE_NAMESPACE_BEGIN static dim_vector get_dim_vector (const octave_value& val, const char *name) @@ -317,3 +318,5 @@ %!error <index out of range> ind2sub ([2, 2, 2], 1:9) %!error <invalid index> ind2sub ([2, 2, 2], -1:8) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/svd.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/svd.cc Fri Aug 13 21:53:51 2021 -0400 @@ -37,6 +37,8 @@ #include "utils.h" #include "variables.h" +OCTAVE_NAMESPACE_BEGIN + static std::string Vsvd_driver = "gesvd"; template <typename T> @@ -458,3 +460,5 @@ %! assert (S1, S3, 6*eps); %! assert (V1, V3 .* z, 100*eps); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/sylvester.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/sylvester.cc Fri Aug 13 21:53:51 2021 -0400 @@ -32,6 +32,8 @@ #include "errwarn.h" #include "ovl.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (sylvester, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{X} =} sylvester (@var{A}, @var{B}, @var{C}) @@ -99,7 +101,7 @@ if (b_nr != b_nc) err_square_matrix_required ("sylvester", "B"); if (a_nr != c_nr || b_nr != c_nc) - err_nonconformant (); + ::err_nonconformant (); if (isfloat) { @@ -168,3 +170,5 @@ %!error <B must be a square matrix> sylvester (ones (2,2), ones (2,3), ones (2,2)) %!error <nonconformant matrices> sylvester (ones (2,2), ones (2,2), ones (3,3)) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/symbfact.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/symbfact.cc Fri Aug 13 21:53:51 2021 -0400 @@ -48,6 +48,8 @@ #include "parse.h" #include "utils.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (symbfact, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {[@var{count}, @var{h}, @var{parent}, @var{post}, @var{R}] =} symbfact (@var{S}) @@ -429,3 +431,5 @@ %! fail ("symbfact (sparse ([1, 2; 3, 4; 5, 6]))", "S must be a square matrix"); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/symrcm.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/symrcm.cc Fri Aug 13 21:53:51 2021 -0400 @@ -72,6 +72,8 @@ #include "ov.h" #include "ovl.h" +OCTAVE_NAMESPACE_BEGIN + // A node struct for the Cuthill-McKee algorithm struct CMK_Node { @@ -703,3 +705,5 @@ // increment all indices, since Octave is not C return ovl (P+1); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/symtab.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/symtab.cc Fri Aug 13 21:53:51 2021 -0400 @@ -815,6 +815,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (__dump_symtab_info__, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {} __dump_symtab_info__ () @@ -940,3 +942,6 @@ %! clear bar; %! assert (! strcmp (which ("bar"), "")); */ + +OCTAVE_NAMESPACE_END +
--- a/libinterp/corefcn/syscalls.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/syscalls.cc Fri Aug 13 21:53:51 2021 -0400 @@ -60,6 +60,8 @@ #include "utils.h" #include "variables.h" +OCTAVE_NAMESPACE_BEGIN + static octave_scalar_map mk_stat_map (const octave::sys::base_file_stat& fs) { @@ -1727,3 +1729,5 @@ { return const_value (args, octave::sys::wcontinue ()); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/sysdep.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/sysdep.cc Fri Aug 13 21:53:51 2021 -0400 @@ -190,6 +190,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFUN (__open_with_system_app__, args, , doc: /* -*- texinfo -*- @deftypefn {} {} __open_with_system_app__ (@var{file}) @@ -361,6 +363,8 @@ #endif } +OCTAVE_NAMESPACE_END + namespace octave { #if defined (__MINGW32__) @@ -805,6 +809,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFUN (clc, , , doc: /* -*- texinfo -*- @deftypefn {} {} clc () @@ -909,6 +915,8 @@ ## Test for unsetenv is in setenv test */ +OCTAVE_NAMESPACE_END + #if defined (OCTAVE_USE_WINDOWS_API) namespace octave @@ -1002,6 +1010,8 @@ #endif +OCTAVE_NAMESPACE_BEGIN + DEFUN (winqueryreg, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{value} =} winqueryreg (@var{rootkey}, @var{subkey}, @var{valuename}) @@ -1486,3 +1496,5 @@ { return ovl (octave::sys::lapack_version ()); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/time.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/time.cc Fri Aug 13 21:53:51 2021 -0400 @@ -36,6 +36,8 @@ #include "ov.h" #include "ovl.h" +OCTAVE_NAMESPACE_BEGIN + // Date and time functions. static octave_scalar_map @@ -511,3 +513,5 @@ %!error strptime () */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/toplev.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/toplev.cc Fri Aug 13 21:53:51 2021 -0400 @@ -72,6 +72,8 @@ # define SHELL_PATH "/bin/sh" #endif +OCTAVE_NAMESPACE_BEGIN + #define STRINGIFY(s) STRINGIFY1(s) #define STRINGIFY1(s) #s @@ -646,6 +648,8 @@ %!error __octave_config_info__ (1, 2) */ +OCTAVE_NAMESPACE_END + #if defined (__GNUG__) && defined (DEBUG_NEW_DELETE) int debug_new_delete = 0;
--- a/libinterp/corefcn/tril.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/tril.cc Fri Aug 13 21:53:51 2021 -0400 @@ -39,6 +39,8 @@ #include "error.h" #include "ovl.h" +OCTAVE_NAMESPACE_BEGIN + // The bulk of the work. template <typename T> static Array<T> @@ -480,3 +482,5 @@ %!error tril () %!error triu () */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/tsearch.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/tsearch.cc Fri Aug 13 21:53:51 2021 -0400 @@ -35,6 +35,8 @@ #include "error.h" #include "ovl.h" +OCTAVE_NAMESPACE_BEGIN + inline double max (double a, double b, double c) { if (a < b) @@ -175,3 +177,5 @@ %!error tsearch () */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/typecast.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/typecast.cc Fri Aug 13 21:53:51 2021 -0400 @@ -38,6 +38,8 @@ #include "ovl.h" #include "unwind-prot.h" +OCTAVE_NAMESPACE_BEGIN + static dim_vector get_vec_dims (const dim_vector& old_dims, octave_idx_type n) { @@ -589,3 +591,5 @@ %!error bitunpack (1, 2) %!error bitunpack ({}) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/urlwrite.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/urlwrite.cc Fri Aug 13 21:53:51 2021 -0400 @@ -52,6 +52,8 @@ #include "unwind-prot.h" #include "url-handle-manager.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN (urlwrite, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {} urlwrite (@var{url}, @var{localfile}) @@ -354,3 +356,5 @@ return ovl (content.str ()); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/utils.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/utils.cc Fri Aug 13 21:53:51 2021 -0400 @@ -92,6 +92,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFUN (isvarname, args, , doc: /* -*- texinfo -*- @deftypefn {} {} isvarname (@var{name}) @@ -131,6 +133,8 @@ %!error isvarname ("foo", "bar") */ +OCTAVE_NAMESPACE_END + namespace octave { bool @@ -255,6 +259,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFUN (__make_valid_name__, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{varname} =} __make_valid_name__ (@var{str}) @@ -292,6 +298,8 @@ error ("makeValidName: STR must be a string or cellstr"); } +OCTAVE_NAMESPACE_END + namespace octave { // Return TRUE if F and G are both names for the same file. @@ -302,6 +310,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFUN (is_same_file, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{same} =} is_same_file (@var{filepath1}, @var{filepath2}) @@ -412,6 +422,7 @@ %!error <arrays .* must be the same size> is_same_file ({"1", "2"}, {"1"; "2"}) */ +OCTAVE_NAMESPACE_END namespace octave { @@ -556,6 +567,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (file_in_loadpath, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{fname} =} file_in_loadpath (@var{file}) @@ -697,6 +710,8 @@ %!error file_in_path (path (), "plot.m", "bar") */ +OCTAVE_NAMESPACE_END + namespace octave { std::string file_in_path (const std::string& name, const std::string& suffix) @@ -938,6 +953,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFUN (do_string_escapes, args, , doc: /* -*- texinfo -*- @deftypefn {} {} do_string_escapes (@var{string}) @@ -994,6 +1011,8 @@ %!warning <unrecognized escape sequence> do_string_escapes ('\G'); */ +OCTAVE_NAMESPACE_END + namespace octave { const char * undo_string_escape (char c) @@ -1054,6 +1073,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFUN (undo_string_escapes, args, , doc: /* -*- texinfo -*- @deftypefn {} {} undo_string_escapes (@var{s}) @@ -1322,6 +1343,8 @@ %!error errno_list ("foo") */ +OCTAVE_NAMESPACE_END + namespace octave { static void check_dimensions (octave_idx_type& nr, octave_idx_type& nc, @@ -1646,6 +1669,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (isindex, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {} isindex (@var{ind}) @@ -1704,6 +1729,8 @@ %!error isindex (1:3, 2, 3) */ +OCTAVE_NAMESPACE_END + namespace octave { octave_value_list @@ -1789,6 +1816,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFUN (isstudent, args, , doc: /* -*- texinfo -*- @deftypefn {} {} isstudent () @@ -1809,3 +1838,5 @@ %!error isstudent (1) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/corefcn/variables.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/corefcn/variables.cc Fri Aug 13 21:53:51 2021 -0400 @@ -160,6 +160,8 @@ return retval; } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (isglobal, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {} isglobal (@var{name}) @@ -354,12 +356,14 @@ return 0; } +OCTAVE_NAMESPACE_END + int symbol_exist (const std::string& name, const std::string& type) { octave::interpreter& interp = octave::__get_interpreter__ ("symbol_exist"); - return symbol_exist (interp, name, type); + return octave::symbol_exist (interp, name, type); } @@ -390,6 +394,8 @@ return nm; } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (exist, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{c} =} exist (@var{name}) @@ -575,6 +581,8 @@ */ +OCTAVE_NAMESPACE_END + // Variable values. static bool @@ -884,6 +892,8 @@ return retval; } +OCTAVE_NAMESPACE_BEGIN + // NOTE: Calling Fmlock directly (without an associated stack frame) // will probably not do what you expect because it will lock the calling // function. You should use interpreter::mlock directly if you want to @@ -1424,8 +1434,12 @@ %!error clear -f -g */ +OCTAVE_NAMESPACE_END + static std::string Vmissing_function_hook = "__unimplemented__"; +OCTAVE_NAMESPACE_BEGIN + DEFUN (missing_function_hook, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {@var{val} =} missing_function_hook () @@ -1443,6 +1457,8 @@ return SET_INTERNAL_VARIABLE (missing_function_hook); } +OCTAVE_NAMESPACE_END + std::string maybe_missing_function_hook (const std::string& name) { @@ -1477,6 +1493,8 @@ return ""; } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (__varval__, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{value} =} __varval__ (@var{name}) @@ -1556,3 +1574,5 @@ { return SET_INTERNAL_VARIABLE (missing_component_hook); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/dldfcn/__delaunayn__.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/dldfcn/__delaunayn__.cc Fri Aug 13 21:53:51 2021 -0400 @@ -69,6 +69,8 @@ char qh_version[] = "__delaunayn__.oct 2007-08-21"; # endif +OCTAVE_NAMESPACE_BEGIN + static void free_qhull_memory (qhT *qh) { @@ -246,3 +248,5 @@ ## No test needed for internal helper function. %!assert (1) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/dldfcn/__fltk_uigetfile__.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/dldfcn/__fltk_uigetfile__.cc Fri Aug 13 21:53:51 2021 -0400 @@ -54,6 +54,8 @@ #include "errwarn.h" #include "ov.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN_DLD (__fltk_uigetfile__, args, , doc: /* -*- texinfo -*- @deftypefn {} {} __fltk_uigetfile__ (@dots{}) @@ -160,3 +162,5 @@ ## No test needed for internal helper function. %!assert (1) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/dldfcn/__glpk__.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/dldfcn/__glpk__.cc Fri Aug 13 21:53:51 2021 -0400 @@ -304,6 +304,8 @@ #endif +OCTAVE_NAMESPACE_BEGIN + #define OCTAVE_GLPK_GET_REAL_PARAM(NAME, VAL) \ do \ { \ @@ -639,3 +641,5 @@ ## No test needed for internal helper function. %!assert (1) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/dldfcn/__init_gnuplot__.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/dldfcn/__init_gnuplot__.cc Fri Aug 13 21:53:51 2021 -0400 @@ -182,17 +182,17 @@ octave_value_list args; Matrix fids = pstream.matrix_value (); - Ffputs (m_interpreter, ovl (fids(0), "\nquit;\n")); + octave::Ffputs (m_interpreter, ovl (fids(0), "\nquit;\n")); - Ffflush (m_interpreter, ovl (fids(0))); - Fpclose (m_interpreter, ovl (fids(0))); + octave::Ffflush (m_interpreter, ovl (fids(0))); + octave::Fpclose (m_interpreter, ovl (fids(0))); if (fids.numel () > 1) { - Fpclose (m_interpreter, ovl (fids(1))); + octave::Fpclose (m_interpreter, ovl (fids(1))); if (fids.numel () > 2) - Fwaitpid (ovl (fids(2))); + octave::Fwaitpid (ovl (fids(2))); } } } @@ -244,6 +244,8 @@ return retval; } +OCTAVE_NAMESPACE_BEGIN + // Initialize the gnuplot graphics toolkit. DEFMETHOD_DLD (__init_gnuplot__, interp, , , @@ -280,3 +282,5 @@ ## No test needed for internal helper function. %!assert (1) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/dldfcn/__ode15__.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/dldfcn/__ode15__.cc Fri Aug 13 21:53:51 2021 -0400 @@ -1246,6 +1246,8 @@ #endif +OCTAVE_NAMESPACE_BEGIN + DEFUN_DLD (__ode15__, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{t}, @var{y} =} __ode15__ (@var{fun}, @var{tspan}, @var{y0}, @var{yp0}, @var{options}, @var{num_event_args}) @@ -1321,3 +1323,5 @@ ## No test needed for internal helper function. %!assert (1) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/dldfcn/__voronoi__.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/dldfcn/__voronoi__.cc Fri Aug 13 21:53:51 2021 -0400 @@ -64,6 +64,8 @@ char qh_version[] = "__voronoi__.oct 2007-07-24"; # endif +OCTAVE_NAMESPACE_BEGIN + static void free_qhull_memory (qhT *qh) { @@ -343,3 +345,5 @@ ## No test needed for internal helper function. %!assert (1) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/dldfcn/audiodevinfo.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/dldfcn/audiodevinfo.cc Fri Aug 13 21:53:51 2021 -0400 @@ -52,8 +52,12 @@ #include "parse.h" #if defined (HAVE_PORTAUDIO) - -#include <portaudio.h> +# include <portaudio.h> +#endif + +#if defined (HAVE_PORTAUDIO) + +OCTAVE_NAMESPACE_BEGIN PaSampleFormat bits_to_format (int bits) @@ -2841,3 +2845,5 @@ "audio playback and recording through PortAudio"); #endif } + +OCTAVE_NAMESPACE_END
--- a/libinterp/dldfcn/audioread.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/dldfcn/audioread.cc Fri Aug 13 21:53:51 2021 -0400 @@ -49,6 +49,8 @@ # include <sndfile.h> #endif +OCTAVE_NAMESPACE_BEGIN + DEFUN_DLD (audioread, args, , doc: /* -*- texinfo -*- @deftypefn {} {[@var{y}, @var{fs}] =} audioread (@var{filename}) @@ -780,3 +782,5 @@ return octave_value_list (); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/dldfcn/convhulln.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/dldfcn/convhulln.cc Fri Aug 13 21:53:51 2021 -0400 @@ -86,6 +86,8 @@ #endif +OCTAVE_NAMESPACE_BEGIN + DEFUN_DLD (convhulln, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {@var{h} =} convhulln (@var{pts}) @@ -329,3 +331,5 @@ %! h = convhulln (triangle); %! assert (size (h), [3 2]); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/dldfcn/fftw.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/dldfcn/fftw.cc Fri Aug 13 21:53:51 2021 -0400 @@ -41,6 +41,8 @@ #include "errwarn.h" #include "ov.h" +OCTAVE_NAMESPACE_BEGIN + DEFUN_DLD (fftw, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{method} =} fftw ("planner") @@ -398,3 +400,5 @@ %!error fftw ("threads", "invalid") %!error fftw ("threads", -3) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/dldfcn/gzip.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/dldfcn/gzip.cc Fri Aug 13 21:53:51 2021 -0400 @@ -596,6 +596,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFUN_DLD (gzip, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{filelist} =} gzip (@var{files}) @@ -853,3 +855,5 @@ %!endfunction %!test run_test_function (@test_save_to_dir) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/mk-builtins.pl Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/mk-builtins.pl Fri Aug 13 21:53:51 2021 -0400 @@ -116,10 +116,9 @@ #include \"ovl.h\" -namespace octave -{ - class interpreter; -} +OCTAVE_NAMESPACE_BEGIN + +class interpreter; "; @@ -149,7 +148,38 @@ "; } - print "#endif\n"; + print "\nOCTAVE_NAMESPACE_END\n"; + + print "\n#if defined (OCTAVE_DECLARE_DEPRECATED_SYMBOLS)\n\n"; + + foreach $name (sort (@method_names)) + { + print "OCTAVE_DEPRECATED (7, \"use 'octave::$name' instead\") +inline octave_value_list +$name (octave::interpreter& interp, const octave_value_list& args = octave_value_list (), int nargout = 0) +{ + return octave::$name (interp, args, nargout); +} + +"; + } + + foreach $name (sort (@fcn_names)) + { + print "OCTAVE_DEPRECATED (7, \"use 'octave::$name' instead\") +inline octave_value_list +$name (const octave_value_list& args = octave_value_list (), int nargout = 0) +{ + return octave::$name (args, nargout); +} + +"; + } + + ## end OCTAVE_DECLARE_DEPRECATED_SYMBOLS block + print "\n\n#endif\n"; + + print "\n#endif\n"; } elsif ($make_source) {
--- a/libinterp/octave-value/ov-base.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/octave-value/ov-base.cc Fri Aug 13 21:53:51 2021 -0400 @@ -1545,6 +1545,8 @@ INSTALL_WIDENOP_TI (ti, octave_base_value, octave_cell, cell_conv); } +OCTAVE_NAMESPACE_BEGIN + DEFUN (sparse_auto_mutate, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {@var{val} =} sparse_auto_mutate () @@ -1588,3 +1590,5 @@ %! assert (typeinfo (s), "matrix"); %! sparse_auto_mutate (false); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/octave-value/ov-bool-mat.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/octave-value/ov-bool-mat.cc Fri Aug 13 21:53:51 2021 -0400 @@ -582,6 +582,8 @@ return retval; } +OCTAVE_NAMESPACE_BEGIN + DEFUN (logical, args, , doc: /* -*- texinfo -*- @deftypefn {} {} logical (@var{x}) @@ -630,3 +632,5 @@ %! assert (logical (eye (1, c{i})), s); %! endfor */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/octave-value/ov-cell.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/octave-value/ov-cell.cc Fri Aug 13 21:53:51 2021 -0400 @@ -1219,6 +1219,8 @@ return retval; } +OCTAVE_NAMESPACE_BEGIN + DEFUN (iscell, args, , doc: /* -*- texinfo -*- @deftypefn {} {} iscell (@var{x}) @@ -1412,6 +1414,8 @@ %! assert (fieldnames (s), keys'); */ +OCTAVE_NAMESPACE_END + mxArray * octave_cell::as_mxArray (bool interleaved) const {
--- a/libinterp/octave-value/ov-class.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/octave-value/ov-class.cc Fri Aug 13 21:53:51 2021 -0400 @@ -1722,6 +1722,8 @@ return true; } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (class, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{classname} =} class (@var{obj}) @@ -2156,3 +2158,5 @@ return octave_value (new octave_inline (args(0).map_value ())); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/octave-value/ov-classdef.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/octave-value/ov-classdef.cc Fri Aug 13 21:53:51 2021 -0400 @@ -586,6 +586,8 @@ return false; } +OCTAVE_NAMESPACE_BEGIN + DEFUN (__meta_get_package__, args, , doc: /* -*- texinfo -*- @deftypefn {} {} __meta_get_package__ () @@ -757,6 +759,8 @@ return ovl (Cell (sv)); } +OCTAVE_NAMESPACE_END + /* ;;; Local Variables: *** ;;; mode: C++ ***
--- a/libinterp/octave-value/ov-fcn-handle.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/octave-value/ov-fcn-handle.cc Fri Aug 13 21:53:51 2021 -0400 @@ -3407,6 +3407,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFUN (functions, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{s} =} functions (@var{fcn_handle}) @@ -3637,3 +3639,5 @@ %! x = [1,2;3,4]; %! assert (__f (@(i) x(:,i), 1), [1;3]); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/octave-value/ov-java.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/octave-value/ov-java.cc Fri Aug 13 21:53:51 2021 -0400 @@ -2205,7 +2205,7 @@ ovl(0) = (idx.front ())(0); auto it = idx.begin (); ovl.append (*++it); - retval = FjavaMethod (ovl, 1); + retval = octave::FjavaMethod (ovl, 1); skip++; } else @@ -2214,7 +2214,7 @@ count++; ovl(0) = octave_value (this); ovl(1) = (idx.front ())(0); - retval = F__java_get__ (ovl, 1); + retval = octave::F__java_get__ (ovl, 1); } break; @@ -2270,7 +2270,7 @@ ovl(0) = octave_value (this); ovl(1) = (idx.front ())(0); ovl(2) = rhs; - F__java_set__ (ovl); + octave::F__java_set__ (ovl); count++; retval = octave_value (this); @@ -3029,6 +3029,8 @@ #endif } +OCTAVE_NAMESPACE_BEGIN + // DEFUN blocks below must be outside of HAVE_JAVA block so that documentation // strings are always available, even when functions are not. @@ -3592,3 +3594,5 @@ %! frame.setResizable (true); %! assert (frame.isResizable ()); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/octave-value/ov-null-mat.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/octave-value/ov-null-mat.cc Fri Aug 13 21:53:51 2021 -0400 @@ -96,6 +96,8 @@ octave_char_matrix_sq_str::static_type_id ()); } +OCTAVE_NAMESPACE_BEGIN + DEFUN (isnull, args, , doc: /* -*- texinfo -*- @deftypefn {} {} isnull (@var{x}) @@ -155,3 +157,5 @@ %! x = []; %! assert (isnull (x), false); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/octave-value/ov-oncleanup.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/octave-value/ov-oncleanup.cc Fri Aug 13 21:53:51 2021 -0400 @@ -202,6 +202,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFUN (onCleanup, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{obj} =} onCleanup (@var{function}) @@ -233,3 +235,5 @@ %! warning (old_wstate); %! end_unwind_protect */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/octave-value/ov-struct.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/octave-value/ov-struct.cc Fri Aug 13 21:53:51 2021 -0400 @@ -1710,6 +1710,8 @@ return false; } +OCTAVE_NAMESPACE_BEGIN + DEFUN (struct, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{s} =} struct () @@ -2245,3 +2247,5 @@ { return SET_INTERNAL_VARIABLE (print_struct_array_contents); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/octave-value/ov-typeinfo.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/octave-value/ov-typeinfo.cc Fri Aug 13 21:53:51 2021 -0400 @@ -900,6 +900,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (typeinfo, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {} typeinfo () @@ -1039,3 +1041,5 @@ return ovl (type_info.installed_type_info ()); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/octave-value/ov-usr-fcn.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/octave-value/ov-usr-fcn.cc Fri Aug 13 21:53:51 2021 -0400 @@ -649,6 +649,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (nargin, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {} nargin () @@ -1030,3 +1032,5 @@ %! [~, b] = try_isargout2 ({try_isargout, try_isargout}, rand); %! assert (b, {0, 1, {-1, -1}}); */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/octave-value/ov.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/octave-value/ov.cc Fri Aug 13 21:53:51 2021 -0400 @@ -1282,6 +1282,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFUN (double, args, , doc: /* -*- texinfo -*- @deftypefn {} {} double (@var{x}) @@ -1543,6 +1545,8 @@ %!assert (uint64 (-2^65), uint64 (0)) */ +OCTAVE_NAMESPACE_END + octave_value octave_value::single_subsref (const std::string& type, const octave_value_list& idx) @@ -3324,6 +3328,8 @@ octave_java::register_type (ti); } +OCTAVE_NAMESPACE_BEGIN + DEFUN (sizeof, args, , doc: /* -*- texinfo -*- @deftypefn {} {} sizeof (@var{val}) @@ -3738,3 +3744,5 @@ %!assert (typeinfo (__test_dr__ (false)), "range") %!assert (typeinfo (__test_dr__ (true)), "matrix") */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/octave.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/octave.cc Fri Aug 13 21:53:51 2021 -0400 @@ -428,6 +428,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFUN (isguirunning, args, , doc: /* -*- texinfo -*- @deftypefn {} {} isguirunning () @@ -541,3 +543,5 @@ %!assert (ischar (program_name ())) %!error program_name (1) */ + +OCTAVE_NAMESPACE_END
--- a/libinterp/parse-tree/lex.ll Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/parse-tree/lex.ll Fri Aug 13 21:53:51 2021 -0400 @@ -2109,6 +2109,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFUN (iskeyword, args, , doc: /* -*- texinfo -*- @deftypefn {} {} iskeyword () @@ -2172,6 +2174,8 @@ */ +OCTAVE_NAMESPACE_END + namespace octave { void
--- a/libinterp/parse-tree/oct-parse.yy Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/parse-tree/oct-parse.yy Fri Aug 13 21:53:51 2021 -0400 @@ -5854,6 +5854,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (autoload, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {@var{autoload_map} =} autoload () @@ -5954,6 +5956,8 @@ return octave_value (interp.mfilename (opt)); } +OCTAVE_NAMESPACE_END + namespace octave { // Execute the contents of a script file. For compatibility with @@ -5970,6 +5974,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (source, interp, args, , doc: /* -*- texinfo -*- @deftypefn {} {} source (@var{file}) @@ -6003,6 +6009,8 @@ return octave_value_list (); } +OCTAVE_NAMESPACE_END + namespace octave { //! Evaluate an Octave function (built-in or interpreted) and return @@ -6055,6 +6063,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (feval, interp, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {} feval (@var{name}, @dots{}) @@ -6146,6 +6156,8 @@ return retval; } +OCTAVE_NAMESPACE_END + namespace octave { void @@ -6159,6 +6171,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (eval, interp, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {} eval (@var{try}) @@ -6560,3 +6574,5 @@ return retval; } + +OCTAVE_NAMESPACE_END
--- a/libinterp/parse-tree/profiler.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/parse-tree/profiler.cc Fri Aug 13 21:53:51 2021 -0400 @@ -383,6 +383,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + // Enable or disable the profiler data collection. DEFMETHOD (__profiler_enable__, interp, args, , doc: /* -*- texinfo -*- @@ -446,3 +448,5 @@ else return ovl (profiler.get_flat ()); } + +OCTAVE_NAMESPACE_END
--- a/libinterp/parse-tree/pt-eval.cc Sat Aug 14 18:35:57 2021 -0400 +++ b/libinterp/parse-tree/pt-eval.cc Fri Aug 13 21:53:51 2021 -0400 @@ -2234,6 +2234,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + // END is documented in op-kw-docs. DEFCONSTMETHOD (end, interp, args, , doc: /* -*- texinfo -*- @@ -2278,6 +2280,8 @@ %! assert (x(minus (minus (end, 1), 1)), 8); */ +OCTAVE_NAMESPACE_END + namespace octave { octave_value_list @@ -5094,6 +5098,8 @@ } } +OCTAVE_NAMESPACE_BEGIN + DEFMETHOD (max_recursion_depth, interp, args, nargout, doc: /* -*- texinfo -*- @deftypefn {} {@var{val} =} max_recursion_depth () @@ -5370,3 +5376,5 @@ %!error echo ("on", "invalid") %!error echo ("on", "all", "all") */ + +OCTAVE_NAMESPACE_END