Mercurial > octave

diff libinterp/corefcn/variables.cc @ 29961:7d6709900da7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 428cccc75cc9
line wrap: on
line diff
--- 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);