Mercurial > octave
changeset 28857:43ad651cf5a0
eliminate unnecessary uses of octave:: namespace qualifier
Affected files: graphics-init.cc, octave-qscintilla.cc,
octave-qobject.h, qt-application.h, workspace-view.cc, call-stack.cc,
dynamic-ld.cc, error.cc, error.h, event-manager.h, fcn-info.cc,
ft-text-renderer.cc, gl-render.cc, gl2ps-print.cc,
graphics-toolkit.cc, input.cc, load-path.cc, oct-hist.cc,
oct-stream.cc, pager.cc, stack-frame.cc, symscope.cc, sysdep.cc,
__ode15__.cc, cdef-class.cc, ov-fcn-handle.cc, ov.cc, ov.h,
oct-parse.yy, pt-classdef.h, pt-eval.cc, Range.cc, Range.h, dir-ops.h,
file-stat.cc, lo-sysdep.cc, lo-utils.cc, oct-glob.cc, and
url-transfer.cc.
line wrap: on
line diff
--- a/libgui/src/graphics-init.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libgui/src/graphics-init.cc Mon Oct 05 15:19:15 2020 -0400 @@ -63,7 +63,7 @@ graphics_toolkit tk (qt_gtk); - octave::gtk_manager& gtk_mgr = interp.get_gtk_manager (); + gtk_manager& gtk_mgr = interp.get_gtk_manager (); gtk_mgr.register_toolkit ("qt");
--- a/libgui/src/m-editor/octave-qscintilla.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libgui/src/m-editor/octave-qscintilla.cc Mon Oct 05 15:19:15 2020 -0400 @@ -963,8 +963,8 @@ tmp_file, tmp_hist); // New exception with updated message and stack - octave::execution_exception ee (e.err_type (),e.identifier (), - new_msg.toStdString (), stack); + execution_exception ee (e.err_type (),e.identifier (), + new_msg.toStdString (), stack); // Throw throw (ee);
--- a/libgui/src/octave-qobject.h Mon Oct 05 13:57:00 2020 -0400 +++ b/libgui/src/octave-qobject.h Mon Oct 05 15:19:15 2020 -0400 @@ -49,7 +49,7 @@ //! reimplement QApplication::notify. The octave_qapplication object //! should behave identically to a QApplication object except that it //! overrides the notify method so we can handle forward Octave - //! octave::execution_exception exceptions from the GUI thread to the + //! execution_exception exceptions from the GUI thread to the //! interpreter thread. class octave_qapplication : public QApplication
--- a/libgui/src/qt-application.h Mon Oct 05 13:57:00 2020 -0400 +++ b/libgui/src/qt-application.h Mon Oct 05 15:19:15 2020 -0400 @@ -35,7 +35,7 @@ // must be included only in the corresponding .cc file. //! This class inherits from the pure-virtual base class - //! octave::application and provides an implementation of the + //! application and provides an implementation of the //! application::execute method that starts an interface to Octave //! that is based on Qt. It may start a command-line interface that //! allows Qt graphics to be used or it may start an interface that
--- a/libgui/src/workspace-view.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libgui/src/workspace-view.cc Mon Oct 05 15:19:15 2020 -0400 @@ -209,7 +209,7 @@ .arg (m_model->storage_class_color (i).name ()) .arg (m_model->storage_class_color (i + ws_colors_count).name ()) .arg (QCoreApplication::translate ("octave::settings_dialog", - ws_color_names.at (i).toStdString ().data ())); + ws_color_names.at (i).toStdString ().data ())); } }
--- a/libinterp/corefcn/call-stack.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/corefcn/call-stack.cc Mon Oct 05 15:19:15 2020 -0400 @@ -823,7 +823,7 @@ void call_stack::clear_global_variable_regexp (const std::string& pattern) { - octave::regexp pat (pattern); + regexp pat (pattern); for (auto& nm_ov : m_global_values) { @@ -1024,7 +1024,7 @@ if (have_regexp) { - octave::regexp pat (pattern); + regexp pat (pattern); for (auto& nm_ov : m_global_values) {
--- a/libinterp/corefcn/dynamic-ld.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/corefcn/dynamic-ld.cc Mon Oct 05 15:19:15 2020 -0400 @@ -152,7 +152,7 @@ { octave_function *retval = nullptr; - octave::unwind_protect_var<bool> restore_var (m_doing_load, true); + unwind_protect_var<bool> restore_var (m_doing_load, true); dynamic_library oct_file = m_loaded_shlibs.find_file (file_name); @@ -230,7 +230,7 @@ const std::string& file_name, bool /*relative*/) { - octave::unwind_protect_var<bool> restore_var (m_doing_load, true); + unwind_protect_var<bool> restore_var (m_doing_load, true); dynamic_library mex_file = m_loaded_shlibs.find_file (file_name);
--- a/libinterp/corefcn/error.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/corefcn/error.cc Mon Oct 05 15:19:15 2020 -0400 @@ -368,7 +368,7 @@ static const octave_fields bt_fields (bt_fieldnames); octave_map - error_system::make_stack_map (const std::list<octave::frame_info>& frames) + error_system::make_stack_map (const std::list<frame_info>& frames) { size_t nframes = frames.size (); @@ -404,10 +404,10 @@ return retval; } - std::list<octave::frame_info> + std::list<frame_info> error_system::make_stack_frame_list (const octave_map& stack) { - std::list<octave::frame_info> frames; + std::list<frame_info> frames; Cell file = stack.contents ("file"); Cell name = stack.contents ("name"); @@ -423,11 +423,11 @@ octave_idx_type nel = name.numel (); for (octave_idx_type i = 0; i < nel; i++) - frames.push_back (octave::frame_info (file(i).string_value (), - name(i).string_value (), - line(i).int_value (), - (have_column - ? column(i).int_value () : -1))); + frames.push_back (frame_info (file(i).string_value (), + name(i).string_value (), + line(i).int_value (), + (have_column + ? column(i).int_value () : -1))); return frames; }
--- a/libinterp/corefcn/error.h Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/corefcn/error.h Mon Oct 05 15:19:15 2020 -0400 @@ -239,9 +239,9 @@ } static octave_map - make_stack_map (const std::list<octave::frame_info>& frames); + make_stack_map (const std::list<frame_info>& frames); - static std::list<octave::frame_info> + static std::list<frame_info> make_stack_frame_list (const octave_map& stack); //! For given warning ID, return 0 if warnings are disabled, 1 if @@ -291,7 +291,7 @@ void initialize_default_warning_state (void); - void interpreter_try (octave::unwind_protect& frame); + void interpreter_try (unwind_protect& frame); // Throw execution_exception or, if debug_on_error is TRUE, enter // debugger. If stack_info is empty, use current call stack.
--- a/libinterp/corefcn/event-manager.h Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/corefcn/event-manager.h Mon Oct 05 15:19:15 2020 -0400 @@ -44,7 +44,7 @@ namespace octave { typedef std::function<void (void)> fcn_callback; - typedef std::function<void (octave::interpreter&)> meth_callback; + typedef std::function<void (interpreter&)> meth_callback; class symbol_info_list; @@ -210,7 +210,7 @@ virtual void set_workspace (bool /*top_level*/, bool /*debug*/, - const octave::symbol_info_list& /*syminfo*/, + const symbol_info_list& /*syminfo*/, bool /*update_variable_editor*/) { } @@ -371,7 +371,7 @@ void update_path_dialog (void) { - if (octave::application::is_gui_running () && enabled ()) + if (application::is_gui_running () && enabled ()) instance->update_path_dialog (); } @@ -519,19 +519,19 @@ // Methods for removing/renaming files which might be open in editor void file_remove (const std::string& old_name, const std::string& new_name) { - if (octave::application::is_gui_running () && enabled ()) + if (application::is_gui_running () && enabled ()) instance->file_remove (old_name, new_name); } void file_renamed (bool load_new) { - if (octave::application::is_gui_running () && enabled ()) + if (application::is_gui_running () && enabled ()) instance->file_renamed (load_new); } void set_workspace (void); - void set_workspace (bool top_level, const octave::symbol_info_list& syminfo, + void set_workspace (bool top_level, const symbol_info_list& syminfo, bool update_variable_editor = true) { if (enabled ()) @@ -621,10 +621,10 @@ protected: // Semaphore to lock access to the event queue. - octave::mutex *event_queue_mutex; + mutex *event_queue_mutex; // Event Queue. - octave::event_queue gui_event_queue; + event_queue gui_event_queue; bool debugging; bool link_enabled;
--- a/libinterp/corefcn/fcn-info.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/corefcn/fcn-info.cc Mon Oct 05 15:19:15 2020 -0400 @@ -86,7 +86,7 @@ tmpfcn->mark_as_private_function (class_name); - private_functions[octave::sys::canonicalize_file_name (dir_name)] = ov_fcn; + private_functions[sys::canonicalize_file_name (dir_name)] = ov_fcn; return ov_fcn; }
--- a/libinterp/corefcn/ft-text-renderer.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/corefcn/ft-text-renderer.cc Mon Oct 05 15:19:15 2020 -0400 @@ -980,9 +980,10 @@ m_strlist = std::list<text_renderer::string> (); - octave::unwind_protect_var<bool> restore_var1 (m_do_strlist); - octave::unwind_protect_var<std::list<text_renderer::string>> + unwind_protect_var<bool> restore_var1 (m_do_strlist); + unwind_protect_var<std::list<text_renderer::string>> restore_var2 (m_strlist); + m_do_strlist = true; text_to_pixels (txt, pxls, box, ha, va, rot, interp, false);
--- a/libinterp/corefcn/gl-render.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/corefcn/gl-render.cc Mon Oct 05 15:19:15 2020 -0400 @@ -3752,7 +3752,7 @@ if (props.markerfacecolor_is ("auto")) { gh_manager& gh_mgr - = octave::__get_gh_manager__ ("opengl_renderer::draw_scatter"); + = __get_gh_manager__ ("opengl_renderer::draw_scatter"); graphics_object go = gh_mgr.get_object (props.get___myhandle__ ()); graphics_object ax = go.get_ancestor ("axes"); const axes::properties& ax_props
--- a/libinterp/corefcn/gl2ps-print.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/corefcn/gl2ps-print.cc Mon Oct 05 15:19:15 2020 -0400 @@ -56,20 +56,6 @@ namespace octave { - static void - safe_pclose (FILE *f) - { - if (f) - octave::pclose (f); - } - - static void - safe_fclose (FILE *f) - { - if (f) - std::fclose (f); - } - class OCTINTERP_API gl2ps_renderer : public opengl_renderer @@ -381,7 +367,7 @@ if (! tmpf) error ("gl2ps_renderer::draw: couldn't open temporary file for printing"); - frame.add_fcn (safe_fclose, tmpf); + frame.add ([=] () { std::fclose (tmpf); }); // Reset buffsize, unless this is 2nd pass of a texstandalone print. if (term.find ("tex") == std::string::npos) @@ -423,7 +409,7 @@ include_graph = include_graph.substr (n_begin, n_end - n_begin + 1); // Strip path from filename - n_begin = include_graph.find_last_of (octave::sys::file_ops::dir_sep_chars ()); + n_begin = include_graph.find_last_of (sys::file_ops::dir_sep_chars ()); include_graph = include_graph.substr (n_begin + 1); } else @@ -1445,7 +1431,8 @@ if (! fp) error (R"(print: failed to open pipe "%s")", stream.c_str ()); - frame.add_fcn (safe_pclose, fp); + // Need octave:: qualifier here to avoid ambiguity. + frame.add ([=] () { octave::pclose (fp); }); } else { @@ -1456,7 +1443,7 @@ if (! fp) error (R"(gl2ps_print: failed to create file "%s")", stream.c_str ()); - frame.add_fcn (safe_fclose, fp); + frame.add ([=] () { std::fclose (fp); }); } gl2ps_renderer rend (glfcns, fp, term);
--- a/libinterp/corefcn/graphics-toolkit.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/corefcn/graphics-toolkit.cc Mon Oct 05 15:19:15 2020 -0400 @@ -36,8 +36,7 @@ void base_graphics_toolkit::update (const graphics_handle& h, int id) { - gh_manager& gh_mgr - = octave::__get_gh_manager__ ("base_graphics_toolkit::update"); + gh_manager& gh_mgr = __get_gh_manager__ ("base_graphics_toolkit::update"); graphics_object go = gh_mgr.get_object (h); @@ -48,7 +47,7 @@ base_graphics_toolkit::initialize (const graphics_handle& h) { gh_manager& gh_mgr - = octave::__get_gh_manager__ ("base_graphics_toolkit::initialize"); + = __get_gh_manager__ ("base_graphics_toolkit::initialize"); graphics_object go = gh_mgr.get_object (h); @@ -59,7 +58,7 @@ base_graphics_toolkit::finalize (const graphics_handle& h) { gh_manager& gh_mgr - = octave::__get_gh_manager__ ("base_graphics_toolkit::finalize"); + = __get_gh_manager__ ("base_graphics_toolkit::finalize"); graphics_object go = gh_mgr.get_object (h);
--- a/libinterp/corefcn/input.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/corefcn/input.cc Mon Oct 05 15:19:15 2020 -0400 @@ -926,8 +926,7 @@ "converting from codepage '%s' to UTF-8: %s", encoding.c_str (), std::strerror (errno)); - octave::unwind_action free_utf8_str - ([=] () { ::free (utf8_str); }); + unwind_action free_utf8_str ([=] () { ::free (utf8_str); }); src_str = std::string (reinterpret_cast<char *> (utf8_str), length); }
--- a/libinterp/corefcn/load-path.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/corefcn/load-path.cc Mon Oct 05 15:19:15 2020 -0400 @@ -56,9 +56,9 @@ static std::string maybe_canonicalize (const std::string& dir_arg) { - bool is_absolute_path = octave::sys::env::absolute_pathname (dir_arg); - - std::string canonical_dir = octave::sys::canonicalize_file_name (dir_arg); + bool is_absolute_path = sys::env::absolute_pathname (dir_arg); + + std::string canonical_dir = sys::canonicalize_file_name (dir_arg); std::string dir; if (canonical_dir.empty ()) dir = dir_arg; @@ -70,7 +70,7 @@ { // Remove current path from absolute path generated by // canonicalize_file_name. - std::string cwd = octave::sys::canonicalize_file_name ("."); + std::string cwd = sys::canonicalize_file_name ("."); if (dir.compare (0, cwd.length (), cwd) == 0) dir.erase (0, cwd.length ()+1); if (dir.empty ())
--- a/libinterp/corefcn/oct-hist.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/corefcn/oct-hist.cc Mon Oct 05 15:19:15 2020 -0400 @@ -327,7 +327,7 @@ { bool numbered_output = nargout == 0; - octave::unwind_action restore_history_filename + unwind_action restore_history_filename ([] (const std::string& old_filename) { command_history::set_file (old_filename);
--- a/libinterp/corefcn/oct-stream.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/corefcn/oct-stream.cc Mon Oct 05 15:19:15 2020 -0400 @@ -97,8 +97,7 @@ } catch (const execution_exception&) { - octave::interpreter& interp - = __get_interpreter__ ("convert_to_valid_int"); + interpreter& interp = __get_interpreter__ ("convert_to_valid_int"); interp.recover_from_exception (); @@ -2958,7 +2957,7 @@ { char *pos = is.tellg (); std::ios::iostate state = is.rdstate (); - //re = octave::read_value<double> (is); + //re = read_value<double> (is); re = read_double (is, fmt); // check for "treat as empty" string @@ -3023,7 +3022,7 @@ pos = is.tellg (); state = is.rdstate (); - //im = octave::read_value<double> (is); + //im = read_value<double> (is); im = read_double (is, fmt); if (is.fail ()) im = 1; @@ -4368,7 +4367,7 @@ { is.putback (c1); - ref = octave::read_value<double> (is); + ref = read_value<double> (is); } } break;
--- a/libinterp/corefcn/pager.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/corefcn/pager.cc Mon Oct 05 15:19:15 2020 -0400 @@ -324,10 +324,8 @@ { if (! m_flushing_output_to_pager) { - octave::unwind_protect_var<bool> - restore_var1 (m_really_flush_to_pager); - octave::unwind_protect_var<bool> - restore_var2 (m_flushing_output_to_pager); + unwind_protect_var<bool> restore_var1 (m_really_flush_to_pager); + unwind_protect_var<bool> restore_var2 (m_flushing_output_to_pager); m_really_flush_to_pager = true; m_flushing_output_to_pager = true;
--- a/libinterp/corefcn/stack-frame.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/corefcn/stack-frame.cc Mon Oct 05 15:19:15 2020 -0400 @@ -1164,7 +1164,7 @@ while (frame) { - octave::symbol_info_list symbols = frame->all_variables (); + symbol_info_list symbols = frame->all_variables (); octave_scalar_map ws;
--- a/libinterp/corefcn/symscope.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/corefcn/symscope.cc Mon Oct 05 15:19:15 2020 -0400 @@ -116,7 +116,7 @@ if (! fcn) continue; - octave::symbol_scope scope = fcn->scope (); + symbol_scope scope = fcn->scope (); std::list<std::string> plst = scope.parent_fcn_names (); @@ -211,7 +211,7 @@ void symbol_scope_rep::cache_dir_name (const std::string& name) { - m_dir_name = octave::sys::canonicalize_file_name (name); + m_dir_name = sys::canonicalize_file_name (name); } bool
--- a/libinterp/corefcn/sysdep.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/corefcn/sysdep.cc Mon Oct 05 15:19:15 2020 -0400 @@ -718,12 +718,11 @@ wchar_t *wcommand = u8_to_wchar (command); wchar_t *wmode = u8_to_wchar (mode); - octave::unwind_action free_memory - ([=] () - { - ::free (wcommand); - ::free (wmode); - }); + unwind_action free_memory ([=] () + { + ::free (wcommand); + ::free (wmode); + }); if (wmode && wmode[0] && ! wmode[1]) { @@ -964,8 +963,7 @@ if (result != ERROR_SUCCESS) return result; - octave::unwind_action restore_keys - ([=] () { reg_close_key_wrapper (h_subkey); }); + unwind_action restore_keys ([=] () { reg_close_key_wrapper (h_subkey); }); std::wstring wname = sys::u8_to_wstring (name); DWORD length = 0;
--- a/libinterp/dldfcn/__ode15__.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/dldfcn/__ode15__.cc Mon Oct 05 15:19:15 2020 -0400 @@ -402,7 +402,7 @@ // entries. m_sunJacMatrix = SUNSparseMatrix (m_num, m_num, 0, CSC_MAT); # else - if (octave::math::int_multiply_overflow (m_num, m_num)) + if (math::int_multiply_overflow (m_num, m_num)) error ("Unable to allocate memory for sparse Jacobian"); m_sunJacMatrix = SUNSparseMatrix (m_num, m_num, m_num*m_num, CSC_MAT);
--- a/libinterp/octave-value/cdef-class.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/octave-value/cdef-class.cc Mon Oct 05 15:19:15 2020 -0400 @@ -869,7 +869,7 @@ tree_evaluator& tw = interp.get_evaluator (); tw.push_dummy_scope (full_class_name); - frame.add_method (tw, &octave::tree_evaluator::pop_scope); + frame.add_method (tw, &tree_evaluator::pop_scope); std::list<cdef_class> slist;
--- a/libinterp/octave-value/ov-fcn-handle.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/octave-value/ov-fcn-handle.cc Mon Oct 05 15:19:15 2020 -0400 @@ -986,7 +986,7 @@ } bool simple_fcn_handle::load_binary (std::istream& is, bool, - octave::mach_info::float_format) + mach_info::float_format) { return is.good (); } @@ -1292,7 +1292,7 @@ } bool scoped_fcn_handle::load_binary (std::istream& is, bool swap, - octave::mach_info::float_format fmt) + mach_info::float_format fmt) { octave_cell ov_cell; ov_cell.load_binary (is, swap, fmt);
--- a/libinterp/octave-value/ov.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/octave-value/ov.cc Mon Oct 05 15:19:15 2020 -0400 @@ -2972,13 +2972,13 @@ const octave_value& limit, bool for_cmd_expr) { if (base.isempty () || increment.isempty () || limit.isempty ()) - return octave_value (octave::range<T> (), for_cmd_expr); + return octave_value (range<T> (), for_cmd_expr); T base_val = octave_value_extract<T> (base); T increment_val = octave_value_extract<T> (increment); T limit_val = octave_value_extract<T> (limit); - octave::range<T> r (base_val, increment_val, limit_val); + range<T> r (base_val, increment_val, limit_val); return octave_value (r, for_cmd_expr); }
--- a/libinterp/octave-value/ov.h Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/octave-value/ov.h Mon Oct 05 15:19:15 2020 -0400 @@ -1536,18 +1536,18 @@ namespace octave { extern OCTINTERP_API octave_value - unary_op (octave::type_info& ti, octave_value::unary_op op, + unary_op (type_info& ti, octave_value::unary_op op, const octave_value& a); extern OCTINTERP_API octave_value unary_op (octave_value::unary_op op, const octave_value& a); extern OCTINTERP_API octave_value - binary_op (octave::type_info& ti, octave_value::binary_op op, + binary_op (type_info& ti, octave_value::binary_op op, const octave_value& a, const octave_value& b); extern OCTINTERP_API octave_value - binary_op (octave::type_info& ti, octave_value::compound_binary_op op, + binary_op (type_info& ti, octave_value::compound_binary_op op, const octave_value& a, const octave_value& b); extern OCTINTERP_API octave_value @@ -1559,7 +1559,7 @@ const octave_value& b); extern OCTINTERP_API octave_value - cat_op (octave::type_info& ti, const octave_value& a, + cat_op (type_info& ti, const octave_value& a, const octave_value& b, const Array<octave_idx_type>& ra_idx); extern OCTINTERP_API octave_value
--- a/libinterp/parse-tree/oct-parse.yy Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/parse-tree/oct-parse.yy Mon Oct 05 15:19:15 2020 -0400 @@ -2561,7 +2561,7 @@ m_max_fcn_depth = m_curr_fcn_depth; // Will get a real name later. - m_lexer.m_symtab_context.push (octave::symbol_scope ("parser:push_fcn_symtab")); + m_lexer.m_symtab_context.push (symbol_scope ("parser:push_fcn_symtab")); m_function_scopes.push (m_lexer.m_symtab_context.curr_scope ()); if (! m_lexer.m_reading_script_file && m_curr_fcn_depth == 0 @@ -3583,7 +3583,7 @@ return nullptr; } - octave::symbol_scope curr_scope = m_lexer.m_symtab_context.curr_scope (); + symbol_scope curr_scope = m_lexer.m_symtab_context.curr_scope (); curr_scope.cache_name (id_name); m_lexer.m_parsed_function_name.top () = true; @@ -5935,10 +5935,10 @@ if (nargin < 1 || nargin > 2) print_usage (); - std::string file = args(0).xstring_value ("__parse_file__: expecting filename as argument"); - - std::string full_file - = octave::sys::file_ops::tilde_expand (file); + 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);
--- a/libinterp/parse-tree/pt-classdef.h Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/parse-tree/pt-classdef.h Mon Oct 05 15:19:15 2020 -0400 @@ -768,7 +768,7 @@ { public: - tree_classdef (const octave::symbol_scope& scope, + tree_classdef (const symbol_scope& scope, tree_classdef_attribute_list *a, tree_identifier *i, tree_classdef_superclass_list *sc, tree_classdef_body *b, comment_list *lc, @@ -795,7 +795,7 @@ delete m_trail_comm; } - octave::symbol_scope scope (void) { return m_scope; } + symbol_scope scope (void) { return m_scope; } tree_classdef_attribute_list * attribute_list (void) { return m_attr_list; } @@ -831,7 +831,7 @@ // corresponds to any identifiers that were found in attribute lists // (for example). Used again when computing the meta class object. - octave::symbol_scope m_scope; + symbol_scope m_scope; tree_classdef_attribute_list *m_attr_list;
--- a/libinterp/parse-tree/pt-eval.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/libinterp/parse-tree/pt-eval.cc Mon Oct 05 15:19:15 2020 -0400 @@ -2418,7 +2418,7 @@ { octave_idx_type steps = rng.numel (); - if (octave::math::isinf (rng.limit ())) + if (math::isinf (rng.limit ())) warning_with_id ("Octave:infinite-loop", "FOR loop limit is infinite, will stop after %" OCTAVE_IDX_TYPE_FORMAT " steps", steps);
--- a/liboctave/array/Range.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/liboctave/array/Range.cc Mon Oct 05 15:19:15 2020 -0400 @@ -84,10 +84,10 @@ octave_idx_type xnumel_internal (T base, T limit, T inc) { octave_idx_type retval = -1; - if (! octave::math::isfinite (base) || ! octave::math::isfinite (inc) - || octave::math::isnan (limit)) + if (! math::isfinite (base) || ! math::isfinite (inc) + || math::isnan (limit)) retval = -2; - else if (octave::math::isinf (limit) + else if (math::isinf (limit) && ((inc > 0 && limit > 0) || (inc < 0 && limit < 0))) retval = std::numeric_limits<octave_idx_type>::max () - 1; @@ -139,9 +139,9 @@ // will also be an integer, even if the limit is not. If the range // has only one or zero elements, then the base needs to be an integer. - return (! (octave::math::isnan (base) || octave::math::isnan (inc)) - && (octave::math::nint_big (base) == base || nel < 1) - && (octave::math::nint_big (inc) == inc || nel <= 1)); + return (! (math::isnan (base) || math::isnan (inc)) + && (math::nint_big (base) == base || nel < 1) + && (math::nint_big (inc) == inc || nel <= 1)); } template <typename T> @@ -239,7 +239,7 @@ if (m_base == 0 || m_limit == 0) // Exactly one zero at beginning or end of range. retval = m_numel - 1; - else if (octave::math::mod (-m_base, m_increment) != 0) + else if (math::mod (-m_base, m_increment) != 0) // Range crosses negative/positive without hitting zero. retval = m_numel; else
--- a/liboctave/array/Range.h Mon Oct 05 13:57:00 2020 -0400 +++ b/liboctave/array/Range.h Mon Oct 05 15:19:15 2020 -0400 @@ -202,7 +202,7 @@ T checkelem (octave_idx_type i) const { if (i < 0 || i >= m_numel) - octave::err_index_out_of_range (2, 2, i+1, m_numel, dims ()); + err_index_out_of_range (2, 2, i+1, m_numel, dims ()); if (i == 0) return m_base; @@ -216,7 +216,7 @@ { // Ranges are *always* row vectors. if (i != 0) - octave::err_index_out_of_range (1, 1, i+1, m_numel, dims ()); + err_index_out_of_range (1, 1, i+1, m_numel, dims ()); return checkelem (j); } @@ -259,7 +259,7 @@ else { if (i.extent (n) != n) - octave::err_index_out_of_range (1, 1, i.extent (n), n, dims ()); + err_index_out_of_range (1, 1, i.extent (n), n, dims ()); dim_vector rd = i.orig_dimensions (); octave_idx_type il = i.length (n);
--- a/liboctave/system/dir-ops.h Mon Oct 05 13:57:00 2020 -0400 +++ b/liboctave/system/dir-ops.h Mon Oct 05 15:19:15 2020 -0400 @@ -44,7 +44,7 @@ // NOTE: This class cannot be used safely cross-platform (Windows) with // non-ASCII characters in paths. // Consider replacing the implementation using std::filesystem (C++ 17). - // In the meantime, consider using octave::sys::get_dirlist instead. + // In the meantime, consider using sys::get_dirlist instead. public:
--- a/liboctave/system/file-stat.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/liboctave/system/file-stat.cc Mon Oct 05 15:19:15 2020 -0400 @@ -204,7 +204,7 @@ // If path is a root (like "C:" or "\\SERVER\share"), add a // trailing backslash. // FIXME: Does this pattern match all possible UNC roots? - octave::regexp pat (R"(^\\\\[\w-]*\\[\w-]*$)"); + regexp pat (R"(^\\\\[\w-]*\\[\w-]*$)"); if ((full_file_name.length () == 2 && full_file_name[1] == ':') || pat.is_match (full_file_name)) full_file_name += '\\';
--- a/liboctave/system/lo-sysdep.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/liboctave/system/lo-sysdep.cc Mon Oct 05 15:19:15 2020 -0400 @@ -433,7 +433,7 @@ wchar_t *wnew_item = u8_to_wchar (new_item); // free new_item, but leak wnew_item (see above) - octave::unwind_action free_new_item ([=] () { std::free (new_item); }); + unwind_action free_new_item ([=] () { std::free (new_item); }); if (_wputenv (wnew_item) < 0) (*current_liboctave_error_handler) ("putenv (%s) failed", new_item);
--- a/liboctave/util/lo-utils.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/liboctave/util/lo-utils.cc Mon Oct 05 15:19:15 2020 -0400 @@ -215,7 +215,7 @@ val = std::numeric_limits<T>::quiet_NaN (); else { - val = octave::numeric_limits<T>::NA (); + val = numeric_limits<T>::NA (); if (c2 != std::istream::traits_type::eof ()) is.putback (c2); else
--- a/liboctave/util/oct-glob.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/liboctave/util/oct-glob.cc Mon Oct 05 15:19:15 2020 -0400 @@ -80,7 +80,7 @@ void *glob_info = octave_create_glob_info_struct (); - octave::unwind_action cleanup_glob_info_struct + unwind_action cleanup_glob_info_struct ([=] () { octave_destroy_glob_info_struct (glob_info); }); for (int i = 0; i < npat; i++) @@ -155,7 +155,7 @@ void *glob_info = octave_create_glob_info_struct (); - octave::unwind_action cleanup_glob_info_struct + unwind_action cleanup_glob_info_struct ([=] () { octave_destroy_glob_info_struct (glob_info); }); for (int i = 0; i < npat; i++)
--- a/liboctave/util/url-transfer.cc Mon Oct 05 13:57:00 2020 -0400 +++ b/liboctave/util/url-transfer.cc Mon Oct 05 15:19:15 2020 -0400 @@ -448,8 +448,7 @@ { struct curl_slist *slist = nullptr; - octave::unwind_action cleanup_slist - ([=] () { curl_slist_free_all (slist); }); + unwind_action cleanup_slist ([=] () { curl_slist_free_all (slist); }); std::string cmd = "rnfr " + oldname; slist = curl_slist_append (slist, cmd.c_str ()); @@ -616,8 +615,7 @@ struct curl_slist *slist = nullptr; - octave::unwind_action cleanup_slist - ([=] () { curl_slist_free_all (slist); }); + unwind_action cleanup_slist ([=] () { curl_slist_free_all (slist); }); slist = curl_slist_append (slist, "pwd"); SETOPTR (CURLOPT_POSTQUOTE, slist); @@ -708,8 +706,7 @@ { struct curl_slist *slist = nullptr; - octave::unwind_action cleanup_slist - ([=] () { curl_slist_free_all (slist); }); + unwind_action cleanup_slist ([=] () { curl_slist_free_all (slist); }); if (param.numel () >= 2) { @@ -736,8 +733,7 @@ SETOPT (CURLOPT_URL, m_host_or_url.c_str ()); - octave::unwind_action cleanup_httppost - ([=] () { curl_formfree (post); }); + unwind_action cleanup_httppost ([=] () { curl_formfree (post); }); if (param.numel () >= 2) { @@ -911,8 +907,7 @@ { struct curl_slist *slist = nullptr; - octave::unwind_action cleanup_slist - ([=] () { curl_slist_free_all (slist); }); + unwind_action cleanup_slist ([=] () { curl_slist_free_all (slist); }); std::string cmd = action + ' ' + file_or_dir;