octave: libinterp/corefcn/interpreter.cc annotate

annotate libinterp/corefcn/interpreter.cc @ 33250:40fde86be9b0

replace calls to error_* with corresponding panic_* functions in libinterp Affected files: __isprimelarge__.cc, cellfun.cc, daspk.cc, dasrt.cc, dassl.cc, data.cc, graphics.cc, kron.cc, mex.cc, oct-map.cc, oct-stream.cc, pr-output.cc, schur.cc, variables.cc, and ops.h.

author	John W. Eaton <jwe@octave.org>
date	Mon, 25 Mar 2024 00:42:04 -0400
parents	2c9b649e96c8
children	fb44a9db1bc6

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
32632 2e484f9f1f18 maint: update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 32589 diff changeset	3 // Copyright (C) 1993-2024 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	25
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	26 #if defined (HAVE_CONFIG_H)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	27 # include "config.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	28 #endif
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	29
27017 24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	30 #include <cstdio>
30310 efaaf58c8d07 interpreter.cc: Include missing header <clocale>. Markus Mützel <markus.muetzel@gmx.de> parents: 30309 diff changeset	31 #include <clocale>
27017 24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	32
29619 5cf985f5760a move get_line_and_eval to parse tree evaluator John W. Eaton <jwe@octave.org> parents: 29618 diff changeset	33 #include <iostream>
27542 b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	34 #include <set>
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	35 #include <string>
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	36 #include <thread>
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	37
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	38 #include "cmd-edit.h"
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	39 #include "cmd-hist.h"
27408 9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	40 #include "file-ops.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	41 #include "file-stat.h"
27832 8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27693 diff changeset	42 #include "file-ops.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	43 #include "fpucw-wrappers.h"
22322 93b3cdd36854 move most f77 function decls to separate header files John W. Eaton <jwe@octave.org> parents: 22196 diff changeset	44 #include "lo-blas-proto.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	45 #include "lo-error.h"
32080 e9fdfebc6db0 Avoid using file_stat in libinterp/corefcn (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31898 diff changeset	46 #include "lo-sysdep.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	47 #include "oct-env.h"
29292 eb1e10abe9d5 use method in interpreter class to interrupt interpreter execution in GUI John W. Eaton <jwe@octave.org> parents: 29281 diff changeset	48 #include "quit.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	49 #include "str-vec.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	50 #include "signal-wrappers.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	51 #include "unistd-wrappers.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	52
23711 5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	53 #include "builtin-defun-decls.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	54 #include "defaults.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	55 #include "Cell.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	56 #include "defun.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	57 #include "display.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	58 #include "error.h"
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27262 diff changeset	59 #include "event-manager.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	60 #include "graphics.h"
23721 b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23719 diff changeset	61 #include "help.h"
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25404 diff changeset	62 #include "input.h"
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	63 #include "interpreter-private.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	64 #include "interpreter.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	65 #include "load-path.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	66 #include "load-save.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	67 #include "octave.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	68 #include "oct-hist.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	69 #include "oct-map.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	70 #include "oct-mutex.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	71 #include "ovl.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	72 #include "ov.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	73 #include "ov-classdef.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	74 #include "parse.h"
27017 24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	75 #include "pt-classdef.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	76 #include "pt-eval.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	77 #include "pt-jump.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	78 #include "pt-stmt.h"
25443 2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25440 diff changeset	79 #include "settings.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	80 #include "sighandlers.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	81 #include "sysdep.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	82 #include "unwind-prot.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	83 #include "utils.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	84 #include "variables.h"
23466 5da300c55e89 use "" instead of <> for including defaults.h and version.h John W. Eaton <jwe@octave.org> parents: 23460 diff changeset	85 #include "version.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	86
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	87 // TRUE means the quit() call is allowed.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	88 bool quit_allowed = true;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	89
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	90 // TRUE means we are ready to interpret commands, but not everything
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	91 // is ready for interactive use.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	92 bool octave_interpreter_ready = false;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	93
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	94 // TRUE means we've processed all the init code and we are good to go.
31846 5f0b8101234e Remove several race conditions with signal handler (bug #61370). Reinhard Resch <r_resch@a1.net> parents: 31845 diff changeset	95 std::atomic<bool> octave_initialized{false};
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	96
31605 e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 31593 diff changeset	97 OCTAVE_BEGIN_NAMESPACE(octave)
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29956 diff changeset	98
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	99 DEFUN (__version_info__, args, ,
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	100 doc: /* -- texinfo --
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	101 @deftypefn {} {retval =} __version_info__ (@var{name}, @var{version}, @var{release}, @var{date})
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	102 Undocumented internal function.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	103 @end deftypefn */)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	104 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	105 static octave_map vinfo;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	106
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	107 int nargin = args.length ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	108
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	109 if (nargin != 0 && nargin != 4)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	110 print_usage ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	111
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	112 octave_value retval;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	113
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	114 if (nargin == 0)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	115 retval = vinfo;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	116 else if (nargin == 4)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	117 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	118 if (vinfo.nfields () == 0)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	119 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	120 vinfo.assign ("Name", args(0));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	121 vinfo.assign ("Version", args(1));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	122 vinfo.assign ("Release", args(2));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	123 vinfo.assign ("Date", args(3));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	124 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	125 else
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	126 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	127 octave_idx_type n = vinfo.numel () + 1;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	128
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	129 vinfo.resize (dim_vector (n, 1));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	130
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	131 octave_value idx (n);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	132
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	133 vinfo.assign (idx, "Name", Cell (octave_value (args(0))));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	134 vinfo.assign (idx, "Version", Cell (octave_value (args(1))));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	135 vinfo.assign (idx, "Release", Cell (octave_value (args(2))));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	136 vinfo.assign (idx, "Date", Cell (octave_value (args(3))));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	137 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	138 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	139
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	140 return retval;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	141 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	142
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27214 diff changeset	143 DEFMETHOD (quit, interp, args, ,
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27214 diff changeset	144 doc: /* -- texinfo --
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	145 @deftypefn {} {} quit
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	146 @deftypefnx {} {} quit cancel
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	147 @deftypefnx {} {} quit force
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	148 @deftypefnx {} {} quit ("cancel")
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	149 @deftypefnx {} {} quit ("force")
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	150 @deftypefnx {} {} quit (@var{status})
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	151 @deftypefnx {} {} quit (@var{status}, "force")
32581 ca5d00ab014c Apply consistent notes in docstrings for aliased functions Nicholas R. Jankowski <jankowski.nicholas@gmail.com> parents: 32331 diff changeset	152 @deftypefnx {} {} exit (@dots{})
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	153 Quit the current Octave session.
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	154
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	155 If the optional integer value @var{status} is supplied, pass that value to
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	156 the operating system as Octave's exit status. The default value is zero.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	157
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	158 When exiting, Octave will attempt to run the m-file @file{finish.m} if it
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	159 exists. User commands to save the workspace or clean up temporary files
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	160 may be placed in that file. Alternatively, another m-file may be scheduled
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	161 to run using @code{atexit}. If an error occurs while executing the
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	162 @file{finish.m} file, Octave does not exit and control is returned to
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	163 the command prompt.
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	164
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	165 If the optional argument @qcode{"cancel"} is provided, Octave does not
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	166 exit and control is returned to the command prompt. This feature allows
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	167 the @code{finish.m} file to cancel the quit process.
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	168
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	169 If the user preference to request confirmation before exiting, Octave
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	170 will display a dialog and give the user an option to cancel the exit
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	171 process.
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	172
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	173 If the optional argument @qcode{"force"} is provided, no confirmation is
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	174 requested, and the execution of the @file{finish.m} file is skipped.
32581 ca5d00ab014c Apply consistent notes in docstrings for aliased functions Nicholas R. Jankowski <jankowski.nicholas@gmail.com> parents: 32331 diff changeset	175
ca5d00ab014c Apply consistent notes in docstrings for aliased functions Nicholas R. Jankowski <jankowski.nicholas@gmail.com> parents: 32331 diff changeset	176 Programming Note: @code{exit} is an alias for @code{quit} and can be used
ca5d00ab014c Apply consistent notes in docstrings for aliased functions Nicholas R. Jankowski <jankowski.nicholas@gmail.com> parents: 32331 diff changeset	177 interchangeably.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	178 @seealso{atexit}
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	179 @end deftypefn */)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	180 {
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	181 int numel = args.length ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	182
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	183 if (numel > 2)
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	184 print_usage ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	185
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	186 int exit_status = 0;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	187
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	188 bool force = false;
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	189 bool cancel = false;
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	190
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	191 if (numel == 2)
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	192 {
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	193 exit_status = args(0).xnint_value ("quit: STATUS must be an integer");
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	194 std::string frc
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	195 = args(1).xstring_value ("quit: second argument must be a string");
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	196
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	197 if (frc == "force")
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	198 force = true;
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	199 else
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	200 error (R"(quit: second argument must be string "force")");
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	201 }
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	202 else if (numel == 1)
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	203 {
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	204 if (args(0).is_string ())
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	205 {
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	206 const char *msg
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	207 = R"(quit: option must be string "cancel" or "force")";
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	208
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	209 std::string opt = args(0).xstring_value (msg);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	210
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	211 if (opt == "cancel")
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	212 cancel = true;
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	213 else if (opt == "force")
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	214 force = true;
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	215 else
27593 a2db1e36e9b2 Silence compiler warning about use of error() without format string. Rik <rik@octave.org> parents: 27592 diff changeset	216 error ("%s", msg);
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	217 }
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	218 else
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	219 exit_status = args(0).xnint_value ("quit: STATUS must be an integer");
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	220 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	221
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	222 if (cancel)
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	223 {
27591 b54d6ac62fbf make "quit cancel" a no-op outside of finish script John W. Eaton <jwe@octave.org> parents: 27588 diff changeset	224 // No effect if "quit cancel" appears outside of finish script.
b54d6ac62fbf make "quit cancel" a no-op outside of finish script John W. Eaton <jwe@octave.org> parents: 27588 diff changeset	225
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	226 if (interp.executing_finish_script ())
27591 b54d6ac62fbf make "quit cancel" a no-op outside of finish script John W. Eaton <jwe@octave.org> parents: 27588 diff changeset	227 interp.cancel_quit (true);
b54d6ac62fbf make "quit cancel" a no-op outside of finish script John W. Eaton <jwe@octave.org> parents: 27588 diff changeset	228
b54d6ac62fbf make "quit cancel" a no-op outside of finish script John W. Eaton <jwe@octave.org> parents: 27588 diff changeset	229 return ovl ();
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	230 }
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	231
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	232 interp.quit (exit_status, force);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	233
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	234 return ovl ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	235 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	236
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	237 DEFALIAS (exit, quit);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	238
27474 3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27471 diff changeset	239 DEFMETHOD (atexit, interp, args, nargout,
3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27471 diff changeset	240 doc: /* -- texinfo --
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	241 @deftypefn {} {} atexit (@var{fcn})
30888 32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/ Rik <rik@octave.org> parents: 30752 diff changeset	242 @deftypefnx {} {} atexit (@var{fcn}, true)
32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/ Rik <rik@octave.org> parents: 30752 diff changeset	243 @deftypefnx {} {} atexit (@var{fcn}, false)
32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/ Rik <rik@octave.org> parents: 30752 diff changeset	244 @deftypefnx {} {@var{status} =} atexit (@var{fcn}, false)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	245 Register a function to be called when Octave exits.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	246
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	247 For example,
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	248
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	249 @example
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	250 @group
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	251 function last_words ()
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	252 disp ("Bye bye");
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	253 endfunction
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	254 atexit ("last_words");
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	255 @end group
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	256 @end example
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	257
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	258 @noindent
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	259 will print the message @qcode{"Bye bye"} when Octave exits.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	260
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	261 The additional argument @var{flag} will register or unregister @var{fcn}
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	262 from the list of functions to be called when Octave exits. If @var{flag} is
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	263 true, the function is registered, and if @var{flag} is false, it is
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	264 unregistered. For example, after registering the function @code{last_words}
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	265 above,
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	266
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	267 @example
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	268 atexit ("last_words", false);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	269 @end example
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	270
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	271 @noindent
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	272 will remove the function from the list and Octave will not call
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	273 @code{last_words} when it exits.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	274
30888 32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/ Rik <rik@octave.org> parents: 30752 diff changeset	275 The optional output @var{status} is only available when unregistering a
31376 ad8a4102f910 doc: Spellcheck documentation for 8.1 release. Rik <rik@octave.org> parents: 31105 diff changeset	276 function. The value is true if the unregistering was successful and false
30888 32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/ Rik <rik@octave.org> parents: 30752 diff changeset	277 otherwise.
32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/ Rik <rik@octave.org> parents: 30752 diff changeset	278
31376 ad8a4102f910 doc: Spellcheck documentation for 8.1 release. Rik <rik@octave.org> parents: 31105 diff changeset	279 Programming Note: @code{atexit} only removes the first occurrence of a function
30888 32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/ Rik <rik@octave.org> parents: 30752 diff changeset	280 from the list; if a function was placed in the list multiple times with
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	281 @code{atexit}, it must also be removed from the list multiple times.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	282 @seealso{quit}
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	283 @end deftypefn */)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	284 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	285 int nargin = args.length ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	286
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	287 if (nargin < 1 \|\| nargin > 2)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	288 print_usage ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	289
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	290 std::string arg = args(0).xstring_value ("atexit: FCN argument must be a string");
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	291
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	292 bool add_mode = (nargin == 2)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	293 ? args(1).xbool_value ("atexit: FLAG argument must be a logical value")
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	294 : true;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	295
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	296 octave_value_list retval;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	297
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	298 if (add_mode)
27689 4f32af6abd4b don't use static variable for list of interpreter atexit functions John W. Eaton <jwe@octave.org> parents: 27594 diff changeset	299 interp.add_atexit_fcn (arg);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	300 else
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	301 {
27689 4f32af6abd4b don't use static variable for list of interpreter atexit functions John W. Eaton <jwe@octave.org> parents: 27594 diff changeset	302 bool found = interp.remove_atexit_fcn (arg);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	303
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	304 if (nargout > 0)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	305 retval = ovl (found);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	306 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	307
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	308 return retval;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	309 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	310
28380 548556e78bdf make --traditional option easily accessible to the interpreter John W. Eaton <jwe@octave.org> parents: 28347 diff changeset	311 DEFMETHOD (__traditional__, interp, , ,
548556e78bdf make --traditional option easily accessible to the interpreter John W. Eaton <jwe@octave.org> parents: 28347 diff changeset	312 doc: /* -- texinfo --
30888 32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/ Rik <rik@octave.org> parents: 30752 diff changeset	313 @deftypefn {} {@var{tf} =} __traditional__ ()
33054 1a6cb4552775 doc: Force Texinfo to render a space after @w{} macro. Rik <rik@octave.org> parents: 32632 diff changeset	314 Return true if Octave was invoked with the @w{@env{--traditional}}@ option.
28380 548556e78bdf make --traditional option easily accessible to the interpreter John W. Eaton <jwe@octave.org> parents: 28347 diff changeset	315 @end deftypefn */)
548556e78bdf make --traditional option easily accessible to the interpreter John W. Eaton <jwe@octave.org> parents: 28347 diff changeset	316 {
548556e78bdf make --traditional option easily accessible to the interpreter John W. Eaton <jwe@octave.org> parents: 28347 diff changeset	317 return ovl (interp.traditional ());
548556e78bdf make --traditional option easily accessible to the interpreter John W. Eaton <jwe@octave.org> parents: 28347 diff changeset	318 }
548556e78bdf make --traditional option easily accessible to the interpreter John W. Eaton <jwe@octave.org> parents: 28347 diff changeset	319
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	320 temporary_file_list::~temporary_file_list ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	321 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	322 cleanup ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	323 }
27542 b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	324
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	325 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	326 temporary_file_list::insert (const std::string& file)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	327 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	328 m_files.insert (file);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	329 }
27542 b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	330
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	331 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	332 temporary_file_list::cleanup ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	333 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	334 while (! m_files.empty ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	335 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	336 auto it = m_files.begin ();
27542 b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	337
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	338 octave_unlink_wrapper (it->c_str ());
27542 b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	339
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	340 m_files.erase (it);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	341 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	342 }
27542 b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	343
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	344 // The time we last time we changed directories.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	345 sys::time Vlast_chdir_time = 0.0;
27408 9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	346
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	347 static void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	348 initialize_version_info ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	349 {
31813 73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	350 octave_value_list args (4);
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	351
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	352 args(0) = "GNU Octave";
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	353 args(1) = OCTAVE_VERSION;
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	354 args(2) = config::release ();
31813 73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	355 args(3) = OCTAVE_RELEASE_DATE;
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	356
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	357 F__version_info__ (args);
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	358 }
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	359
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	360 static void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	361 xerbla_abort ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	362 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	363 error ("Fortran procedure terminated by call to XERBLA");
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	364 }
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	365
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	366 static void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	367 initialize_xerbla_error_handler ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	368 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	369 // The idea here is to force xerbla to be referenced so that we will
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	370 // link to our own version instead of the one provided by the BLAS
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	371 // library. But numeric_limits<double>::NaN () should never be -1, so
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	372 // we should never actually call xerbla. FIXME (again!): If this
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	373 // becomes a constant expression the test might be optimized away and
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	374 // then the reference to the function might also disappear.
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	375
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	376 if (numeric_limits<double>::NaN () == -1)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	377 F77_FUNC (xerbla, XERBLA) ("octave", 13 F77_CHAR_ARG_LEN (6));
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	378
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	379 typedef void (*xerbla_handler_ptr) ();
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	380
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	381 typedef void (*octave_set_xerbla_handler_ptr) (xerbla_handler_ptr);
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	382
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	383 dynamic_library libs ("");
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	384
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	385 if (libs)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	386 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	387 octave_set_xerbla_handler_ptr octave_set_xerbla_handler
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	388 = reinterpret_cast<octave_set_xerbla_handler_ptr>
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	389 (libs.search ("octave_set_xerbla_handler"));
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	390
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	391 if (octave_set_xerbla_handler)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	392 octave_set_xerbla_handler (xerbla_abort);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	393 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	394 }
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	395
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	396 OCTAVE_NORETURN static void
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	397 lo_error_handler (const char *fmt, ...)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	398 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	399 va_list args;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	400 va_start (args, fmt);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	401 verror_with_cfn (fmt, args);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	402 va_end (args);
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	403
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	404 throw execution_exception ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	405 }
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	406
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	407 OCTAVE_NORETURN static void
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	408 lo_error_with_id_handler (const char id, const char fmt, ...)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	409 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	410 va_list args;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	411 va_start (args, fmt);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	412 verror_with_id_cfn (id, fmt, args);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	413 va_end (args);
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	414
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	415 throw execution_exception ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	416 }
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	417
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	418 static void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	419 initialize_error_handlers ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	420 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	421 set_liboctave_error_handler (lo_error_handler);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	422 set_liboctave_error_with_id_handler (lo_error_with_id_handler);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	423 set_liboctave_warning_handler (warning);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	424 set_liboctave_warning_with_id_handler (warning_with_id);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	425 }
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	426
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	427 // Create an interpreter object and perform initialization up to the
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	428 // point of setting reading command history and setting the load
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	429 // path.
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22186 diff changeset	430
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	431 interpreter::interpreter (application *app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	432 : m_app_context (app_context),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	433 m_tmp_files (),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	434 m_atexit_fcns (),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	435 m_display_info (),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	436 m_environment (),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	437 m_settings (),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	438 m_error_system (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	439 m_evaluator (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	440 m_help_system (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	441 m_input_system (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	442 m_output_system (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	443 m_history_system (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	444 m_dynamic_loader (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	445 m_load_path (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	446 m_load_save_system (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	447 m_type_info (),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	448 m_symbol_table (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	449 m_stream_list (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	450 m_child_list (),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	451 m_url_handle_manager (),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	452 m_cdef_manager (*this),
31730 610a85b0ff62 use interpreter::feval instead of global feval function John W. Eaton <jwe@octave.org> parents: 31727 diff changeset	453 m_gtk_manager (*this),
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	454 m_event_manager (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	455 m_gh_manager (nullptr),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	456 m_interactive (false),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	457 m_read_site_files (true),
32678 49d6ecd07a76 Rename command-line options for handling configuration files. Rik <rik@octave.org> parents: 32677 diff changeset	458 m_read_user_files (m_app_context != nullptr),
32677 03dcf031fbf3 Deprecate '--verbose' option in favor of '--init-trace'. Rik <rik@octave.org> parents: 32632 diff changeset	459 m_init_trace (false),
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	460 m_traditional (false),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	461 m_inhibit_startup_message (false),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	462 m_load_path_initialized (false),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	463 m_history_initialized (false),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	464 m_interrupt_all_in_process_group (true),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	465 m_cancel_quit (false),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	466 m_executing_finish_script (false),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	467 m_executing_atexit (false),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	468 m_initialized (false)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	469 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	470 // FIXME: When thread_local storage is used by default, this message
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	471 // should change to say something like
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	472 //
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	473 // only one Octave interpreter may be active in any given thread
24538 2b273df71aa0 allow experimenting with thread_local storage John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	474
31845 2da025d5e98d maint: Use 's_' prefix for static private class variables. Rik <rik@octave.org> parents: 31837 diff changeset	475 if (s_instance)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	476 throw std::runtime_error
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	477 ("only one Octave interpreter may be active");
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22186 diff changeset	478
31845 2da025d5e98d maint: Use 's_' prefix for static private class variables. Rik <rik@octave.org> parents: 31837 diff changeset	479 s_instance = this;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	480
30309 bf619727bf6c interpreter: Use UTF-8 locale on Windows if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 30156 diff changeset	481 #if defined (OCTAVE_HAVE_WINDOWS_UTF8_LOCALE)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	482 // Force a UTF-8 locale on Windows if possible
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	483 std::setlocale (LC_ALL, ".UTF8");
30309 bf619727bf6c interpreter: Use UTF-8 locale on Windows if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 30156 diff changeset	484 #else
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	485 std::setlocale (LC_ALL, "");
30309 bf619727bf6c interpreter: Use UTF-8 locale on Windows if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 30156 diff changeset	486 #endif
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	487 // Matlab uses "C" locale for LC_NUMERIC class regardless of local setting
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	488 std::setlocale (LC_NUMERIC, "C");
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	489 std::setlocale (LC_TIME, "C");
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	490 sys::env::putenv ("LC_NUMERIC", "C");
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	491 sys::env::putenv ("LC_TIME", "C");
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	492
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	493 // Initialize the default floating point unit control state.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	494 octave_set_default_fpucw ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	495
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	496 thread::init ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	497
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	498 octave_ieee_init ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	499
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	500 initialize_xerbla_error_handler ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	501
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	502 initialize_error_handlers ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	503
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	504 if (m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	505 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	506 install_signal_handlers ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	507 octave_unblock_signal_by_name ("SIGTSTP");
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	508 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	509 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	510 quit_allowed = false;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	511
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	512 if (! m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	513 m_display_info.initialize ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	514
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	515 bool line_editing = false;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	516
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	517 if (m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	518 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	519 // Embedded interpreters don't execute command line options.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	520 const cmdline_options& options = m_app_context->options ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	521
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	522 // Make all command-line arguments available to startup files,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	523 // including PKG_ADD files.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	524
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	525 string_vector args = options.all_args ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	526
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	527 m_app_context->intern_argv (args);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	528 intern_nargin (args.numel () - 1);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	529
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	530 bool is_octave_program = m_app_context->is_octave_program ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	531
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	532 std::list<std::string> command_line_path = options.command_line_path ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	533
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	534 for (const auto& pth : command_line_path)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	535 m_load_path.set_command_line_path (pth);
27266 596312d4f25d don't use singleton pattern for display_info class John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	536
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	537 std::string exec_path = options.exec_path ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	538 if (! exec_path.empty ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	539 m_environment.exec_path (exec_path);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	540
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	541 std::string image_path = options.image_path ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	542 if (! image_path.empty ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	543 m_environment.image_path (image_path);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	544
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	545 if (! options.no_window_system ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	546 m_display_info.initialize ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	547
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	548 // Is input coming from a terminal? If so, we are probably
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	549 // interactive.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	550
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	551 // If stdin is not a tty, then we are reading commands from a
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	552 // pipe or a redirected file.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	553 bool stdin_is_tty = octave_isatty_wrapper (fileno (stdin));
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	554
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	555 m_interactive = (! is_octave_program && stdin_is_tty
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	556 && octave_isatty_wrapper (fileno (stdout)));
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	557
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	558 // Don't force interactive if we're already interactive (bug #60696).
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	559 bool forced_interactive = options.forced_interactive ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	560 if (m_interactive)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	561 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	562 m_app_context->forced_interactive (false);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	563 forced_interactive = false;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	564 }
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	565
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	566 // Check if the user forced an interactive session.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	567 if (forced_interactive)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	568 m_interactive = true;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	569
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	570 line_editing = options.line_editing ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	571 if ((! m_interactive \|\| forced_interactive)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	572 && ! options.forced_line_editing ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	573 line_editing = false;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	574
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	575 m_traditional = options.traditional ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	576
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	577 // FIXME: if possible, perform the following actions directly
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	578 // instead of using the interpreter-level functions.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	579
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	580 if (options.echo_commands ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	581 m_evaluator.echo
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	582 (tree_evaluator::ECHO_SCRIPTS \| tree_evaluator::ECHO_FUNCTIONS
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	583 \| tree_evaluator::ECHO_ALL);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	584
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	585 std::string docstrings_file = options.docstrings_file ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	586 if (! docstrings_file.empty ())
31813 73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	587 Fbuilt_in_docstrings_file (*this, ovl (docstrings_file));
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	588
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	589 std::string doc_cache_file = options.doc_cache_file ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	590 if (! doc_cache_file.empty ())
31813 73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	591 Fdoc_cache_file (*this, ovl (doc_cache_file));
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	592
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	593 std::string info_file = options.info_file ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	594 if (! info_file.empty ())
31813 73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	595 Finfo_file (*this, ovl (info_file));
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	596
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	597 std::string info_program = options.info_program ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	598 if (! info_program.empty ())
31813 73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	599 Finfo_program (*this, ovl (info_program));
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	600
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	601 std::string texi_macros_file = options.texi_macros_file ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	602 if (! texi_macros_file.empty ())
31813 73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	603 Ftexi_macros_file (*this, ovl (texi_macros_file));
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	604 }
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	605
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	606 // FIXME: we defer creation of the gh_manager object because it
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	607 // creates a root_figure object that requires the display_info
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	608 // object, but that is currently only accessible through the global
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	609 // interpreter object and that is not available until after the
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	610 // interpreter::instance pointer is set (above). It would be better
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	611 // if m_gh_manager could be an object value instead of a pointer and
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	612 // created as part of the interpreter initialization. To do that,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	613 // we should either make the display_info object independent of the
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	614 // interpreter object (does it really need to cache any
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	615 // information?) or defer creation of the root_figure object until
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	616 // it is actually needed.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	617 m_gh_manager = new gh_manager (*this);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	618
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	619 m_input_system.initialize (line_editing);
29912 da5cc930ff10 Change startup so that '--interactive' does not always force '--no-line-editing' (bug #60696). Rik <rik@octave.org> parents: 29848 diff changeset	620
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	621 // These can come after command line args since none of them set any
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	622 // defaults that might be changed by command line options.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	623
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	624 initialize_version_info ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	625
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	626 // This should be done before initializing the load path because
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	627 // some PKG_ADD files might need --traditional behavior.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	628
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	629 if (m_traditional)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	630 maximum_braindamage ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	631
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	632 octave_interpreter_ready = true;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	633 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	634
31845 2da025d5e98d maint: Use 's_' prefix for static private class variables. Rik <rik@octave.org> parents: 31837 diff changeset	635 OCTAVE_THREAD_LOCAL interpreter *interpreter::s_instance = nullptr;
23711 5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	636
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	637 interpreter::~interpreter ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	638 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	639 if (! m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	640 shutdown ();
23711 5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	641
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	642 delete m_gh_manager;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	643 }
23711 5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	644
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	645 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	646 interpreter::intern_nargin (octave_idx_type nargs)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	647 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	648 m_evaluator.set_auto_fcn_var (stack_frame::NARGIN, nargs);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	649 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	650
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	651 // Read the history file unless a command-line option inhibits that.
23711 5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	652
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	653 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	654 interpreter::initialize_history (bool read_history_file)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	655 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	656 if (! m_history_initialized)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	657 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	658 // Allow command-line option to override.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	659
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	660 if (m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	661 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	662 const cmdline_options& options = m_app_context->options ();
23711 5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	663
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	664 read_history_file = options.read_history_file ();
23711 5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	665
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	666 if (! read_history_file)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	667 command_history::ignore_entries ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	668 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	669
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	670 m_history_system.initialize (read_history_file);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	671
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	672 if (! m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	673 command_history::ignore_entries ();
23711 5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	674
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	675 m_history_initialized = true;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	676 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	677 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	678
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	679 // Set the initial path to the system default unless command-line
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	680 // option says to leave it empty.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	681
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	682 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	683 interpreter::initialize_load_path (bool set_initial_path)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	684 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	685 if (! m_load_path_initialized)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	686 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	687 // Allow command-line option to override.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	688
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	689 if (m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	690 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	691 const cmdline_options& options = m_app_context->options ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	692
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	693 set_initial_path = options.set_initial_path ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	694 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	695
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	696 // Temporarily set the execute_pkg_add function to one that
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	697 // catches exceptions. This is better than wrapping
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	698 // load_path::initialize in a try-catch block because it will
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	699 // not stop executing PKG_ADD files at the first exception.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	700 // It's also better than changing the default execute_pkg_add
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	701 // function to use safe_source file because that will normally
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	702 // be evaluated from the normal interpreter loop where exceptions
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	703 // are already handled.
27322 cb92168e48f6 defer gh_manager creation until after display_info initialization John W. Eaton <jwe@octave.org> parents: 27321 diff changeset	704
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	705 unwind_action restore_add_hook (&load_path::set_add_hook, &m_load_path,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	706 m_load_path.get_add_hook ());
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	707
33034 49128bdb9eb2 use explicit lambda-expression captures (bug #65318) John W. Eaton <jwe@octave.org> parents: 33033 diff changeset	708 m_load_path.set_add_hook ([this] (const std::string& dir) { this->execute_pkg_add (dir); });
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	709
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	710 m_load_path.initialize (set_initial_path);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	711
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	712 m_load_path_initialized = true;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	713 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	714 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	715
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	716 // This may be called separately from execute
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	717
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	718 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	719 interpreter::initialize ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	720 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	721 if (m_initialized)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	722 return;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	723
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	724 if (m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	725 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	726 const cmdline_options& options = m_app_context->options ();
23511 232c8d69d934 manage interpreter instance in interpreter object John W. Eaton <jwe@octave.org> parents: 23466 diff changeset	727
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	728 if (options.experimental_terminal_widget ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	729 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	730 if (! options.gui ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	731 display_startup_message ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	732 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	733 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	734 display_startup_message ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	735 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	736 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	737 display_startup_message ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	738
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	739 // Wait to read the history file until the interpreter reads input
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	740 // files and begins evaluating commands.
31039 ecb867dfc8eb Don't shut down interpreter immediately on "execute" (bug #62308). Markus Mützel <markus.muetzel@gmx.de> parents: 30749 diff changeset	741
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	742 initialize_history ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	743
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	744 // Initializing the load path may execute PKG_ADD files, so can't be
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	745 // done until the interpreter is ready to execute commands.
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22186 diff changeset	746
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	747 // Deferring it to the execute step also allows the path to be
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	748 // initialized between creating and execute the interpreter, for
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	749 // example, to set a custom path for an embedded interpreter.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	750
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	751 initialize_load_path ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	752
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	753 octave_save_signal_mask ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	754
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	755 can_interrupt = true;
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22186 diff changeset	756
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	757 octave_signal_hook = respond_to_pending_signals;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	758 octave_interrupt_hook = nullptr;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	759
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	760 catch_interrupts ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	761
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	762 // FIXME: could we eliminate this variable or make it not be global?
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	763 // Global used to communicate with signal handler.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	764 octave_initialized = true;
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	765
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	766 m_initialized = true;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	767 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	768
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	769 // Note: this function is currently only used with the new
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	770 // experimental terminal widget.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	771
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	772 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	773 interpreter::get_line_and_eval ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	774 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	775 m_evaluator.get_line_and_eval ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	776 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	777
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	778 // Note: the following class is currently only used with the new
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	779 // experimental terminal widget.
23711 5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	780
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	781 class cli_input_reader
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	782 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	783 public:
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	784
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	785 cli_input_reader (interpreter& interp)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	786 : m_interpreter (interp), m_thread () { }
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	787
31855 1daf8bfceac3 default or disable more ctors, dtors, and assignment ops John W. Eaton <jwe@octave.org> parents: 31846 diff changeset	788 OCTAVE_DISABLE_CONSTRUCT_COPY_MOVE (cli_input_reader)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	789
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	790 ~cli_input_reader ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	791 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	792 // FIXME: Would it be better to ensure that
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	793 // interpreter::get_line_and_eval exits and then call
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	794 // m_thread.join () here?
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	795
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	796 m_thread.detach ();
23092 0fed4c678795 additional restructuring of startup and shutdown John W. Eaton <jwe@octave.org> parents: 23087 diff changeset	797 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	798
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	799 void start ()
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	800 {
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	801 m_thread = std::thread (&interpreter::get_line_and_eval, &m_interpreter);
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	802 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	803
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	804 private:
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	805
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	806 interpreter& m_interpreter;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	807
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	808 std::thread m_thread;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	809 };
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	810
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	811 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	812 interpreter::parse_and_execute (const std::string& input,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	813 bool& incomplete_parse)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	814 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	815 m_evaluator.parse_and_execute (input, incomplete_parse);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	816 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	817
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	818 // FIXME: this function is intended to be executed only once. Should
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	819 // we enforce that restriction?
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	820
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	821 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	822 interpreter::execute ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	823 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	824 int exit_status = 0;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	825
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	826 try
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	827 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	828 initialize ();
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	829
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	830 execute_startup_files ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	831
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	832 if (m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	833 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	834 const cmdline_options& options = m_app_context->options ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	835
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	836 if (m_app_context->have_eval_option_code ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	837 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	838 int status = execute_eval_option_code ();
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	839
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	840 if (status )
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	841 exit_status = status;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	842
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	843 if (! options.persist ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	844 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	845 shutdown ();
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	846
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	847 return exit_status;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	848 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	849 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	850
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	851 // If there is an extra argument, see if it names a file to
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	852 // read. Additional arguments are taken as command line options
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	853 // for the script.
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	854
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	855 if (m_app_context->have_script_file ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	856 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	857 int status = execute_command_line_file ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	858
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	859 if (status)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	860 exit_status = status;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	861
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	862 if (! options.persist ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	863 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	864 shutdown ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	865
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	866 return exit_status;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	867 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	868 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	869
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	870 if (options.forced_interactive ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	871 command_editor::blink_matching_paren (false);
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	872
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	873 if (options.server ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	874 exit_status = server_loop ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	875 else if (options.experimental_terminal_widget ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	876 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	877 if (options.gui ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	878 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	879 m_event_manager.start_gui (true);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	880
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	881 exit_status = server_loop ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	882 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	883 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	884 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	885 // Use an object so that the thread started for the
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	886 // reader will be cleaned up no matter how we exit
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	887 // this function.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	888
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	889 cli_input_reader reader (*this);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	890
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	891 reader.start ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	892
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	893 exit_status = server_loop ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	894 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	895 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	896 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	897 exit_status = main_loop ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	898
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	899 shutdown ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	900 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	901 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	902 catch (const exit_exception& xe)
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	903 {
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	904 exit_status = xe.exit_status ();
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	905
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	906 shutdown ();
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	907 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	908
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	909 return exit_status;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	910 }
23819 5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	911
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	912 // Call a function with exceptions handled to avoid problems with
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	913 // errors while shutting down.
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	914
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	915 #define OCTAVE_IGNORE_EXCEPTION(E) \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	916 catch (E) \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	917 { \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	918 recover_from_exception (); \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	919 \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	920 std::cerr << "error: ignoring " #E " while preparing to exit" \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	921 << std::endl; \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	922 }
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	923
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	924 #define OCTAVE_SAFE_CALL(F, ARGS) \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	925 do \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	926 { \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	927 try \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	928 { \
29253 28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29171 diff changeset	929 unwind_action restore_debug_on_error \
28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29171 diff changeset	930 (&error_system::set_debug_on_error, &m_error_system, \
28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29171 diff changeset	931 m_error_system.debug_on_error ()); \
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	932 \
29253 28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29171 diff changeset	933 unwind_action restore_debug_on_warning \
28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29171 diff changeset	934 (&error_system::set_debug_on_warning, &m_error_system, \
28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29171 diff changeset	935 m_error_system.debug_on_warning ()); \
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	936 \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	937 m_error_system.debug_on_error (false); \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	938 m_error_system.debug_on_warning (false); \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	939 \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	940 F ARGS; \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	941 } \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	942 OCTAVE_IGNORE_EXCEPTION (const exit_exception&) \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	943 OCTAVE_IGNORE_EXCEPTION (const interrupt_exception&) \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	944 OCTAVE_IGNORE_EXCEPTION (const execution_exception&) \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	945 OCTAVE_IGNORE_EXCEPTION (const std::bad_alloc&) \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	946 } \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	947 while (0)
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	948
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	949 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	950 interpreter::shutdown ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	951 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	952 // Attempt to prevent more than one call to shutdown.
29545 841ca9987302 perform shutdown actions in interpreter destructor (bug #60334) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	953
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	954 if (! m_initialized)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	955 return;
29545 841ca9987302 perform shutdown actions in interpreter destructor (bug #60334) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	956
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	957 m_initialized = false;
29545 841ca9987302 perform shutdown actions in interpreter destructor (bug #60334) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	958
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	959 OCTAVE_SAFE_CALL (feval, ("close", ovl ("all"), 0));
28616 c315a866dbe9 attempt to avoid apparent graphics-related crash at shutdown (bug #58814) John W. Eaton <jwe@octave.org> parents: 28433 diff changeset	960
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	961 // Any atexit functions added after this function call won't be
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	962 // executed. Each atexit function is executed with
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	963 // OCTAVE_SAFE_CALL, so we don't need that here.
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	964
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	965 execute_atexit_fcns ();
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	966
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	967 // Clear all functions and variables while the event manager is
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	968 // still processing events and notify the event manager. This way,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	969 // the workspace model will be cleared before the GUI exits.
30738 3c4368f0a4ab clear workspace model before exit (bug #61994) John W. Eaton <jwe@octave.org> parents: 30736 diff changeset	970
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	971 // FIXME: This approach seems a bit fragile since there could be
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	972 // other places in the GUI that have references to interpreter
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	973 // objects. How can we reliably ensure that they are all removed
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	974 // before the interpreter exits? Maybe the best solution is to
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	975 // always start the GUI from the interpreter and close it when the
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	976 // interpreter exits? However, the workspace model is owned by the
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	977 // base_qobject object not the workspace viewer or the main window,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	978 // so simply closing the GUI window(s) is not sufficient. See also
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	979 // bug #61994.
28616 c315a866dbe9 attempt to avoid apparent graphics-related crash at shutdown (bug #58814) John W. Eaton <jwe@octave.org> parents: 28433 diff changeset	980
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	981 // Note that we don't force symbols to be cleared, so we will
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	982 // respect mlock at this point. Later, we'll force all variables
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	983 // and functions to be cleared.
28622 d075c2f26d1d reorder shutdown steps (bug #57591) John W. Eaton <jwe@octave.org> parents: 28616 diff changeset	984
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	985 OCTAVE_SAFE_CALL (clear_all, ());
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	986 OCTAVE_SAFE_CALL (m_event_manager.clear_workspace, ());
30738 3c4368f0a4ab clear workspace model before exit (bug #61994) John W. Eaton <jwe@octave.org> parents: 30736 diff changeset	987
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	988 // If we are attached to a GUI, queue and event to close it (only
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	989 // works with the new terminal widget), process pending events and
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	990 // disable the link.
30738 3c4368f0a4ab clear workspace model before exit (bug #61994) John W. Eaton <jwe@octave.org> parents: 30736 diff changeset	991
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	992 OCTAVE_SAFE_CALL (m_event_manager.close_gui, ());
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	993 OCTAVE_SAFE_CALL (m_event_manager.process_events, (true));
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	994 OCTAVE_SAFE_CALL (m_event_manager.disable, ());
30738 3c4368f0a4ab clear workspace model before exit (bug #61994) John W. Eaton <jwe@octave.org> parents: 30736 diff changeset	995
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	996 OCTAVE_SAFE_CALL (m_input_system.clear_input_event_hooks, ());
28616 c315a866dbe9 attempt to avoid apparent graphics-related crash at shutdown (bug #58814) John W. Eaton <jwe@octave.org> parents: 28433 diff changeset	997
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	998 // We may still have some figures. Close them.
28616 c315a866dbe9 attempt to avoid apparent graphics-related crash at shutdown (bug #58814) John W. Eaton <jwe@octave.org> parents: 28433 diff changeset	999
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1000 OCTAVE_SAFE_CALL (feval, ("close", ovl ("all"), 0));
28616 c315a866dbe9 attempt to avoid apparent graphics-related crash at shutdown (bug #58814) John W. Eaton <jwe@octave.org> parents: 28433 diff changeset	1001
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1002 // What is supposed to happen if a figure has a closerequestfcn or
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1003 // deletefcn callback registered that creates other figures or
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1004 // variables? What if those variables are classdef objects with
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1005 // destructors that can create figures? The possibilities are
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1006 // endless. At some point, we have to give up and force execution
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1007 // to end.
28622 d075c2f26d1d reorder shutdown steps (bug #57591) John W. Eaton <jwe@octave.org> parents: 28616 diff changeset	1008
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1009 // Note that we again don't force symbols to be cleared, so we
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1010 // continue to respect mlock here. Later, we'll force all variables
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1011 // and functions to be cleared.
28616 c315a866dbe9 attempt to avoid apparent graphics-related crash at shutdown (bug #58814) John W. Eaton <jwe@octave.org> parents: 28433 diff changeset	1012
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1013 OCTAVE_SAFE_CALL (clear_all, ());
28616 c315a866dbe9 attempt to avoid apparent graphics-related crash at shutdown (bug #58814) John W. Eaton <jwe@octave.org> parents: 28433 diff changeset	1014
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1015 // Do this explicitly so that destructors for mex file objects
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1016 // are called, so that functions registered with mexAtExit are
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1017 // called.
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	1018
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1019 OCTAVE_SAFE_CALL (m_symbol_table.clear_mex_functions, ());
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	1020
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1021 OCTAVE_SAFE_CALL (command_editor::restore_terminal_state, ());
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1022
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1023 OCTAVE_SAFE_CALL (m_history_system.write_timestamp, ());
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	1024
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1025 if (! command_history::ignoring_entries ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1026 OCTAVE_SAFE_CALL (command_history::clean_up_and_save, ());
28622 d075c2f26d1d reorder shutdown steps (bug #57591) John W. Eaton <jwe@octave.org> parents: 28616 diff changeset	1027
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1028 OCTAVE_SAFE_CALL (m_gtk_manager.unload_all_toolkits, ());
28622 d075c2f26d1d reorder shutdown steps (bug #57591) John W. Eaton <jwe@octave.org> parents: 28616 diff changeset	1029
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1030 // Now that the graphics toolkits have been unloaded, force all
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1031 // symbols to be cleared.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1032
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1033 OCTAVE_SAFE_CALL (clear_all, (true));
28622 d075c2f26d1d reorder shutdown steps (bug #57591) John W. Eaton <jwe@octave.org> parents: 28616 diff changeset	1034
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1035 // FIXME: May still need something like this to ensure that
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1036 // destructors for class objects will run properly. Should that be
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1037 // done earlier? Before or after atexit functions are executed?
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1038 // What will happen if the destructor for an obect attempts to
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1039 // display a figure?
28616 c315a866dbe9 attempt to avoid apparent graphics-related crash at shutdown (bug #58814) John W. Eaton <jwe@octave.org> parents: 28433 diff changeset	1040
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1041 OCTAVE_SAFE_CALL (m_symbol_table.cleanup, ());
28616 c315a866dbe9 attempt to avoid apparent graphics-related crash at shutdown (bug #58814) John W. Eaton <jwe@octave.org> parents: 28433 diff changeset	1042
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1043 OCTAVE_SAFE_CALL (sysdep_cleanup, ());
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	1044
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1045 OCTAVE_SAFE_CALL (flush_stdout, ());
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	1046
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1047 // Don't call singleton_cleanup_list::cleanup until we have the
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1048 // problems with registering/unregistering types worked out. For
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1049 // example, uncomment the following line, then use the make_int
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1050 // function from the examples directory to create an integer
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1051 // object and then exit Octave. Octave should crash with a
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1052 // segfault when cleaning up the typinfo singleton. We need some
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1053 // way to force new octave_value_X types that are created in
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1054 // .oct files to be unregistered when the .oct file shared library
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1055 // is unloaded.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1056 //
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1057 // OCTAVE_SAFE_CALL (singleton_cleanup_list::cleanup, ());
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1058 }
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	1059
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1060 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1061 interpreter::execute_atexit_fcns ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1062 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1063 // Prevent atexit functions from adding new functions to the list.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1064 m_executing_atexit = true;
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	1065
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1066 while (! m_atexit_fcns.empty ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1067 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1068 std::string fcn = m_atexit_fcns.front ();
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	1069
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1070 m_atexit_fcns.pop_front ();
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	1071
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1072 OCTAVE_SAFE_CALL (feval, (fcn, octave_value_list (), 0));
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	1073
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1074 OCTAVE_SAFE_CALL (flush_stdout, ());
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1075 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1076 }
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	1077
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1078 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1079 interpreter::display_startup_message () const
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1080 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1081 bool inhibit_startup_message = false;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1082
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1083 if (m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1084 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1085 const cmdline_options& options = m_app_context->options ();
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	1086
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1087 inhibit_startup_message = options.inhibit_startup_message ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1088 }
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1089
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1090 if (m_interactive && ! inhibit_startup_message)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1091 std::cout << octave_startup_message () << "\n" << std::endl;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1092 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1093
31898 0db880f38b1f maint: Use "nonzero" rather than "non-zero" in code base. Rik <rik@octave.org> parents: 31855 diff changeset	1094 // Initialize by reading startup files. Return nonzero if an exception
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1095 // occurs when reading any of them, but don't exit early because of an
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1096 // exception.
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1097
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1098 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1099 interpreter::execute_startup_files ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1100 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1101 bool read_site_files = m_read_site_files;
32678 49d6ecd07a76 Rename command-line options for handling configuration files. Rik <rik@octave.org> parents: 32677 diff changeset	1102 bool read_user_files = m_read_user_files;
32677 03dcf031fbf3 Deprecate '--verbose' option in favor of '--init-trace'. Rik <rik@octave.org> parents: 32632 diff changeset	1103 bool trace = m_init_trace;
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1104 bool inhibit_startup_message = m_inhibit_startup_message;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1105
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1106 if (m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1107 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1108 const cmdline_options& options = m_app_context->options ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1109
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1110 read_site_files = options.read_site_files ();
32678 49d6ecd07a76 Rename command-line options for handling configuration files. Rik <rik@octave.org> parents: 32677 diff changeset	1111 read_user_files = options.read_user_files ();
32677 03dcf031fbf3 Deprecate '--verbose' option in favor of '--init-trace'. Rik <rik@octave.org> parents: 32632 diff changeset	1112 trace = options.init_trace ();
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1113 inhibit_startup_message = options.inhibit_startup_message ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1114 }
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1115
32677 03dcf031fbf3 Deprecate '--verbose' option in favor of '--init-trace'. Rik <rik@octave.org> parents: 32632 diff changeset	1116 trace = (trace && ! inhibit_startup_message);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1117
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1118 bool require_file = false;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1119
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1120 std::string context;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1121
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1122 int exit_status = 0;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1123
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1124 if (read_site_files)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1125 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1126 // Execute commands from the site-wide configuration file.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1127 // First from the file $(prefix)/lib/octave/site/m/octaverc
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1128 // (if it exists), then from the file
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1129 // $(prefix)/share/octave/$(version)/m/octaverc (if it exists).
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1130
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1131 int status = safe_source_file (config::local_site_defaults_file (),
32677 03dcf031fbf3 Deprecate '--verbose' option in favor of '--init-trace'. Rik <rik@octave.org> parents: 32632 diff changeset	1132 context, trace, require_file);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1133
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1134 if (status)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1135 exit_status = status;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1136
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1137 status = safe_source_file (config::site_defaults_file (),
32677 03dcf031fbf3 Deprecate '--verbose' option in favor of '--init-trace'. Rik <rik@octave.org> parents: 32632 diff changeset	1138 context, trace, require_file);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1139
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1140 if (status)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1141 exit_status = status;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1142 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1143
32678 49d6ecd07a76 Rename command-line options for handling configuration files. Rik <rik@octave.org> parents: 32677 diff changeset	1144 if (read_user_files)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1145 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1146 // Try to execute commands from the Matlab compatible startup.m file
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1147 // if it exists anywhere in the load path when starting Octave.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1148 std::string ff_startup_m = file_in_path ("startup.m", "");
26722 f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	1149
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1150 if (! ff_startup_m.empty ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1151 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1152 int parse_status = 0;
26722 f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	1153
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1154 try
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1155 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1156 eval_string (std::string ("startup"), false, parse_status, 0);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1157 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1158 catch (const interrupt_exception&)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1159 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1160 recover_from_exception ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1161 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1162 catch (const execution_exception& ee)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1163 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1164 handle_exception (ee);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1165 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1166 }
27832 8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27693 diff changeset	1167
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1168 // Try to execute commands from $CONFIG/octave/octaverc, where
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1169 // $CONFIG is the platform-dependent location for user local
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1170 // configuration files.
27832 8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27693 diff changeset	1171
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1172 std::string user_config_dir = sys::env::get_user_config_directory ();
27832 8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27693 diff changeset	1173
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1174 std::string cfg_dir = user_config_dir + sys::file_ops::dir_sep_str ()
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1175 + "octave";
27832 8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27693 diff changeset	1176
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1177 std::string cfg_rc = sys::env::make_absolute ("octaverc", cfg_dir);
27832 8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27693 diff changeset	1178
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1179 if (! cfg_rc.empty ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1180 {
32677 03dcf031fbf3 Deprecate '--verbose' option in favor of '--init-trace'. Rik <rik@octave.org> parents: 32632 diff changeset	1181 int status = safe_source_file (cfg_rc, context, trace,
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1182 require_file);
27832 8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27693 diff changeset	1183
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1184 if (status)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1185 exit_status = status;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1186 }
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1187
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1188 // Try to execute commands from $HOME/$OCTAVE_INITFILE and
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1189 // $OCTAVE_INITFILE. If $OCTAVE_INITFILE is not set,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1190 // .octaverc is assumed.
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1191
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1192 bool home_rc_already_executed = false;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1193
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1194 std::string initfile = sys::env::getenv ("OCTAVE_INITFILE");
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1195
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1196 if (initfile.empty ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1197 initfile = ".octaverc";
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1198
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1199 std::string home_dir = sys::env::get_home_directory ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1200
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1201 std::string home_rc = sys::env::make_absolute (initfile, home_dir);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1202
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1203 std::string local_rc;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1204
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1205 if (! home_rc.empty ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1206 {
32677 03dcf031fbf3 Deprecate '--verbose' option in favor of '--init-trace'. Rik <rik@octave.org> parents: 32632 diff changeset	1207 int status = safe_source_file (home_rc, context, trace,
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1208 require_file);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1209
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1210 if (status)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1211 exit_status = status;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1212
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1213 // Names alone are not enough.
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1214
32080 e9fdfebc6db0 Avoid using file_stat in libinterp/corefcn (bug #59711). Markus Mützel <markus.muetzel@gmx.de> parents: 31898 diff changeset	1215 if (sys::file_exists (home_rc))
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1216 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1217 // We want to check for curr_dir after executing home_rc
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1218 // because doing that may change the working directory.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1219
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1220 local_rc = sys::env::make_absolute (initfile);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1221
32086 3c608abd55f5 Move "same_file" from liboctinterp to liboctave (bug #63803). Markus Mützel <markus.muetzel@gmx.de> parents: 32080 diff changeset	1222 home_rc_already_executed = sys::same_file (home_rc, local_rc);
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1223 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1224 }
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1225
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1226 if (! home_rc_already_executed)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1227 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1228 if (local_rc.empty ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1229 local_rc = sys::env::make_absolute (initfile);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1230
32677 03dcf031fbf3 Deprecate '--verbose' option in favor of '--init-trace'. Rik <rik@octave.org> parents: 32632 diff changeset	1231 int status = safe_source_file (local_rc, context, trace,
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1232 require_file);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1233
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1234 if (status)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1235 exit_status = status;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1236 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1237 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1238
32677 03dcf031fbf3 Deprecate '--verbose' option in favor of '--init-trace'. Rik <rik@octave.org> parents: 32632 diff changeset	1239 if (m_interactive && trace)
32687 c34d571b5855 Fix extra newline displayed with --init-trace startup option (bug #65107) Rik <rik@octave.org> parents: 32678 diff changeset	1240 octave_stdout << std::endl;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1241
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1242 return exit_status;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1243 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1244
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1245 // Execute any code specified with --eval 'CODE'
27530 7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	1246
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1247 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1248 interpreter::execute_eval_option_code ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1249 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1250 if (! m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1251 return 0;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1252
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1253 const cmdline_options& options = m_app_context->options ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1254
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1255 std::string code_to_eval = options.code_to_eval ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1256
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1257 unwind_protect_var<bool> upv (m_interactive, false);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1258
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1259 int parse_status = 0;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1260
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1261 try
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1262 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1263 eval_string (code_to_eval, false, parse_status, 0);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1264 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1265 catch (const interrupt_exception&)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1266 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1267 recover_from_exception ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1268
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1269 return 1;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1270 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1271 catch (const execution_exception& ee)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1272 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1273 handle_exception (ee);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1274
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1275 return 1;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1276 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1277
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1278 return parse_status;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1279 }
27530 7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	1280
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1281 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1282 interpreter::execute_command_line_file ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1283 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1284 if (! m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1285 return 0;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1286
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1287 const cmdline_options& options = m_app_context->options ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	1288
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1289 string_vector args = options.all_args ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	1290
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1291 void (interpreter::*interactive_fptr) (bool) = &interpreter::interactive;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1292 unwind_action restore_interactive (interactive_fptr, this, m_interactive);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1293
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1294 unwind_action restore_argv (&application::intern_argv, m_app_context, args);
29253 28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29171 diff changeset	1295
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1296 unwind_action restore_nargin (&interpreter::intern_nargin, this,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1297 args.numel () - 1);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1298
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1299 void (application::*program_invocation_name_fptr) (const std::string&)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1300 = &application::program_invocation_name;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1301 unwind_action restore_program_invocation_name
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1302 (program_invocation_name_fptr, m_app_context,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1303 application::program_invocation_name ());
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1304
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1305 void (application::*program_name_fptr) (const std::string&)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1306 = &application::program_name;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1307 unwind_action restore_program_name
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1308 (program_name_fptr, m_app_context, application::program_name ());
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1309
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1310 m_interactive = false;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1311
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1312 // If we are running an executable script (#! /bin/octave) then
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1313 // we should only see the args passed to the script.
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1314
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1315 string_vector script_args = options.remaining_args ();
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1316
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1317 m_app_context->intern_argv (script_args);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1318 intern_nargin (script_args.numel () - 1);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1319
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1320 std::string fname = script_args[0];
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1321
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1322 m_app_context->set_program_names (fname);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1323
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1324 std::string context;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1325 bool verbose = false;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1326 bool require_file = true;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1327
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1328 return safe_source_file (fname, context, verbose, require_file);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1329 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1330
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1331 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1332 interpreter::main_loop ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1333 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1334 command_editor::add_event_hook (release_unreferenced_dynamic_libraries);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1335
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1336 return m_evaluator.repl ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1337 }
30749 076e19eac74a allow deletion of dynamic_library objects to be delayed John W. Eaton <jwe@octave.org> parents: 30747 diff changeset	1338
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1339 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1340 interpreter::server_loop ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1341 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1342 return m_evaluator.server_loop ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1343 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1344
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1345 tree_evaluator&
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1346 interpreter::get_evaluator ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1347 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1348 return m_evaluator;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1349 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1350
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1351 stream_list&
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1352 interpreter::get_stream_list ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1353 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1354 return m_stream_list;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1355 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1356
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1357 url_handle_manager&
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1358 interpreter::get_url_handle_manager ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1359 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1360 return m_url_handle_manager;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1361 }
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	1362
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1363 symbol_scope
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1364 interpreter::get_top_scope () const
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1365 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1366 return m_evaluator.get_top_scope ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1367 }
23742 1f0daaf81955 don't use singleton for ch_manager, rename to url_handle_manager John W. Eaton <jwe@octave.org> parents: 23738 diff changeset	1368
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1369 symbol_scope
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1370 interpreter::get_current_scope () const
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1371 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1372 return m_evaluator.get_current_scope ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1373 }
23609 99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1374
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1375 symbol_scope
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1376 interpreter::require_current_scope (const std::string& who) const
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1377 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1378 symbol_scope scope = get_current_scope ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1379
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1380 if (! scope)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1381 error ("%s: symbol table scope missing", who.c_str ());
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1382
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1383 return scope;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1384 }
23609 99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1385
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1386 profiler&
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1387 interpreter::get_profiler ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1388 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1389 return m_evaluator.get_profiler ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1390 }
23609 99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1391
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1392 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1393 interpreter::chdir (const std::string& dir)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1394 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1395 std::string xdir = sys::file_ops::tilde_expand (dir);
23609 99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1396
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1397 int cd_ok = sys::env::chdir (xdir);
23753 c3828bd031cd move profiler inside evaluator and inside octave namespace John W. Eaton <jwe@octave.org> parents: 23742 diff changeset	1398
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1399 if (! cd_ok)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1400 error ("%s: %s", dir.c_str (), std::strerror (errno));
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1401
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1402 Vlast_chdir_time.stamp ();
27408 9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1403
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1404 // FIXME: should these actions be handled as a list of functions
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1405 // to call so users can add their own chdir handlers?
27408 9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1406
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1407 m_load_path.read_dir_config (".");
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1408 m_load_path.update ();
33164 b4f8f14dc1fb Refresh fcn-info on current directory change (bug #65406). Markus Mützel <markus.muetzel@gmx.de> parents: 33054 diff changeset	1409 // Updating the last prompt time stamp avoids skipping a fcn-info refresh
b4f8f14dc1fb Refresh fcn-info on current directory change (bug #65406). Markus Mützel <markus.muetzel@gmx.de> parents: 33054 diff changeset	1410 // so that functions in the new current directory can shadow functions
b4f8f14dc1fb Refresh fcn-info on current directory change (bug #65406). Markus Mützel <markus.muetzel@gmx.de> parents: 33054 diff changeset	1411 // further back in the load path order.
b4f8f14dc1fb Refresh fcn-info on current directory change (bug #65406). Markus Mützel <markus.muetzel@gmx.de> parents: 33054 diff changeset	1412 Vlast_prompt_time.stamp ();
27408 9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1413
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1414 m_event_manager.directory_changed (sys::env::get_current_directory ());
27408 9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1415
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1416 return cd_ok;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1417 }
27408 9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1418
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1419 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1420 interpreter::mlock (bool skip_first) const
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1421 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1422 m_evaluator.mlock (skip_first);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1423 }
23703 6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1424
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1425 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1426 interpreter::munlock (bool skip_first) const
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1427 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1428 m_evaluator.munlock (skip_first);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1429 }
27873 020d0e8f7ac6 reafactor mlock, munlock, and mislocked functions John W. Eaton <jwe@octave.org> parents: 27832 diff changeset	1430
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1431 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1432 interpreter::mislocked (bool skip_first) const
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1433 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1434 return m_evaluator.mislocked (skip_first);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1435 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1436
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1437 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1438 interpreter::munlock (const char *nm)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1439 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1440 if (! nm)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1441 error ("munlock: invalid value for NAME");
23703 6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1442
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1443 munlock (std::string (nm));
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1444 }
23703 6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1445
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1446 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1447 interpreter::munlock (const std::string& nm)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1448 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1449 octave_value val = m_symbol_table.find_function (nm);
27873 020d0e8f7ac6 reafactor mlock, munlock, and mislocked functions John W. Eaton <jwe@octave.org> parents: 27832 diff changeset	1450
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1451 if (val.is_defined ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1452 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1453 octave_function *fcn = val.function_value ();
23703 6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1454
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1455 if (fcn)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1456 fcn->unlock ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1457 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1458 }
23703 6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1459
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1460 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1461 interpreter::mislocked (const char *nm)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1462 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1463 if (! nm)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1464 error ("mislocked: invalid value for NAME");
23703 6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1465
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1466 return mislocked (std::string (nm));
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1467 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1468
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1469 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1470 interpreter::mislocked (const std::string& nm)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1471 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1472 bool retval = false;
23703 6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1473
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1474 octave_value val = m_symbol_table.find_function (nm);
27873 020d0e8f7ac6 reafactor mlock, munlock, and mislocked functions John W. Eaton <jwe@octave.org> parents: 27832 diff changeset	1475
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1476 if (val.is_defined ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1477 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1478 octave_function *fcn = val.function_value ();
27873 020d0e8f7ac6 reafactor mlock, munlock, and mislocked functions John W. Eaton <jwe@octave.org> parents: 27832 diff changeset	1479
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1480 if (fcn)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1481 retval = fcn->islocked ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1482 }
23703 6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1483
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1484 return retval;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1485 }
23703 6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1486
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1487 std::string
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1488 interpreter::mfilename (const std::string& opt) const
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1489 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1490 return m_evaluator.mfilename (opt);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1491 }
23703 6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1492
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1493 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1494 interpreter::eval_string (const std::string& eval_str,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1495 bool silent, int& parse_status,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1496 int nargout)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1497 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1498 return m_evaluator.eval_string (eval_str, silent, parse_status, nargout);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1499 }
23703 6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1500
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1501 octave_value
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1502 interpreter::eval_string (const std::string& eval_str,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1503 bool silent, int& parse_status)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1504 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1505 return m_evaluator.eval_string (eval_str, silent, parse_status);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1506 }
27015 4d9e1a832a55 move core of mfilename function to evaluator John W. Eaton <jwe@octave.org> parents: 27014 diff changeset	1507
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1508 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1509 interpreter::eval_string (const octave_value& arg,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1510 bool silent, int& parse_status,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1511 int nargout)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1512 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1513 return m_evaluator.eval_string (arg, silent, parse_status, nargout);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1514 }
26113 8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1515
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1516 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1517 interpreter::eval (const std::string& try_code,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1518 int nargout)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1519 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1520 return m_evaluator.eval (try_code, nargout);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1521 }
26113 8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1522
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1523 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1524 interpreter::eval (const std::string& try_code,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1525 const std::string& catch_code,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1526 int nargout)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1527 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1528 return m_evaluator.eval (try_code, catch_code, nargout);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1529 }
26113 8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1530
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1531 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1532 interpreter::evalin (const std::string& context,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1533 const std::string& try_code,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1534 int nargout)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1535 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1536 return m_evaluator.evalin (context, try_code, nargout);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1537 }
27019 6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	1538
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1539 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1540 interpreter::evalin (const std::string& context,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1541 const std::string& try_code,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1542 const std::string& catch_code,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1543 int nargout)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1544 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1545 return m_evaluator.evalin (context, try_code, catch_code, nargout);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1546 }
27019 6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	1547
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1548 //! Evaluate an Octave function (built-in or interpreted) and return
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1549 //! the list of result values.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1550 //!
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1551 //! @param name The name of the function to call.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1552 //! @param args The arguments to the function.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1553 //! @param nargout The number of output arguments expected.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1554 //! @return A list of output values. The length of the list is not
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1555 //! necessarily the same as @c nargout.
27018 a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	1556
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1557 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1558 interpreter::feval (const char *name,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1559 const octave_value_list& args,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1560 int nargout)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1561 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1562 return feval (std::string (name), args, nargout);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1563 }
27018 a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	1564
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1565 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1566 interpreter::feval (const std::string& name,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1567 const octave_value_list& args,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1568 int nargout)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1569 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1570 octave_value fcn = m_symbol_table.find_function (name, args);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1571
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1572 if (fcn.is_undefined ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1573 error ("feval: function '%s' not found", name.c_str ());
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1574
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1575 octave_function *of = fcn.function_value ();
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1576
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1577 return of->call (m_evaluator, nargout, args);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1578 }
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1579
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1580 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1581 interpreter::feval (octave_function *fcn,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1582 const octave_value_list& args,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1583 int nargout)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1584 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1585 if (fcn)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1586 return fcn->call (m_evaluator, nargout, args);
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1587
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1588 return octave_value_list ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1589 }
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1590
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1591 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1592 interpreter::feval (const octave_value& val,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1593 const octave_value_list& args,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1594 int nargout)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1595 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1596 // FIXME: do we really want to silently return an empty ovl if
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1597 // the function object is undefined? It's essentially what the
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1598 // version above that accepts a pointer to an octave_function
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1599 // object does and some code was apparently written to rely on it
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1600 // (for example, __ode15__).
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1601
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1602 if (val.is_undefined ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1603 return ovl ();
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1604
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1605 if (val.is_function ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1606 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1607 return feval (val.function_value (), args, nargout);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1608 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1609 else if (val.is_function_handle () \|\| val.is_inline_function ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1610 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1611 // This covers function handles, inline functions, and anonymous
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1612 // functions.
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1613
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1614 std::list<octave_value_list> arg_list;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1615 arg_list.push_back (args);
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1616
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1617 // FIXME: could we make octave_value::subsref a const method?
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1618 // It would be difficult because there are instances of
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1619 // incrementing the reference count inside subsref methods,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1620 // which means they can't be const with the current way of
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1621 // handling reference counting.
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1622
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1623 octave_value xval = val;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1624 return xval.subsref ("(", arg_list, nargout);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1625 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1626 else if (val.is_string ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1627 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1628 return feval (val.string_value (), args, nargout);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1629 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1630 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1631 error ("feval: first argument must be a string, inline function, or a function handle");
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1632
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1633 return ovl ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1634 }
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1635
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1636 //! Evaluate an Octave function (built-in or interpreted) and return
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1637 //! the list of result values.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1638 //!
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1639 //! @param args The first element of @c args is the function to call.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1640 //! It may be the name of the function as a string, a function
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1641 //! handle, or an inline function. The remaining arguments are
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1642 //! passed to the function.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1643 //! @param nargout The number of output arguments expected.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1644 //! @return A list of output values. The length of the list is not
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1645 //! necessarily the same as @c nargout.
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1646
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1647 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1648 interpreter::feval (const octave_value_list& args,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1649 int nargout)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1650 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1651 if (args.length () == 0)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1652 error ("feval: first argument must be a string, inline function, or a function handle");
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1653
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1654 octave_value f_arg = args(0);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1655
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1656 octave_value_list tmp_args = args.slice (1, args.length () - 1, true);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1657
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1658 return feval (f_arg, tmp_args, nargout);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1659 }
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1660
32690 a11d7442f9cd replace inputname.m with a built-in function (bug #65116) John W. Eaton <jwe@octave.org> parents: 32687 diff changeset	1661 std::string
a11d7442f9cd replace inputname.m with a built-in function (bug #65116) John W. Eaton <jwe@octave.org> parents: 32687 diff changeset	1662 interpreter::inputname (int n, bool ids_only) const
a11d7442f9cd replace inputname.m with a built-in function (bug #65116) John W. Eaton <jwe@octave.org> parents: 32687 diff changeset	1663 {
a11d7442f9cd replace inputname.m with a built-in function (bug #65116) John W. Eaton <jwe@octave.org> parents: 32687 diff changeset	1664 return m_evaluator.inputname (n, ids_only);
a11d7442f9cd replace inputname.m with a built-in function (bug #65116) John W. Eaton <jwe@octave.org> parents: 32687 diff changeset	1665 }
a11d7442f9cd replace inputname.m with a built-in function (bug #65116) John W. Eaton <jwe@octave.org> parents: 32687 diff changeset	1666
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1667 octave_value
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1668 interpreter::make_function_handle (const std::string& name)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1669 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1670 return m_evaluator.make_fcn_handle (name);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1671 }
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1672
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1673 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1674 interpreter::install_variable (const std::string& name,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1675 const octave_value& value, bool global)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1676 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1677 m_evaluator.install_variable (name, value, global);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1678 }
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1679
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1680 octave_value
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1681 interpreter::global_varval (const std::string& name) const
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1682 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1683 return m_evaluator.global_varval (name);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1684 }
28433 d05a4194f1ad move make_fcn_handle to tree_evaluator class John W. Eaton <jwe@octave.org> parents: 28427 diff changeset	1685
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1686 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1687 interpreter::global_assign (const std::string& name,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1688 const octave_value& val)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1689 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1690 m_evaluator.global_assign (name, val);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1691 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1692
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1693 octave_value
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1694 interpreter::top_level_varval (const std::string& name) const
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1695 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1696 return m_evaluator.top_level_varval (name);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1697 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1698
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1699 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1700 interpreter::top_level_assign (const std::string& name,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1701 const octave_value& val)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1702 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1703 m_evaluator.top_level_assign (name, val);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1704 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1705
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1706 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1707 interpreter::is_variable (const std::string& name) const
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1708 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1709 return m_evaluator.is_variable (name);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1710 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1711
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1712 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1713 interpreter::is_local_variable (const std::string& name) const
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1714 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1715 return m_evaluator.is_local_variable (name);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1716 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1717
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1718 octave_value
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1719 interpreter::varval (const std::string& name) const
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1720 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1721 return m_evaluator.varval (name);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1722 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1723
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1724 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1725 interpreter::assign (const std::string& name,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1726 const octave_value& val)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1727 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1728 m_evaluator.assign (name, val);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1729 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1730
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1731 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1732 interpreter::assignin (const std::string& context,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1733 const std::string& name,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1734 const octave_value& val)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1735 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1736 m_evaluator.assignin (context, name, val);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1737 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1738
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1739 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1740 interpreter::source_file (const std::string& file_name,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1741 const std::string& context, bool verbose,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1742 bool require_file)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1743 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1744 m_evaluator.source_file (file_name, context, verbose, require_file);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1745 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1746
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1747 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1748 interpreter::at_top_level () const
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1749 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1750 return m_evaluator.at_top_level ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1751 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1752
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1753 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1754 interpreter::isglobal (const std::string& name) const
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1755 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1756 return m_evaluator.is_global (name);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1757 }
27014 daab1b311a98 move core of assignin function to evaluator John W. Eaton <jwe@octave.org> parents: 26826 diff changeset	1758
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1759 octave_value
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1760 interpreter::find (const std::string& name)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1761 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1762 return m_evaluator.find (name);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1763 }
27017 24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	1764
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1765 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1766 interpreter::clear_all (bool force)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1767 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1768 m_evaluator.clear_all (force);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1769 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1770
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1771 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1772 interpreter::clear_objects ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1773 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1774 m_evaluator.clear_objects ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1775 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1776
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1777 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1778 interpreter::clear_variable (const std::string& name)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1779 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1780 m_evaluator.clear_variable (name);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1781 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1782
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1783 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1784 interpreter::clear_variable_pattern (const std::string& pattern)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1785 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1786 m_evaluator.clear_variable_pattern (pattern);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1787 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1788
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1789 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1790 interpreter::clear_variable_regexp (const std::string& pattern)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1791 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1792 m_evaluator.clear_variable_regexp (pattern);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1793 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1794
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1795 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1796 interpreter::clear_variables ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1797 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1798 m_evaluator.clear_variables ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1799 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1800
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1801 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1802 interpreter::clear_global_variable (const std::string& name)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1803 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1804 m_evaluator.clear_global_variable (name);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1805 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1806
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1807 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1808 interpreter::clear_global_variable_pattern (const std::string& pattern)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1809 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1810 m_evaluator.clear_global_variable_pattern (pattern);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1811 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1812
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1813 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1814 interpreter::clear_global_variable_regexp (const std::string& pattern)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1815 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1816 m_evaluator.clear_global_variable_regexp (pattern);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1817 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1818
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1819 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1820 interpreter::clear_global_variables ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1821 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1822 m_evaluator.clear_global_variables ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1823 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1824
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1825 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1826 interpreter::clear_functions (bool force)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1827 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1828 m_symbol_table.clear_functions (force);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1829 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1830
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1831 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1832 interpreter::clear_function (const std::string& name)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1833 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1834 m_symbol_table.clear_function (name);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1835 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1836
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1837 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1838 interpreter::clear_symbol (const std::string& name)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1839 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1840 m_evaluator.clear_symbol (name);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1841 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1842
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1843 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1844 interpreter::clear_function_pattern (const std::string& pat)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1845 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1846 m_symbol_table.clear_function_pattern (pat);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1847 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1848
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1849 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1850 interpreter::clear_function_regexp (const std::string& pat)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1851 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1852 m_symbol_table.clear_function_regexp (pat);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1853 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1854
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1855 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1856 interpreter::clear_symbol_pattern (const std::string& pat)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1857 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1858 return m_evaluator.clear_symbol_pattern (pat);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1859 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1860
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1861 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1862 interpreter::clear_symbol_regexp (const std::string& pat)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1863 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1864 return m_evaluator.clear_symbol_regexp (pat);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1865 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1866
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1867 std::list<std::string>
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1868 interpreter::global_variable_names ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1869 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1870 return m_evaluator.global_variable_names ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1871 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1872
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1873 std::list<std::string>
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1874 interpreter::top_level_variable_names ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1875 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1876 return m_evaluator.top_level_variable_names ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1877 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1878
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1879 std::list<std::string>
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1880 interpreter::variable_names ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1881 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1882 return m_evaluator.variable_names ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1883 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1884
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1885 std::list<std::string>
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1886 interpreter::user_function_names ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1887 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1888 return m_symbol_table.user_function_names ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1889 }
27594 e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27593 diff changeset	1890
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1891 std::list<std::string>
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1892 interpreter::autoloaded_functions () const
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1893 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1894 return m_evaluator.autoloaded_functions ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1895 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1896
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1897 // May be used to send an interrupt signal to the the interpreter from
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1898 // another thread (for example, the GUI).
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1899
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1900 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1901 interpreter::interrupt ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1902 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1903 static int sigint = 0;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1904 static bool first = true;
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1905
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1906 if (first)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1907 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1908 octave_get_sig_number ("SIGINT", &sigint);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1909 first = false;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1910 }
29292 eb1e10abe9d5 use method in interpreter class to interrupt interpreter execution in GUI John W. Eaton <jwe@octave.org> parents: 29281 diff changeset	1911
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1912 // Send SIGINT to Octave and (optionally) all other processes in its
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1913 // process group. The signal handler for SIGINT will set a global
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1914 // variable indicating an interrupt has happened. That variable is
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1915 // checked in many places in the Octave interpreter and eventually
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1916 // results in an interrupt_exception being thrown. Finally, that
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1917 // exception is caught and returns control to one of the
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1918 // read-eval-print loops or to the server loop. We use a signal
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1919 // instead of just setting the global variables here so that we will
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1920 // probably send interrupt signals to any subprocesses as well as
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1921 // interrupt execution of the interpreter.
29292 eb1e10abe9d5 use method in interpreter class to interrupt interpreter execution in GUI John W. Eaton <jwe@octave.org> parents: 29281 diff changeset	1922
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1923 pid_t pid
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1924 = m_interrupt_all_in_process_group ? 0 : octave_getpid_wrapper ();
29292 eb1e10abe9d5 use method in interpreter class to interrupt interpreter execution in GUI John W. Eaton <jwe@octave.org> parents: 29281 diff changeset	1925
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1926 octave_kill_wrapper (pid, sigint);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1927 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1928
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1929 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1930 interpreter::pause ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1931 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1932 // FIXME: To be reliable, these tree_evaluator functions must be
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1933 // made thread safe.
29295 b73ddb964093 allow interrupts to be sent to all processes in process group or just octave John W. Eaton <jwe@octave.org> parents: 29293 diff changeset	1934
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1935 m_evaluator.break_on_next_statement (true);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1936 m_evaluator.reset_debug_state ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1937 }
29306 0231189f630d provide interpreter methods for pausing, resuming, and stopping evaluation John W. Eaton <jwe@octave.org> parents: 29295 diff changeset	1938
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1939 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1940 interpreter::stop ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1941 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1942 // FIXME: To be reliable, these tree_evaluator functions must be
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1943 // made thread safe.
29306 0231189f630d provide interpreter methods for pausing, resuming, and stopping evaluation John W. Eaton <jwe@octave.org> parents: 29295 diff changeset	1944
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1945 if (m_evaluator.in_debug_repl ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1946 m_evaluator.dbquit (true);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1947 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1948 interrupt ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1949 }
29306 0231189f630d provide interpreter methods for pausing, resuming, and stopping evaluation John W. Eaton <jwe@octave.org> parents: 29295 diff changeset	1950
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1951 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1952 interpreter::resume ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1953 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1954 // FIXME: To be reliable, these tree_evaluator functions must be
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1955 // made thread safe.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1956
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1957 // FIXME: Should there be any feeback about not doing anything if
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1958 // not in debug mode?
29306 0231189f630d provide interpreter methods for pausing, resuming, and stopping evaluation John W. Eaton <jwe@octave.org> parents: 29295 diff changeset	1959
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1960 if (m_evaluator.in_debug_repl ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1961 m_evaluator.dbcont ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1962 }
29306 0231189f630d provide interpreter methods for pausing, resuming, and stopping evaluation John W. Eaton <jwe@octave.org> parents: 29295 diff changeset	1963
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1964 octave_value
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1965 interpreter::PS1 (const octave_value_list& args, int nargout)
31727 1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1966 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1967 return m_input_system.PS1 (args, nargout);
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1968 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1969
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1970 std::string
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1971 interpreter::PS1 () const
31727 1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1972 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1973 return m_input_system.PS1 ();
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1974 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1975
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1976 std::string
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1977 interpreter::PS1 (const std::string& s)
31727 1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1978 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1979 return m_input_system.PS1 (s);
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1980 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1981
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1982 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1983 interpreter::set_PS1 (const std::string& s)
31727 1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1984 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1985 m_input_system.set_PS1 (s);
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1986 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1987
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1988 octave_value
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1989 interpreter::PS2 (const octave_value_list& args, int nargout)
31727 1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1990 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1991 return m_input_system.PS2 (args, nargout);
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1992 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1993
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1994 std::string
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	1995 interpreter::PS2 () const
31727 1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1996 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1997 return m_input_system.PS2 ();
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1998 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1999
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2000 std::string
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2001 interpreter::PS2 (const std::string& s)
31727 1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2002 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2003 return m_input_system.PS2 (s);
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2004 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2005
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2006 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2007 interpreter::set_PS2 (const std::string& s)
31727 1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2008 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2009 m_input_system.set_PS2 (s);
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2010 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2011
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2012 octave_value
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2013 interpreter::PS4 (const octave_value_list& args, int nargout)
31727 1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2014 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2015 return m_evaluator.PS4 (args, nargout);
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2016 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2017
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2018 std::string
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2019 interpreter::PS4 () const
31727 1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2020 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2021 return m_evaluator.PS4 ();
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2022 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2023
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2024 std::string
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2025 interpreter::PS4 (const std::string& s)
31727 1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2026 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2027 return m_evaluator.PS4 (s);
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2028 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2029
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2030 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2031 interpreter::set_PS4 (const std::string& s)
31727 1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2032 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2033 m_evaluator.set_PS4 (s);
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2034 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2035
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2036 // Provided for convenience. Will be removed once we eliminate the
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2037 // old terminal widget.
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2038 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2039 interpreter::experimental_terminal_widget () const
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2040 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2041 if (! m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2042 return false;
29306 0231189f630d provide interpreter methods for pausing, resuming, and stopping evaluation John W. Eaton <jwe@octave.org> parents: 29295 diff changeset	2043
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2044 // Embedded interpreters don't execute command line options.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2045 const cmdline_options& options = m_app_context->options ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2046
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2047 return options.experimental_terminal_widget ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2048 }
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	2049
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2050 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2051 interpreter::add_debug_watch_expression (const std::string& expr)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2052 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2053 m_evaluator.add_debug_watch_expression (expr);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2054 }
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	2055
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2056 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2057 interpreter::remove_debug_watch_expression (const std::string& expr)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2058 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2059 m_evaluator.remove_debug_watch_expression (expr);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2060 }
29446 435fc29162c0 maintain a set of watch expressions for possible use in tracing/debugging John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	2061
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2062 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2063 interpreter::clear_debug_watch_expressions ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2064 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2065 m_evaluator.clear_debug_watch_expressions ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2066 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2067
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2068 std::set<std::string>
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2069 interpreter::debug_watch_expressions () const
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2070 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2071 return m_evaluator.debug_watch_expressions ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2072 }
29446 435fc29162c0 maintain a set of watch expressions for possible use in tracing/debugging John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	2073
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2074 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2075 interpreter::handle_exception (const execution_exception& ee)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2076 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2077 m_error_system.save_exception (ee);
29446 435fc29162c0 maintain a set of watch expressions for possible use in tracing/debugging John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	2078
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2079 // FIXME: use a separate stream instead of std::cerr directly so that
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2080 // error messages can be redirected more easily? Pass the message
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2081 // to an event manager function?
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2082 m_error_system.display_exception (ee);
29446 435fc29162c0 maintain a set of watch expressions for possible use in tracing/debugging John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	2083
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2084 recover_from_exception ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2085 }
27471 fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	2086
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2087 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2088 interpreter::recover_from_exception ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2089 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2090 if (octave_interrupt_state)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2091 m_event_manager.interpreter_interrupted ();
27471 fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	2092
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2093 can_interrupt = true;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2094 octave_interrupt_state = 0;
31846 5f0b8101234e Remove several race conditions with signal handler (bug #61370). Reinhard Resch <r_resch@a1.net> parents: 31845 diff changeset	2095 octave_signal_caught = false;
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2096 octave_restore_signal_mask ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2097 catch_interrupts ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2098 }
29293 8784f20b9b8c new interpreter_event to signal that interpreter was interrupted John W. Eaton <jwe@octave.org> parents: 29292 diff changeset	2099
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2100 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2101 interpreter::mark_for_deletion (const std::string& file)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2102 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2103 m_tmp_files.insert (file);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2104 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	2105
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2106 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2107 interpreter::cleanup_tmp_files ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2108 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2109 m_tmp_files.cleanup ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2110 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	2111
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2112 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2113 interpreter::quit (int exit_status, bool force, bool confirm)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2114 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2115 if (! force)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2116 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2117 try
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2118 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2119 bool cancel = false;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	2120
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2121 if (symbol_exist ("finish.m", "file"))
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2122 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2123 unwind_protect_var<bool> upv1 (m_executing_finish_script, true);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2124 unwind_protect_var<bool> upv2 (m_cancel_quit);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2125
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2126 evalin ("base", "finish", 0);
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	2127
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2128 cancel = m_cancel_quit;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2129 }
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	2130
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2131 if (cancel)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2132 return;
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	2133
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2134 // Check for confirmation.
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	2135
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2136 if (confirm && ! m_event_manager.confirm_shutdown ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2137 return;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2138 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2139 catch (const execution_exception&)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2140 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2141 // Catch execution_exceptions so we don't throw an
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2142 // exit_exception if there is an in finish.m. But throw it
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2143 // again so that will be handled as any other
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2144 // execution_exception by the evaluator. This way, errors
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2145 // will be ignored properly and we won't exit if quit is
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2146 // called recursively from finish.m.
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	2147
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2148 throw;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2149 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2150 }
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	2151
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2152 throw exit_exception (exit_status);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2153 }
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	2154
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2155 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2156 interpreter::add_atexit_fcn (const std::string& fname)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2157 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2158 if (m_executing_atexit)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2159 return;
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	2160
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2161 m_atexit_fcns.push_front (fname);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2162 }
27690 c81139d8dcc3 prevent atexit functions from adding new atexit functions John W. Eaton <jwe@octave.org> parents: 27689 diff changeset	2163
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2164 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2165 interpreter::remove_atexit_fcn (const std::string& fname)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2166 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2167 bool found = false;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	2168
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2169 for (auto it = m_atexit_fcns.begin ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2170 it != m_atexit_fcns.end (); it++)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2171 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2172 if (*it == fname)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2173 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2174 m_atexit_fcns.erase (it);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2175 found = true;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2176 break;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2177 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2178 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2179
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2180 return found;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2181 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	2182
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2183 // What internal options get configured by --traditional.
23723 ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	2184
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2185 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2186 interpreter::maximum_braindamage ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2187 {
31727 1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2188 PS1 (">> ");
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2189 PS2 ("");
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2190 PS4 ("");
23723 ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	2191
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2192 m_load_save_system.crash_dumps_octave_core (false);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2193 m_load_save_system.save_default_options ("-mat-binary");
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2194
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2195 m_history_system.timestamp_format_string ("%%-- %D %I:%M %p --%%");
23723 ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	2196
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2197 m_error_system.beep_on_error (true);
29932 b39203a44db2 Call print_struct_array_contents(1) when '--traditional' option used. Rik <rik@octave.org> parents: 29912 diff changeset	2198
31813 73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	2199 Fconfirm_recursive_rmdir (ovl (false));
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	2200 Foptimize_diagonal_matrix (ovl (false));
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	2201 Foptimize_permutation_matrix (ovl (false));
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	2202 Foptimize_range (ovl (false));
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	2203 Ffixed_point_format (ovl (true));
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	2204 Fprint_empty_dimensions (ovl (false));
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	2205 Fprint_struct_array_contents (ovl (true));
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	2206 Fstruct_levels_to_print (ovl (0));
23723 ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	2207
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2208 m_error_system.disable_warning ("Octave:abbreviated-property-match");
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2209 m_error_system.disable_warning ("Octave:colon-nonscalar-argument");
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2210 m_error_system.disable_warning ("Octave:data-file-in-path");
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2211 m_error_system.disable_warning ("Octave:empty-index");
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2212 m_error_system.disable_warning ("Octave:function-name-clash");
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2213 m_error_system.disable_warning ("Octave:possible-matlab-short-circuit-operator");
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2214 }
25345 ce6f7a5cd68e avoid global access of load path in interpreter class John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	2215
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2216 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2217 interpreter::execute_pkg_add (const std::string& dir)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2218 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2219 try
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2220 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2221 m_load_path.execute_pkg_add (dir);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2222 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2223 catch (const interrupt_exception&)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2224 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2225 recover_from_exception ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2226 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2227 catch (const execution_exception& ee)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2228 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2229 handle_exception (ee);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2230 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2231 }
29960 939bef0b66e0 merge "namespace octave" and OCTAVE_NAMESPACE_BEGIN/END blocks John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	2232
31731 06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2233 // Execute commands from a file and catch potential exceptions in a consistent
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2234 // way. This function should be called anywhere we might parse and execute
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2235 // commands from a file before we have entered the main loop in
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2236 // toplev.cc.
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2237
32589 05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2238 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2239 interpreter::safe_source_file (const std::string& file_name,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2240 const std::string& context,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release. Rik <rik@octave.org> parents: 32581 diff changeset	2241 bool verbose, bool require_file)
31731 06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2242 {
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2243 try
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2244 {
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2245 source_file (file_name, context, verbose, require_file);
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2246 }
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2247 catch (const interrupt_exception&)
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2248 {
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2249 recover_from_exception ();
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2250
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2251 return 1;
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2252 }
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2253 catch (const execution_exception& ee)
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2254 {
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2255 handle_exception (ee);
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2256
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2257 return 1;
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2258 }
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2259
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2260 return 0;
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2261 }
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2262
31605 e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 31593 diff changeset	2263 OCTAVE_END_NAMESPACE(octave)

Mercurial > octave

annotate libinterp/corefcn/interpreter.cc @ 33250:40fde86be9b0