Mercurial > hg > octave-max
changeset 15476:da6c37ed0b42
eliminate calls to bind_internal_variable when setting --traditional options
* octave.cc (traditional): Delete static variable.
(maximum_braindamage): Call built-in functions directly instead of
using bind_internal_variable.
(octave_process_command_line): Handle traditional option directly.
(octave_initialize_interpreter): Don't handle traditional option here.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 03 Oct 2012 02:32:26 -0400 |
| parents | 1865feebb415 |
| children | 7760d5eff9b2 |
| files | libinterp/octave.cc |
| diffstat | 1 files changed, 15 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/octave.cc +++ b/libinterp/octave.cc @@ -46,6 +46,7 @@ #include "pathsearch.h" #include "str-vec.h" +#include "builtins.h" #include "defaults.h" #include "Cell.h" #include "defun.h" @@ -113,10 +114,6 @@ // (--quiet; --silent; -q) static bool inhibit_startup_message = false; -// TRUE means we turn on compatibility options. -// (--traditional) -static bool traditional = false; - // If TRUE, print verbose info in some cases. // (--verbose; -V) static bool verbose_flag = false; @@ -667,20 +664,19 @@ { persist = true; - bind_internal_variable ("PS1", ">> "); - bind_internal_variable ("PS2", ""); - bind_internal_variable ("PS4", ""); - bind_internal_variable ("allow_noninteger_range_as_index", true); - bind_internal_variable ("beep_on_error", true); - bind_internal_variable ("confirm_recursive_rmdir", false); - bind_internal_variable ("crash_dumps_octave_core", false); - bind_internal_variable ("default_save_options", "-mat-binary"); - bind_internal_variable ("do_braindead_shortcircuit_evaluation", true); - bind_internal_variable ("fixed_point_format", true); - bind_internal_variable ("history_timestamp_format_string", - "%%-- %D %I:%M %p --%%"); - bind_internal_variable ("page_screen_output", false); - bind_internal_variable ("print_empty_dimensions", false); + FPS1 (octave_value (">> ")); + FPS2 (octave_value ("")); + FPS4 (octave_value ("")); + Fallow_noninteger_range_as_index (octave_value (true)); + Fbeep_on_error (octave_value (true)); + Fconfirm_recursive_rmdir (octave_value (false)); + Fcrash_dumps_octave_core (octave_value (false)); + Fdefault_save_options (octave_value ("-mat-binary")); + Fdo_braindead_shortcircuit_evaluation (octave_value (true)); + Ffixed_point_format (octave_value (true)); + Fhistory_timestamp_format_string (octave_value ("%%-- %D %I:%M %p --%%")); + Fpage_screen_output (octave_value (false)); + Fprint_empty_dimensions (octave_value (false)); disable_warning ("Octave:abbreviated-property-match"); disable_warning ("Octave:fopen-file-in-path"); @@ -862,7 +858,7 @@ break; case TRADITIONAL_OPTION: - traditional = true; + maximum_braindamage (); break; default: @@ -996,9 +992,6 @@ if (line_editing) initialize_command_input (); - if (traditional) - maximum_braindamage (); - octave_interpreter_ready = true; initialize_version_info ();