# HG changeset patch # User John W. Eaton # Date 1581972455 18000 # Node ID 376ca9022b7e511497e7a61b487fc877a585e703 # Parent f47f9493cb37df448e5b369110707f7030d7674b remove functions deprecated in version 5 * scripts/deprecated/module.mk: Update. * output_max_field_width.m: Delete. * input.h, input.cc (octave_yes_or_no, remove_input_event_hook_functions, get_input_from_stdin): Delete from global namespace. * sysdep.h (sysdep_init, set_application_id, sysdep_cleanup, raw_mode, octave_popen, octave_pclose, octave_kbhit, get_P_tmpdir, same_file_internal): Delete from global namespace. * text-engine.h (text_element, text_element_string, text_element_symbol, text_element_list, text_element_subscript, text_element_superscript, text_element_combined, text_element_fontstyle, text_element_fontname, text_element_fontsize, text_element_color, text_processor, text_parser, text_parser_none, text_parser_tex): Delete from global namespace. * utils.h, utils.cc (valid_identifier, same_file, almost_match, keyword_almost_match, search_path_for_file, search_path_for_all_files, file_in_path, find_data_file_in_load_path, contents_file_in_path, fcn_file_in_path, do_string_escapes, undo_string_escape, undo_string_escapes, check_dimensions, get_dimensions, dims_to_numel, identity_matrix, float_identity_matrix, octave_vformat, octave_vasprintf, octave_sleep, do_simple_cellfun): Delete from global namespace. * variables.h, variables.cc (get_user_code): Delete from global namespace. * bp-table.h, bp-table.cc (extern octave_user_code): Delete from global namespace. * parse.h, oct-parse.yy (eval_string): Delete from global namespace. * token.h (is_keyword): Delete from global namespace. diff -r f47f9493cb37 -r 376ca9022b7e libinterp/corefcn/input.cc --- a/libinterp/corefcn/input.cc Mon Feb 17 12:45:58 2020 -0800 +++ b/libinterp/corefcn/input.cc Mon Feb 17 15:47:35 2020 -0500 @@ -1406,40 +1406,3 @@ return input_sys.mfile_encoding (args, nargout); } - -// Always define these functions. The macro is intended to allow the -// declarations to be hidden, not so that Octave will not provide the -// functions if they are requested. - -// #if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -bool -octave_yes_or_no (const std::string& prompt) -{ - octave::input_system& input_sys - = octave::__get_input_system__ ("set_default_prompts"); - - return input_sys.yes_or_no (prompt); -} - -void -remove_input_event_hook_functions (void) -{ - octave::input_system& input_sys - = octave::__get_input_system__ ("remove_input_event_hook_functions"); - - input_sys.clear_input_event_hooks (); -} - -// Fix things up so that input can come from the standard input. This -// may need to become much more complicated, which is why it's in a -// separate function. - -FILE * -get_input_from_stdin (void) -{ - octave::command_editor::set_input_stream (stdin); - return octave::command_editor::get_input_stream (); -} - -// #endif diff -r f47f9493cb37 -r 376ca9022b7e libinterp/corefcn/input.h --- a/libinterp/corefcn/input.h Mon Feb 17 12:45:58 2020 -0800 +++ b/libinterp/corefcn/input.h Mon Feb 17 15:47:35 2020 -0500 @@ -278,17 +278,4 @@ }; } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (5, "use 'octave::input_system::yes_or_no' instead") -extern bool octave_yes_or_no (const std::string& prompt); - -OCTAVE_DEPRECATED (5, "use 'octave::input_system::clear_input_event_hooks' instead") -extern void remove_input_event_hook_functions (void); - -OCTAVE_DEPRECATED (5, "this function will be removed in a future version of Octave") -extern OCTINTERP_API FILE * get_input_from_stdin (void); - #endif - -#endif diff -r f47f9493cb37 -r 376ca9022b7e libinterp/corefcn/sysdep.h --- a/libinterp/corefcn/sysdep.h Mon Feb 17 12:45:58 2020 -0800 +++ b/libinterp/corefcn/sysdep.h Mon Feb 17 15:47:35 2020 -0500 @@ -59,71 +59,4 @@ extern OCTINTERP_API bool drive_or_unc_share (const std::string&); } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (5, "use 'octave::sysdep_init' instead") -inline void -sysdep_init (void) -{ - octave::sysdep_init (); -} - -OCTAVE_DEPRECATED (5, "use 'octave::set_application_id' instead") -inline void -set_application_id (void) -{ - octave::set_application_id (); -} - -OCTAVE_DEPRECATED (5, "use 'octave::sysdep_cleanup' instead") -inline void -sysdep_cleanup (void) -{ - octave::sysdep_cleanup (); -} - -OCTAVE_DEPRECATED (5, "use 'octave::raw_mode' instead") -inline void -raw_mode (bool on, bool wait = true) -{ - octave::raw_mode (on, wait); -} - -OCTAVE_DEPRECATED (5, "use 'octave::popen' instead") -inline FILE * -octave_popen (const char *command, const char *mode) -{ - return octave::popen (command, mode); -} - -OCTAVE_DEPRECATED (5, "use 'octave::pclose' instead") -inline int -octave_pclose (FILE *f) -{ - return octave::pclose (f); -} - -OCTAVE_DEPRECATED (5, "use 'octave::kbhit' instead") -inline int -octave_kbhit (bool wait = true) -{ - return octave::kbhit (wait); -} - -OCTAVE_DEPRECATED (5, "use 'octave::get_P_tmpdir' instead") -inline std::string -get_P_tmpdir (void) -{ - return octave::get_P_tmpdir (); -} - -OCTAVE_DEPRECATED (5, "use 'octave::same_file_internal' instead") -inline bool -same_file_internal (const std::string& a, const std::string& b) -{ - return octave::same_file_internal (a, b); -} - #endif - -#endif diff -r f47f9493cb37 -r 376ca9022b7e libinterp/corefcn/text-engine.h --- a/libinterp/corefcn/text-engine.h Mon Feb 17 12:45:58 2020 -0800 +++ b/libinterp/corefcn/text-engine.h Mon Feb 17 15:47:35 2020 -0500 @@ -459,53 +459,4 @@ } } -#if defined (OCAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (5, "use 'octave::text_element' instead") -typedef octave::text_element text_element; - -OCTAVE_DEPRECATED (5, "use 'octave::text_element_string' instead") -typedef octave::text_element_string text_element_string; - -OCTAVE_DEPRECATED (5, "use 'octave::text_element_symbol' instead") -typedef octave::text_element_symbol text_element_symbol; - -OCTAVE_DEPRECATED (5, "use 'octave::text_element_list' instead") -typedef octave::text_element_list text_element_list; - -OCTAVE_DEPRECATED (5, "use 'octave::text_element_subscript' instead") -typedef octave::text_element_subscript text_element_subscript; - -OCTAVE_DEPRECATED (5, "use 'octave::text_element_superscript' instead") -typedef octave::text_element_superscript text_element_superscript; - -OCTAVE_DEPRECATED (5, "use 'octave::text_element_combined' instead") -typedef octave::text_element_combined text_element_combined; - -OCTAVE_DEPRECATED (5, "use 'octave::text_element_fontstyle' instead") -typedef octave::text_element_fontstyle text_element_fontstyle; - -OCTAVE_DEPRECATED (5, "use 'octave::text_element_fontname' instead") -typedef octave::text_element_fontname text_element_fontname; - -OCTAVE_DEPRECATED (5, "use 'octave::text_element_fontsize' instead") -typedef octave::text_element_fontsize text_element_fontsize; - -OCTAVE_DEPRECATED (5, "use 'octave::text_element_color' instead") -typedef octave::text_element_color text_element_color; - -OCTAVE_DEPRECATED (5, "use 'octave::text_processor' instead") -typedef octave::text_processor text_processor; - -OCTAVE_DEPRECATED (5, "use 'octave::text_parser' instead") -typedef octave::text_parser text_parser; - -OCTAVE_DEPRECATED (5, "use 'octave::text_parser_none' instead") -typedef octave::text_parser_none text_parser_none; - -OCTAVE_DEPRECATED (5, "use 'octave::text_parser_tex' instead") -typedef octave::text_parser_tex text_parser_tex; - #endif - -#endif diff -r f47f9493cb37 -r 376ca9022b7e libinterp/corefcn/utils.cc --- a/libinterp/corefcn/utils.cc Mon Feb 17 12:45:58 2020 -0800 +++ b/libinterp/corefcn/utils.cc Mon Feb 17 15:47:35 2020 -0500 @@ -1647,183 +1647,3 @@ %!error isstudent (1) */ - -// Always define these functions. The macro is intended to allow the -// declarations to be hidden, not so that Octave will not provide the -// functions if they are requested. - -// #if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -#include "ov.h" -#include "ovl.h" -#include "str-vec.h" - -bool -valid_identifier (const char *s) -{ - return octave::valid_identifier (s); -} - -bool -valid_identifier (const std::string& s) -{ - return octave::valid_identifier (s); -} - -bool -same_file (const std::string& f, const std::string& g) -{ - return octave::same_file (f, g); -} - -int -almost_match (const std::string& std, const std::string& s, - int min_match_len, int case_sens) -{ - return octave::almost_match (std, s, min_match_len, case_sens); -} - -int -keyword_almost_match (const char * const *std, int *min_len, - const std::string& s, int min_toks_to_match, - int max_toks) -{ - return octave::keyword_almost_match (std, min_len, s, min_toks_to_match, - max_toks); -} - -std::string -search_path_for_file (const std::string& path, const string_vector& names) -{ - return octave::search_path_for_file (path, names); -} - -string_vector -search_path_for_all_files (const std::string& path, const string_vector& names) -{ - return octave::search_path_for_all_files (path, names); -} - -std::string -file_in_path (const std::string& name, const std::string& suffix) -{ - return octave::file_in_path (name, suffix); -} - -std::string -find_data_file_in_load_path (const std::string& fcn, const std::string& file, - bool require_regular_file) -{ - return octave::find_data_file_in_load_path (fcn, file, require_regular_file); -} - -std::string -contents_file_in_path (const std::string& s) -{ - return octave::contents_file_in_path (s); -} - -std::string -fcn_file_in_path (const std::string& s) -{ - return octave::fcn_file_in_path (s); -} - -std::string -do_string_escapes (const std::string& s) -{ - return octave::do_string_escapes (s); -} - -const char * -undo_string_escape (char c) -{ - return octave::undo_string_escape (c); -} - -std::string -undo_string_escapes (const std::string& s) -{ - return octave::undo_string_escapes (s); -} - -void -check_dimensions (dim_vector& dim, const char *warnfor) -{ - return octave::check_dimensions (dim, warnfor); -} - -void -get_dimensions (const octave_value& a, const char *warn_for, - dim_vector& dim) -{ - return octave::get_dimensions (a, warn_for, dim); -} - -void -get_dimensions (const octave_value& a, const octave_value& b, - const char *warn_for, octave_idx_type& nr, - octave_idx_type& nc) -{ - return octave::get_dimensions (a, b, warn_for, nr, nc); -} - -void -get_dimensions (const octave_value& a, const char *warn_for, - octave_idx_type& nr, octave_idx_type& nc) -{ - return octave::get_dimensions (a, warn_for, nr, nc); -} - -octave_idx_type -dims_to_numel (const dim_vector& dims, const octave_value_list& idx) -{ - return octave::dims_to_numel (dims, idx); -} - -Matrix -identity_matrix (octave_idx_type nr, octave_idx_type nc) -{ - return octave::identity_matrix (nr, nc); -} - -FloatMatrix -float_identity_matrix (octave_idx_type nr, octave_idx_type nc) -{ - return octave::float_identity_matrix (nr, nc); -} - -size_t -octave_vformat (std::ostream& os, const char *fmt, va_list args) -{ - return octave::vformat (os, fmt, args); -} - -std::string -octave_vasprintf (const char *fmt, va_list args) -{ - return octave::vasprintf (fmt, args); -} - -void -octave_sleep (double seconds) -{ - octave::sleep (seconds); -} - -octave_value_list -do_simple_cellfun (octave_value_list (*fun) (const octave_value_list&, int), - const char *fun_name, const octave_value_list& args, - int nargout) -{ - return octave::do_simple_cellfun (fun, fun_name, args, nargout); -} - -octave_value -do_simple_cellfun (octave_value_list (*fun) (const octave_value_list&, int), - const char *fun_name, const octave_value_list& args) -{ - return octave::do_simple_cellfun (fun, fun_name, args); -} - -// #endif diff -r f47f9493cb37 -r 376ca9022b7e libinterp/corefcn/utils.h --- a/libinterp/corefcn/utils.h Mon Feb 17 12:45:58 2020 -0800 +++ b/libinterp/corefcn/utils.h Mon Feb 17 15:47:35 2020 -0500 @@ -141,139 +141,4 @@ const char *fun_name, const octave_value_list& args); } -#if defined (OCTAVE_USE_DEPRECATED_FUNCTIONS) - -OCTAVE_DEPRECATED (5, "use 'octave::valid_identifier' instead") -extern OCTINTERP_API bool -valid_identifier (const char *s); - -OCTAVE_DEPRECATED (5, "use 'octave::valid_identifier' instead") -extern OCTINTERP_API bool -valid_identifier (const std::string& s); - -OCTAVE_DEPRECATED (5, "use 'octave::same_file' instead") -extern OCTINTERP_API bool -same_file (const std::string& f, const std::string& g); - -OCTAVE_DEPRECATED (5, "use 'octave::almost_match' instead") -extern OCTINTERP_API int -almost_match (const std::string& std, const std::string& s, - int min_match_len = 1, int case_sens = 1); - -OCTAVE_DEPRECATED (5, "use 'octave::keyword_almost_match' instead") -extern OCTINTERP_API int -keyword_almost_match (const char * const *std, int *min_len, - const std::string& s, int min_toks_to_match, - int max_toks); - -OCTAVE_DEPRECATED (5, "use 'octave::search_path_for_file' instead") -extern OCTINTERP_API std::string -search_path_for_file (const std::string& path, const string_vector& names); - -OCTAVE_DEPRECATED (5, "use 'octave::search_path_for_all_files' instead") -extern OCTINTERP_API string_vector -search_path_for_all_files (const std::string& path, const string_vector& names); - -OCTAVE_DEPRECATED (5, "use 'octave::file_in_path' instead") -extern OCTINTERP_API std::string -file_in_path (const std::string& name, const std::string& suffix); - -OCTAVE_DEPRECATED (5, "use 'octave::find_data_file_in_load_path ' instead") -extern OCTINTERP_API std::string -find_data_file_in_load_path (const std::string& fcn, const std::string& file, - bool require_regular_file = false); - -OCTAVE_DEPRECATED (5, "use 'octave::contents_file_in_path' instead") -extern OCTINTERP_API std::string -contents_file_in_path (const std::string& s); - -OCTAVE_DEPRECATED (5, "use 'octave::fcn_file_in_path' instead") -extern OCTINTERP_API std::string -fcn_file_in_path (const std::string& s); - -OCTAVE_DEPRECATED (5, "use 'octave::do_string_escapes' instead") -extern OCTINTERP_API std::string -do_string_escapes (const std::string& s); - -OCTAVE_DEPRECATED (5, "use 'octave::undo_string_escape' instead") -extern OCTINTERP_API const char * -undo_string_escape (char c); - -OCTAVE_DEPRECATED (5, "use 'octave::undo_string_escapes' instead") -extern OCTINTERP_API std::string -undo_string_escapes (const std::string& s); - -OCTAVE_DEPRECATED (5, "use 'octave::check_dimensions' instead") -extern OCTINTERP_API void -check_dimensions (dim_vector& dim, const char *warnfor); - -OCTAVE_DEPRECATED (5, "use 'octave::get_dimensions' instead") -extern OCTINTERP_API void -get_dimensions (const octave_value& a, const char *warn_for, - dim_vector& dim); - -OCTAVE_DEPRECATED (5, "use 'octave::get_dimensions' instead") -extern OCTINTERP_API void -get_dimensions (const octave_value& a, const octave_value& b, - const char *warn_for, octave_idx_type& nr, - octave_idx_type& nc); - -OCTAVE_DEPRECATED (5, "use 'octave::get_dimensions' instead") -extern OCTINTERP_API void -get_dimensions (const octave_value& a, const char *warn_for, - octave_idx_type& nr, octave_idx_type& nc); - -OCTAVE_DEPRECATED (5, "use 'octave::dims_to_numel' instead") -extern OCTINTERP_API octave_idx_type -dims_to_numel (const dim_vector& dims, const octave_value_list& idx); - -OCTAVE_DEPRECATED (5, "use 'octave::identity_matrix' instead") -extern OCTINTERP_API Matrix -identity_matrix (octave_idx_type nr, octave_idx_type nc); - -OCTAVE_DEPRECATED (5, "use 'octave::float_identity_matrix' instead") -extern OCTINTERP_API FloatMatrix -float_identity_matrix (octave_idx_type nr, octave_idx_type nc); - -template -OCTAVE_DEPRECATED (5, "use 'octave::format' instead") -size_t -octave_format (std::ostream& os, const char *fmt, Args&& ... args) -{ - return octave::format (os, fmt, std::forward (args) ...); -} - -OCTAVE_DEPRECATED (5, "use 'octave::vformat' instead") -extern OCTINTERP_API size_t -octave_vformat (std::ostream& os, const char *fmt, va_list args); - -OCTAVE_DEPRECATED (5, "use 'octave::vasprintf' instead") -extern OCTINTERP_API std::string -octave_vasprintf (const char *fmt, va_list args); - -template -OCTAVE_DEPRECATED (5, "use 'octave::asprintf' instead") -std::string -octave_asprintf (const char *fmt, Args&& ... args) -{ - return octave::asprintf (fmt, std::forward (args) ...); -} - -OCTAVE_DEPRECATED (5, "use 'octave::sleep' instead") -extern OCTINTERP_API void -octave_sleep (double seconds); - -OCTAVE_DEPRECATED (5, "use 'octave::do_simple_cellfun' instead") -extern OCTINTERP_API octave_value_list -do_simple_cellfun (octave_value_list (*fun) (const octave_value_list&, int), - const char *fun_name, const octave_value_list& args, - int nargout); - -OCTAVE_DEPRECATED (5, "use 'octave::do_simple_cellfun' instead") -extern OCTINTERP_API octave_value -do_simple_cellfun (octave_value_list (*fun) (const octave_value_list&, int), - const char *fun_name, const octave_value_list& args); - #endif - -#endif diff -r f47f9493cb37 -r 376ca9022b7e libinterp/corefcn/variables.cc --- a/libinterp/corefcn/variables.cc Mon Feb 17 12:45:58 2020 -0800 +++ b/libinterp/corefcn/variables.cc Mon Feb 17 15:47:35 2020 -0500 @@ -1467,42 +1467,3 @@ { return SET_INTERNAL_VARIABLE (missing_component_hook); } - -// The following function is deprecated. - -string_vector -get_struct_elts (const std::string& text) -{ - int n = 1; - - size_t pos = 0; - - size_t len = text.length (); - - while ((pos = text.find ('.', pos)) != std::string::npos) - { - if (++pos == len) - break; - - n++; - } - - string_vector retval (n); - - pos = 0; - - for (int i = 0; i < n; i++) - { - len = text.find ('.', pos); - - if (len != std::string::npos) - len -= pos; - - retval[i] = text.substr (pos, len); - - if (len != std::string::npos) - pos += len + 1; - } - - return retval; -} diff -r f47f9493cb37 -r 376ca9022b7e libinterp/corefcn/variables.h --- a/libinterp/corefcn/variables.h Mon Feb 17 12:45:58 2020 -0800 +++ b/libinterp/corefcn/variables.h Mon Feb 17 15:47:35 2020 -0500 @@ -116,8 +116,4 @@ extern OCTINTERP_API std::string maybe_missing_function_hook (const std::string& name); -OCTAVE_DEPRECATED (5, "this function will be removed in a future version of Octave") -extern OCTINTERP_API string_vector -get_struct_elts (const std::string& text); - #endif diff -r f47f9493cb37 -r 376ca9022b7e libinterp/parse-tree/bp-table.cc --- a/libinterp/parse-tree/bp-table.cc Mon Feb 17 12:45:58 2020 -0800 +++ b/libinterp/parse-tree/bp-table.cc Mon Feb 17 15:47:35 2020 -0500 @@ -997,12 +997,4 @@ return retval; } - - octave_user_code * - get_user_code (const std::string& fname) - { - tree_evaluator& tw = __get_evaluator__ ("get_user_code"); - - return tw.get_user_code (fname); - } } diff -r f47f9493cb37 -r 376ca9022b7e libinterp/parse-tree/bp-table.h --- a/libinterp/parse-tree/bp-table.h Mon Feb 17 12:45:58 2020 -0800 +++ b/libinterp/parse-tree/bp-table.h Mon Feb 17 15:47:35 2020 -0500 @@ -164,9 +164,6 @@ intmap remove_all_breakpoints_in_file_1 (octave_user_code *fcn, const std::string& fname); }; - - OCTAVE_DEPRECATED (5, "use 'octave::get_user_code' instead") - extern octave_user_code * get_user_code (const std::string& fname = ""); } #endif diff -r f47f9493cb37 -r 376ca9022b7e libinterp/parse-tree/oct-parse.yy --- a/libinterp/parse-tree/oct-parse.yy Mon Feb 17 12:45:58 2020 -0800 +++ b/libinterp/parse-tree/oct-parse.yy Mon Feb 17 15:47:35 2020 -0500 @@ -5290,23 +5290,6 @@ namespace octave { - octave_value_list - eval_string (const std::string& eval_str, bool silent, - int& parse_status, int nargout) - { - interpreter& interp = __get_interpreter__ ("eval_string"); - - return interp.eval_string (eval_str, silent, parse_status, nargout); - } - - octave_value - eval_string (const std::string& eval_str, bool silent, int& parse_status) - { - interpreter& interp = __get_interpreter__ ("eval_string"); - - return interp.eval_string (eval_str, silent, parse_status); - } - void cleanup_statement_list (tree_statement_list **lst) { diff -r f47f9493cb37 -r 376ca9022b7e libinterp/parse-tree/parse.h --- a/libinterp/parse-tree/parse.h Mon Feb 17 12:45:58 2020 -0800 +++ b/libinterp/parse-tree/parse.h Mon Feb 17 15:47:35 2020 -0500 @@ -656,14 +656,6 @@ extern OCTINTERP_API octave_value_list feval (const octave_value_list& args, int nargout = 0); - OCTAVE_DEPRECATED (5, "use 'octave::interpreter::eval_string' instead") - extern OCTINTERP_API octave_value_list - eval_string (const std::string&, bool silent, int& parse_status, int nargout); - - OCTAVE_DEPRECATED (5, "use 'octave::interpreter::eval_string' instead") - extern OCTINTERP_API octave_value - eval_string (const std::string&, bool silent, int& parse_status); - extern OCTINTERP_API void cleanup_statement_list (tree_statement_list **lst); } diff -r f47f9493cb37 -r 376ca9022b7e libinterp/parse-tree/token.h --- a/libinterp/parse-tree/token.h Mon Feb 17 12:45:58 2020 -0800 +++ b/libinterp/parse-tree/token.h Mon Feb 17 15:47:35 2020 -0500 @@ -123,12 +123,6 @@ return m_type_tag == keyword_token || m_type_tag == ettype_token; } - OCTAVE_DEPRECATED (5, "use 'octave::iskeyword' instead") - bool is_keyword (void) const - { - return iskeyword (); - } - bool is_symbol (void) const { return m_type_tag == sym_rec_token; diff -r f47f9493cb37 -r 376ca9022b7e scripts/deprecated/module.mk --- a/scripts/deprecated/module.mk Mon Feb 17 12:45:58 2020 -0800 +++ b/scripts/deprecated/module.mk Mon Feb 17 15:47:35 2020 -0500 @@ -1,7 +1,6 @@ FCN_FILE_DIRS += %reldir% %canon_reldir%_FCN_FILES = \ - %reldir%/output_max_field_width.m \ %reldir%/runtests.m %canon_reldir%dir = $(fcnfiledir)/deprecated diff -r f47f9493cb37 -r 376ca9022b7e scripts/deprecated/output_max_field_width.m --- a/scripts/deprecated/output_max_field_width.m Mon Feb 17 12:45:58 2020 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -######################################################################## -## -## Copyright (C) 2018-2020 The Octave Project Developers -## -## See the file COPYRIGHT.md in the top-level directory of this -## distribution or . -## -## This file is part of Octave. -## -## Octave is free software: you can redistribute it and/or modify it -## under the terms of the GNU General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## Octave is distributed in the hope that it will be useful, but -## WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with Octave; see the file COPYING. If not, see -## . -## -######################################################################## - -## -*- texinfo -*- -## @deftypefn {} {@var{val} =} output_max_field_width () -## @deftypefnx {} {@var{old_val} =} output_max_field_width (@var{new_val}) -## @deftypefnx {} {} output_max_field_width (@var{new_val}, "local") -## -## @code{output_max_field_width} is deprecated and will be removed in Octave -## version 7. Use @code{output_precision} instead. -## -## Query or set the internal variable that specifies the maximum width -## of a numeric output field. -## -## When called from inside a function with the @qcode{"local"} option, the -## variable is changed locally for the function and any subroutines it calls. -## The original variable value is restored when exiting the function. -## @seealso{format, fixed_point_format, output_precision} -## @end deftypefn - -## FIXME: DEPRECATED: Remove in version 7. - -function retval = output_max_field_width (varargin) - - persistent warned = false; - if (! warned) - warned = true; - warning ("Octave:deprecated-function", - "output_max_field_width is obsolete and will be removed from a future version of Octave, please use output_precision instead\n"); - endif - - retval = 20; - -endfunction