Mercurial > octave
diff libinterp/corefcn/variables.cc @ 30337:eff73c13fcf3
remove functions deprecated in version 6
* runtests.m: Delete.
* scripts/deprecated/module.mk: Update.
* error.h, error.cc (error_state, reset_error_handler): Delete.
* errwarn.h (warn_divide_by_zero): Delete.
* file-io.cc (mark_for_deletion, cleanup_tmp_files): Delete from
global namespace.
* interpreter.cc, toplev.cc: Don't include file-io.h.
* graphics-toolkit.h (graphics_toolkit, base_graphics_toolkit): Delete
from global namespace.
* input.h, input.cc (Vtrack_line_num): Delete.
* interpreter.h, interpreter.cc (interpreter::add_atexit_function,
interpreter::remove_atexit_function,
interpreter::add_atexit_function_deprecated,
interpreter::remove_atexit_function_deprecated): Delete.
* symtab.h, symtab.cc
(symbol_table::at_top_level_deprecated,
symbol_table::varval_deprecated,
symbol_table::global_varval_deprecated,
symbol_table::top_level_varval_deprecated,
symbol_table::global_variable_names_deprecated,
symbol_table::top_level_variable_names_deprecated,
symbol_table::variable_names_deprecated,
symbol_table::assign_deprecated, symbol_table::clear_all_deprecated,
symbol_table::clear_global_deprecated,
symbol_table::clear_global_pattern_deprecated,
symbol_table::clear_symbol_deprecated,
symbol_table::clear_symbol_pattern_deprecated,
symbol_table::global_assign_deprecated,
symbol_table::top_level_assign_deprecated, symbol_table::at_top_level,
symbol_table::varval, symbol_table::global_varval,
symbol_table::top_level_varval, symbol_table::global_variable_names,
symbol_table::top_level_variable_names, symbol_table::variable_names,
symbol_table::assign, symbol_table::clear_all,
symbol_table::clear_global, symbol_table::clear_global_pattern,
symbol_table::clear_symbol, symbol_table::clear_symbol_pattern,
symbol_table::global_assign, symbol_table::top_level_assign): Delete.
* variables.h, variables.cc (extract_function): Delete.
* ov-fcn-handle.h, ov-fcn-handle.cc (make_fcn_handle): Delete.
* lo-array-errwarn.h, lo-array-errwarn.cc (err_index_out_of_range):
Delete.
* quit.h, quit.cc (octave_exception_state, internal_exception_state,
octave_bad_alloc_hook, enum octave_internal_exception,
octave_throw_interrupt_exception, octave_throw_execution_exception,
octave_throw_bad_alloc, octave_rethrow_exception): Delete.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 24 Nov 2021 10:26:19 -0500 |
parents | b568c29bb5be |
children | 841a10208c38 |
line wrap: on
line diff
--- a/libinterp/corefcn/variables.cc Wed Nov 24 07:38:29 2021 -0500 +++ b/libinterp/corefcn/variables.cc Wed Nov 24 10:26:19 2021 -0500 @@ -1525,45 +1525,3 @@ } OCTAVE_NAMESPACE_END - -// DEPRECATED in Octave 6 - -octave_function * -extract_function (const octave_value& arg, const std::string& warn_for, - const std::string& fname, const std::string& header, - const std::string& trailer) -{ - octave_function *retval = is_valid_function (arg, warn_for, 0); - - if (! retval) - { - std::string s = arg.xstring_value ("%s: argument must be a string", - warn_for.c_str ()); - - std::string cmd = header; - cmd.append (s); - cmd.append (trailer); - - int parse_status; - - octave::interpreter& interp - = octave::__get_interpreter__ ("extract_function"); - - interp.eval_string (cmd, true, parse_status, 0); - - if (parse_status != 0) - error ("%s: '%s' is not valid as a function", - warn_for.c_str (), fname.c_str ()); - - retval = is_valid_function (fname, warn_for, 0); - - if (! retval) - error ("%s: '%s' is not valid as a function", - warn_for.c_str (), fname.c_str ()); - - warning ("%s: passing function body as a string is obsolete; please use anonymous functions", - warn_for.c_str ()); - } - - return retval; -}