Mercurial > octave
diff libinterp/octave-value/ov-class.cc @ 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.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Sat, 14 Aug 2021 22:48:52 -0400 |
| parents | 32c3a5805893 |
| children | 938794bc82b7 |
line wrap: on
line diff
--- 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); }