diff libinterp/corefcn/input.h @ 20054:1c9ed5b4c73d

input.h: change meaning of interactive and forced_interactive global variables. * libinterp/corefcn/input.h, libinterp/corefcn/input.cc: the interactive var is set at the start of Octave session if the session would be interactive. The forced_interactive is set only by the "--interactive" option. This means that in a forced interactive session, interactive is false, and that in a not forced interactive session with the "--interactive" option, forced_interactive is true. This is a bit counter-intuitive. Also when it matters if a session is interactive or not, it should not matter if it was forced not, only whether is interactive. Change this logic. Interactive means we are running a interactive session, forced interactive means the interactive session needed to be forced. * libinterp/octave.cc: during Octave initialization, as soon as we identify if this would be an interactive session, check with forced_interactive to adjust the value of this variables. * libinterp/corefcn/error.cc, libinterp/corefcn/oct-stream.cc, libinterp/corefcn/pager.cc, libinterp/corefcn/dirfns.cc, libinterp/corefcn/sighandlers.cc, libinterp/corefcn/sysdep.cc, libinterp/corefcn/toplev.cc, libinterp/parse-tree/lex.ll, libinterp/parse-tree/oct-parse.in.yy: replace all checks for "(interactive || forced_interactive)" with simply interactive. On the few cases where forced_interactive was not checked, it was replaced with "(interactive && ! forced_interactive)", just like "! interactive" got replaced by "(! interactive || forced_interactive)", only to conserve the logic. I am uncertain if such checks are not actually bugs though.
author Carnë Draug <carandraug@octave.org>
date Tue, 24 Feb 2015 17:09:42 +0000
parents 4197fc428c7d
children
line wrap: on
line diff
--- a/libinterp/corefcn/input.h
+++ b/libinterp/corefcn/input.h
@@ -38,10 +38,11 @@
 
 extern OCTINTERP_API FILE *get_input_from_stdin (void);
 
-// TRUE means this is an interactive shell.
+// TRUE means this is an interactive shell (forced or not)
 extern bool interactive;
 
 // TRUE means the user forced this shell to be interactive (-i).
+// FALSE means the shell would be interactive, independent of user settings.
 extern bool forced_interactive;
 
 // TRUE after a call to completion_matches.