Mercurial > octave

comparison libinterp/corefcn/symtab.h @ 30337:eff73c13fcf3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 774d6edb4cae
children 83f9f8bda883
comparison
equal deleted inserted replaced
30336:dc1347cab668 30337:eff73c13fcf3
183 183
184 void cleanup (void); 184 void cleanup (void);
185 185
186 fcn_info * get_fcn_info (const std::string& name); 186 fcn_info * get_fcn_info (const std::string& name);
187 187
188 // The remaining functions are all provided for backward
189 // compatibility. New code should use the functions provided by the
190 // interpreter class.
191
192 private:
193
194 // Remove when corresponding public deprecated function is removed.
195 bool at_top_level_deprecated (void);
196
197 // Remove when corresponding public deprecated function is removed.
198 octave_value varval_deprecated (const std::string& name) const;
199
200 // Remove when corresponding public deprecated function is removed.
201 octave_value global_varval_deprecated (const std::string& name) const;
202
203 // Remove when corresponding public deprecated function is removed.
204 octave_value top_level_varval_deprecated (const std::string& name) const;
205
206 // Remove when corresponding public deprecated function is removed.
207 std::list<std::string> global_variable_names_deprecated (void);
208
209 // Remove when corresponding public deprecated function is removed.
210 std::list<std::string> top_level_variable_names_deprecated (void);
211
212 // Remove when corresponding public deprecated function is removed.
213 std::list<std::string> variable_names_deprecated (void);
214
215 // Remove when corresponding public deprecated function is removed.
216 void assign_deprecated (const std::string& name,
217 const octave_value& value = octave_value ());
218
219 // Remove when corresponding public deprecated function is removed.
220 // Note, FORCE_ADD no longer has any meaning.
221 void assign_deprecated (const std::string& name, const octave_value& value,
222 bool /*force_add*/);
223
224 // Remove when corresponding public deprecated function is removed.
225 void clear_all_deprecated (bool force = false);
226
227 // Remove when corresponding public deprecated function is removed.
228 void clear_global_deprecated (const std::string& name);
229
230 // Remove when corresponding public deprecated function is removed.
231 void clear_global_pattern_deprecated (const std::string& pattern);
232
233 // Remove when corresponding public deprecated function is removed.
234 void clear_symbol_deprecated (const std::string& name);
235
236 // Remove when corresponding public deprecated function is removed.
237 void clear_symbol_pattern_deprecated (const std::string& pattern);
238
239 // Remove when corresponding public deprecated function is removed.
240 void global_assign_deprecated (const std::string& name,
241 const octave_value& value = octave_value ());
242
243 // Remove when corresponding public deprecated function is removed.
244 void top_level_assign_deprecated (const std::string& name,
245 const octave_value& value = octave_value ());
246
247 public:
248
249 #if defined (OCTAVE_PROVIDE_DEPRECATED_SYMBOLS)
250 OCTAVE_DEPRECATED (6, "use 'interpreter::at_top_level' instead")
251 bool at_top_level (void)
252 {
253 return at_top_level_deprecated ();
254 }
255
256 OCTAVE_DEPRECATED (6, "use 'interpreter::varval' instead")
257 octave_value varval (const std::string& name) const
258 {
259 return varval_deprecated (name);
260 }
261
262 OCTAVE_DEPRECATED (6, "use 'interpreter::global_varval' instead")
263 octave_value global_varval (const std::string& name) const
264 {
265 return global_varval_deprecated (name);
266 }
267
268 OCTAVE_DEPRECATED (6, "use 'interpreter::top_level_varval' instead")
269 octave_value top_level_varval (const std::string& name) const
270 {
271 return top_level_varval_deprecated (name);
272 }
273
274 OCTAVE_DEPRECATED (6, "use 'interpreter::global_variable_names' instead")
275 std::list<std::string> global_variable_names (void)
276 {
277 return global_variable_names_deprecated ();
278 }
279
280 OCTAVE_DEPRECATED (6, "use 'interpreter::top_level_variable_names' instead")
281 std::list<std::string> top_level_variable_names (void)
282 {
283 return top_level_variable_names_deprecated ();
284 }
285
286 OCTAVE_DEPRECATED (6, "use 'interpreter::variable_names' instead")
287 std::list<std::string> variable_names (void)
288 {
289 return variable_names_deprecated ();
290 }
291
292 OCTAVE_DEPRECATED (6, "use 'interpreter::assign' instead")
293 void assign (const std::string& name,
294 const octave_value& value = octave_value ())
295 {
296 assign_deprecated (name, value);
297 }
298
299 // Note, FORCE_ADD no longer has any meaning.
300 OCTAVE_DEPRECATED (6, "use 'interpreter::assign' instead")
301 void assign (const std::string& name, const octave_value& value,
302 bool /*force_add*/)
303 {
304 assign_deprecated (name, value);
305 }
306
307 OCTAVE_DEPRECATED (6, "use 'interpreter::clear_all' instead")
308 void clear_all (bool force = false)
309 {
310 clear_all_deprecated (force);
311 }
312
313 OCTAVE_DEPRECATED (6, "use 'interpreter::clear_global' instead")
314 void clear_global (const std::string& name)
315 {
316 clear_global_deprecated (name);
317 }
318
319 OCTAVE_DEPRECATED (6, "use 'interpreter::clear_global_pattern' instead")
320 void clear_global_pattern (const std::string& pattern)
321 {
322 clear_global_pattern_deprecated (pattern);
323 }
324
325 OCTAVE_DEPRECATED (6, "use 'interpreter::clear_symbol' instead")
326 void clear_symbol (const std::string& name)
327 {
328 clear_symbol_deprecated (name);
329 }
330
331 OCTAVE_DEPRECATED (6, "use 'interpreter::clear_symbol_pattern' instead")
332 void clear_symbol_pattern (const std::string& pattern)
333 {
334 clear_symbol_pattern_deprecated (pattern);
335 }
336
337 OCTAVE_DEPRECATED (6, "use 'interpreter::global_assign' instead")
338 void global_assign (const std::string& name,
339 const octave_value& value = octave_value ())
340 {
341 global_assign_deprecated (name, value);
342 }
343
344 OCTAVE_DEPRECATED (6, "use 'interpreter::top_level_assign' instead")
345 void top_level_assign (const std::string& name,
346 const octave_value& value = octave_value ())
347 {
348 top_level_assign_deprecated (name, value);
349 }
350 #endif
351
352 private: 188 private:
353 189
354 interpreter& m_interpreter; 190 interpreter& m_interpreter;
355 191
356 typedef std::map<std::string, octave_value>::const_iterator 192 typedef std::map<std::string, octave_value>::const_iterator