octave: libinterp/corefcn/interpreter.cc annotate

annotate libinterp/corefcn/interpreter.cc @ 31855:1daf8bfceac3

default or disable more ctors, dtors, and assignment ops In most classes in liboctave and libinterp (except for the files in octave-value subdirectory) that had at least one of the following functions defined default constructor copy constructor copy assignment operator destructor declare all of them. In most cases, this means declaring default or deleted functions. In some cases, explicit definitions have been replaced by equivalent default functions. In some cases, default or deleted move constructors and move assignment operators have also been declared. Files affected: __magick_read__.cc, c-file-ptr-stream.h, dynamic-ld.h, environment.h, error.h, event-manager.h, fcn-info.h, genprops.awk, gl-render.cc, gl-render.h, gl2ps-print.cc, graphics-toolkit.h, graphics.cc, graphics.in.h, gtk-manager.h, hook-fcn.h, input.h, interpreter.cc, latex-text-renderer.cc, load-path.h, load-save.h, ls-hdf5.h, mex.cc, mxarray.h, oct-errno.h, oct-fstrm.h, oct-hist.h, oct-iostrm.h, oct-map.h, oct-prcstrm.h, oct-process.h, oct-stdstrm.h, oct-stream.cc, oct-stream.h, oct-strstrm.h, pager.h, procstream.h, symrec.h, symtab.h, text-engine.h, text-renderer.h, utils.h, __init_fltk__.cc, __init_gnuplot__.cc, __ode15__.cc, audiodevinfo.cc, octave.h, anon-fcn-validator.h, bp-table.h, comment-list.h, lex.h, oct-lvalue.h, oct-parse.yy, parse.h, profiler.h, pt-args-block.h, pt-binop.h, pt-bp.h, pt-cbinop.h, pt-classdef.h, pt-cmd.h, pt-decl.h, pt-eval.h, pt-id.h, pt-misc.h, pt-spmd.h, token.h, Array-base.cc, CColVector.h, CNDArray.h, CRowVector.h, CSparse.h, Range.h, boolNDArray.h, boolSparse.h, chNDArray.h, dColVector.h, dNDArray.h, dRowVector.h, dSparse.h, fCColVector.h, fCNDArray.h, fCRowVector.h, fColVector.h, fNDArray.h, fRowVector.h, idx-vector.h, DASPK.h, DASRT.h, DASSL.h, DET.h, LSODE.h, Quad.h, chol.h, oct-fftw.h, oct-norm.cc, oct-rand.h, sparse-qr.cc, svd.cc, child-list.h, file-stat.h, oct-env.h, oct-group.h, oct-time.h, action-container.h, cmd-edit.cc, cmd-hist.cc, kpse.h, lo-array-errwarn.h, lo-regexp.h, oct-mutex.cc, oct-mutex.h, oct-refcount.h, oct-shlib.cc, oct-shlib.h, oct-string.h, octave-preserve-stream-state.h, quit.h, unwind-prot.h, and octave-svgconvert.cc.

author	John W. Eaton <jwe@octave.org>
date	Fri, 17 Feb 2023 23:27:46 -0500
parents	5f0b8101234e
children	0db880f38b1f

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 //
31706 597f3ee61a48 update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 31635 diff changeset	3 // Copyright (C) 1993-2023 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"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	46 #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	47 #include "quit.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	48 #include "str-vec.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	49 #include "signal-wrappers.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	50 #include "unistd-wrappers.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	51
23711 5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	52 #include "builtin-defun-decls.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	53 #include "defaults.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	54 #include "Cell.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	55 #include "defun.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	56 #include "display.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	57 #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	58 #include "event-manager.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	59 #include "graphics.h"
23721 b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23719 diff changeset	60 #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	61 #include "input.h"
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	62 #include "interpreter-private.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	63 #include "interpreter.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	64 #include "load-path.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	65 #include "load-save.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	66 #include "octave.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	67 #include "oct-hist.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	68 #include "oct-map.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	69 #include "oct-mutex.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	70 #include "ovl.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	71 #include "ov.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	72 #include "ov-classdef.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	73 #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	74 #include "pt-classdef.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	75 #include "pt-eval.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	76 #include "pt-jump.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	77 #include "pt-stmt.h"
25443 2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25440 diff changeset	78 #include "settings.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	79 #include "sighandlers.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	80 #include "sysdep.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	81 #include "unwind-prot.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	82 #include "utils.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	83 #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	84 #include "version.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	85
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	86 // TRUE means the quit() call is allowed.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	87 bool quit_allowed = true;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	88
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	89 // 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	90 // is ready for interactive use.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	91 bool octave_interpreter_ready = false;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	92
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	93 // 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	94 std::atomic<bool> octave_initialized{false};
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	95
31605 e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 31593 diff changeset	96 OCTAVE_BEGIN_NAMESPACE(octave)
29958 32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 29956 diff changeset	97
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	98 DEFUN (__version_info__, args, ,
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	99 doc: /* -- texinfo --
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	100 @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	101 Undocumented internal function.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	102 @end deftypefn */)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	103 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	104 static octave_map vinfo;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	105
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	106 int nargin = args.length ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	107
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	108 if (nargin != 0 && nargin != 4)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	109 print_usage ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	110
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	111 octave_value retval;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	112
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	113 if (nargin == 0)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	114 retval = vinfo;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	115 else if (nargin == 4)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	116 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	117 if (vinfo.nfields () == 0)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	118 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	119 vinfo.assign ("Name", args(0));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	120 vinfo.assign ("Version", args(1));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	121 vinfo.assign ("Release", args(2));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	122 vinfo.assign ("Date", args(3));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	123 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	124 else
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	125 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	126 octave_idx_type n = vinfo.numel () + 1;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	127
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	128 vinfo.resize (dim_vector (n, 1));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	129
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	130 octave_value idx (n);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	131
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	132 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	133 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	134 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	135 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	136 }
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 return retval;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	140 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	141
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27214 diff changeset	142 DEFMETHOD (quit, interp, args, ,
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27214 diff changeset	143 doc: /* -- texinfo --
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	144 @deftypefn {} {} quit
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	145 @deftypefnx {} {} quit cancel
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	146 @deftypefnx {} {} quit force
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	147 @deftypefnx {} {} quit ("cancel")
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	148 @deftypefnx {} {} quit ("force")
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	149 @deftypefnx {} {} quit (@var{status})
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	150 @deftypefnx {} {} quit (@var{status}, "force")
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	151 Quit the current Octave session.
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	152
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	153 The @code{exit} function is an alias for @code{quit}.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	154
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.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	175 @seealso{atexit}
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	176 @end deftypefn */)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	177 {
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	178 int numel = args.length ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	179
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	180 if (numel > 2)
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	181 print_usage ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	182
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	183 int exit_status = 0;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	184
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	185 bool force = false;
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	186 bool cancel = false;
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	187
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	188 if (numel == 2)
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	189 {
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	190 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	191 std::string frc
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	192 = 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	193
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	194 if (frc == "force")
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	195 force = true;
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	196 else
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	197 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	198 }
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	199 else if (numel == 1)
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	200 {
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	201 if (args(0).is_string ())
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	202 {
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	203 const char *msg
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	204 = 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	205
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	206 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	207
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	208 if (opt == "cancel")
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	209 cancel = true;
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	210 else if (opt == "force")
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	211 force = true;
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	212 else
27593 a2db1e36e9b2 Silence compiler warning about use of error() without format string. Rik <rik@octave.org> parents: 27592 diff changeset	213 error ("%s", msg);
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	214 }
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	215 else
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	216 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	217 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	218
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	219 if (cancel)
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	220 {
27591 b54d6ac62fbf make "quit cancel" a no-op outside of finish script John W. Eaton <jwe@octave.org> parents: 27588 diff changeset	221 // 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	222
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	223 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	224 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	225
b54d6ac62fbf make "quit cancel" a no-op outside of finish script John W. Eaton <jwe@octave.org> parents: 27588 diff changeset	226 return ovl ();
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	227 }
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	228
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	229 interp.quit (exit_status, force);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	230
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	231 return ovl ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	232 }
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 DEFALIAS (exit, quit);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	235
27474 3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27471 diff changeset	236 DEFMETHOD (atexit, interp, args, nargout,
3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27471 diff changeset	237 doc: /* -- texinfo --
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	238 @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	239 @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	240 @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	241 @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	242 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	243
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	244 For example,
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	245
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	246 @example
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	247 @group
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	248 function last_words ()
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	249 disp ("Bye bye");
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	250 endfunction
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	251 atexit ("last_words");
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	252 @end group
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	253 @end example
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	254
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	255 @noindent
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	256 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	257
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	258 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	259 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	260 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	261 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	262 above,
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	263
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	264 @example
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	265 atexit ("last_words", false);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	266 @end example
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	267
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	268 @noindent
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	269 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	270 @code{last_words} when it exits.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	271
30888 32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/ Rik <rik@octave.org> parents: 30752 diff changeset	272 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	273 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	274 otherwise.
32d2b6604a9f doc: Ensure documentation lists output argument when it exists for functions in libinterp/ Rik <rik@octave.org> parents: 30752 diff changeset	275
31376 ad8a4102f910 doc: Spellcheck documentation for 8.1 release. Rik <rik@octave.org> parents: 31105 diff changeset	276 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	277 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	278 @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	279 @seealso{quit}
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	280 @end deftypefn */)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	281 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	282 int nargin = args.length ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	283
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	284 if (nargin < 1 \|\| nargin > 2)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	285 print_usage ();
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 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	288
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	289 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	290 ? 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	291 : true;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	292
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	293 octave_value_list retval;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	294
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	295 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	296 interp.add_atexit_fcn (arg);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	297 else
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	298 {
27689 4f32af6abd4b don't use static variable for list of interpreter atexit functions John W. Eaton <jwe@octave.org> parents: 27594 diff changeset	299 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	300
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	301 if (nargout > 0)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	302 retval = ovl (found);
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
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	305 return retval;
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
28380 548556e78bdf make --traditional option easily accessible to the interpreter John W. Eaton <jwe@octave.org> parents: 28347 diff changeset	308 DEFMETHOD (__traditional__, interp, , ,
548556e78bdf make --traditional option easily accessible to the interpreter John W. Eaton <jwe@octave.org> parents: 28347 diff changeset	309 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	310 @deftypefn {} {@var{tf} =} __traditional__ ()
31593 0f93c3a756f7 doc: grammarcheck documentation ahead of 8.1 release. Rik <rik@octave.org> parents: 31555 diff changeset	311 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	312 @end deftypefn */)
548556e78bdf make --traditional option easily accessible to the interpreter John W. Eaton <jwe@octave.org> parents: 28347 diff changeset	313 {
548556e78bdf make --traditional option easily accessible to the interpreter John W. Eaton <jwe@octave.org> parents: 28347 diff changeset	314 return ovl (interp.traditional ());
548556e78bdf make --traditional option easily accessible to the interpreter John W. Eaton <jwe@octave.org> parents: 28347 diff changeset	315 }
548556e78bdf make --traditional option easily accessible to the interpreter John W. Eaton <jwe@octave.org> parents: 28347 diff changeset	316
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	317 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	318 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	319 cleanup ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	320 }
27542 b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	321
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	322 void temporary_file_list::insert (const std::string& file)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	323 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	324 m_files.insert (file);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	325 }
27542 b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	326
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	327 void temporary_file_list::cleanup ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	328 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	329 while (! m_files.empty ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	330 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	331 auto it = m_files.begin ();
27542 b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	332
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	333 octave_unlink_wrapper (it->c_str ());
27542 b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	334
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	335 m_files.erase (it);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	336 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	337 }
27542 b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	338
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	339 // 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	340 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	341
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	342 static void initialize_version_info ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	343 {
31813 73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	344 octave_value_list args (4);
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	345
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	346 args(0) = "GNU Octave";
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	347 args(1) = OCTAVE_VERSION;
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	348 args(2) = config::release ();
31813 73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	349 args(3) = OCTAVE_RELEASE_DATE;
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	350
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	351 F__version_info__ (args);
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	352 }
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	353
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	354 static void xerbla_abort ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	355 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	356 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	357 }
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	358
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	359 static void initialize_xerbla_error_handler ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	360 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	361 // 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	362 // 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	363 // 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	364 // 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	365 // 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	366 // 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	367
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	368 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	369 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	370
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	371 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	372
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	373 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	374
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	375 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	376
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	377 if (libs)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	378 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	379 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	380 = 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	381 (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	382
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	383 if (octave_set_xerbla_handler)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	384 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	385 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	386 }
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	387
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	388 OCTAVE_NORETURN static void
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	389 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	390 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	391 va_list args;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	392 va_start (args, fmt);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	393 verror_with_cfn (fmt, args);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	394 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	395
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	396 throw execution_exception ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	397 }
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	398
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	399 OCTAVE_NORETURN static void
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	400 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	401 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	402 va_list args;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	403 va_start (args, fmt);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	404 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	405 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	406
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	407 throw execution_exception ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	408 }
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	409
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	410 static void initialize_error_handlers ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	411 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	412 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	413 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	414 set_liboctave_warning_handler (warning);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	415 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	416 }
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	417
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	418 // 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	419 // 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	420 // path.
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22186 diff changeset	421
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	422 interpreter::interpreter (application *app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	423 : m_app_context (app_context),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	424 m_tmp_files (),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	425 m_atexit_fcns (),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	426 m_display_info (),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	427 m_environment (),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	428 m_settings (),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	429 m_error_system (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	430 m_evaluator (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	431 m_help_system (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	432 m_input_system (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	433 m_output_system (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	434 m_history_system (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	435 m_dynamic_loader (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	436 m_load_path (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	437 m_load_save_system (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	438 m_type_info (),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	439 m_symbol_table (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	440 m_stream_list (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	441 m_child_list (),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	442 m_url_handle_manager (),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	443 m_cdef_manager (*this),
31730 610a85b0ff62 use interpreter::feval instead of global feval function John W. Eaton <jwe@octave.org> parents: 31727 diff changeset	444 m_gtk_manager (*this),
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	445 m_event_manager (*this),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	446 m_gh_manager (nullptr),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	447 m_interactive (false),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	448 m_read_site_files (true),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	449 m_read_init_files (m_app_context != nullptr),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	450 m_verbose (false),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	451 m_traditional (false),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	452 m_inhibit_startup_message (false),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	453 m_load_path_initialized (false),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	454 m_history_initialized (false),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	455 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	456 m_cancel_quit (false),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	457 m_executing_finish_script (false),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	458 m_executing_atexit (false),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	459 m_initialized (false)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	460 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	461 // 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	462 // 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	463 //
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	464 // 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	465
31845 2da025d5e98d maint: Use 's_' prefix for static private class variables. Rik <rik@octave.org> parents: 31837 diff changeset	466 if (s_instance)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	467 throw std::runtime_error
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	468 ("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	469
31845 2da025d5e98d maint: Use 's_' prefix for static private class variables. Rik <rik@octave.org> parents: 31837 diff changeset	470 s_instance = this;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	471
30309 bf619727bf6c interpreter: Use UTF-8 locale on Windows if possible. Markus Mützel <markus.muetzel@gmx.de> parents: 30156 diff changeset	472 #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	473 // 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	474 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	475 #else
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	476 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	477 #endif
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	478 // 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	479 std::setlocale (LC_NUMERIC, "C");
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	480 std::setlocale (LC_TIME, "C");
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	481 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	482 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	483
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	484 // 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	485 octave_set_default_fpucw ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	486
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	487 thread::init ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	488
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	489 octave_ieee_init ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	490
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	491 initialize_xerbla_error_handler ();
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_error_handlers ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	494
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	495 if (m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	496 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	497 install_signal_handlers ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	498 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	499 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	500 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	501 quit_allowed = false;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	502
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	503 if (! m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	504 m_display_info.initialize ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	505
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	506 bool line_editing = false;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	507
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	508 if (m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	509 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	510 // 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	511 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	512
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	513 // 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	514 // including PKG_ADD files.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	515
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	516 string_vector args = options.all_args ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	517
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	518 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	519 intern_nargin (args.numel () - 1);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	520
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	521 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	522
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	523 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	524
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	525 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	526 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	527
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	528 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	529 if (! exec_path.empty ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	530 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	531
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	532 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	533 if (! image_path.empty ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	534 m_environment.image_path (image_path);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	535
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	536 if (! options.no_window_system ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	537 m_display_info.initialize ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	538
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	539 // 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	540 // interactive.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	541
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	542 // 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	543 // pipe or a redirected file.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	544 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	545
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	546 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	547 && octave_isatty_wrapper (fileno (stdout)));
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	548
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	549 // 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	550 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	551 if (m_interactive)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	552 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	553 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	554 forced_interactive = false;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	555 }
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	556
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	557 // 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	558 if (forced_interactive)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	559 m_interactive = true;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	560
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	561 line_editing = options.line_editing ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	562 if ((! m_interactive \|\| forced_interactive)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	563 && ! options.forced_line_editing ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	564 line_editing = false;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	565
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	566 m_traditional = options.traditional ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	567
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	568 // 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	569 // 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	570
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	571 if (options.echo_commands ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	572 m_evaluator.echo
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	573 (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	574 \| tree_evaluator::ECHO_ALL);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	575
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	576 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	577 if (! docstrings_file.empty ())
31813 73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	578 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	579
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	580 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	581 if (! doc_cache_file.empty ())
31813 73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	582 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	583
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	584 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	585 if (! info_file.empty ())
31813 73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	586 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	587
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	588 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	589 if (! info_program.empty ())
31813 73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	590 Finfo_program (*this, ovl (info_program));
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	591
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	592 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	593 if (! texi_macros_file.empty ())
31813 73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	594 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	595 }
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 // 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	598 // 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	599 // 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	600 // 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	601 // 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	602 // 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	603 // 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	604 // 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	605 // 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	606 // 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	607 // it is actually needed.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	608 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	609
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	610 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	611
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	612 // 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	613 // 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	614
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	615 initialize_version_info ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	616
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	617 // 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	618 // 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	619
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	620 if (m_traditional)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	621 maximum_braindamage ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	622
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	623 octave_interpreter_ready = true;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	624 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	625
31845 2da025d5e98d maint: Use 's_' prefix for static private class variables. Rik <rik@octave.org> parents: 31837 diff changeset	626 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	627
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	628 interpreter::~interpreter ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	629 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	630 if (! m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	631 shutdown ();
23711 5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	632
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	633 delete m_gh_manager;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	634 }
23711 5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	635
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	636 void interpreter::intern_nargin (octave_idx_type nargs)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	637 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	638 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	639 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	640
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	641 // 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	642
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	643 void interpreter::initialize_history (bool read_history_file)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	644 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	645 if (! m_history_initialized)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	646 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	647 // 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	648
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	649 if (m_app_context)
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 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	652
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	653 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	654
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	655 if (! read_history_file)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	656 command_history::ignore_entries ();
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
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	659 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	660
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	661 if (! m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	662 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	663
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	664 m_history_initialized = true;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	665 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	666 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	667
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	668 // 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	669 // 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	670
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	671 void interpreter::initialize_load_path (bool set_initial_path)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	672 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	673 if (! m_load_path_initialized)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	674 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	675 // 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	676
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	677 if (m_app_context)
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 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	680
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	681 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	682 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	683
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	684 // 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	685 // 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	686 // 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	687 // 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	688 // 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	689 // 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	690 // 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	691 // are already handled.
27322 cb92168e48f6 defer gh_manager creation until after display_info initialization John W. Eaton <jwe@octave.org> parents: 27321 diff changeset	692
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	693 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	694 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	695
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	696 m_load_path.set_add_hook ([=] (const std::string& dir)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	697 { this->execute_pkg_add (dir); });
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	698
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	699 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	700
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	701 m_load_path_initialized = true;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	702 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	703 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	704
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	705 // 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	706
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	707 void interpreter::initialize ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	708 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	709 if (m_initialized)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	710 return;
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 if (m_app_context)
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 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	715
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	716 if (options.experimental_terminal_widget ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	717 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	718 if (! options.gui ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	719 display_startup_message ();
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 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	722 display_startup_message ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	723 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	724 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	725 display_startup_message ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	726
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	727 // 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	728 // 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	729
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	730 initialize_history ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	731
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	732 // 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	733 // 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	734
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	735 // 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	736 // 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	737 // 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	738
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	739 initialize_load_path ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	740
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	741 octave_save_signal_mask ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	742
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	743 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	744
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	745 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	746 octave_interrupt_hook = nullptr;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	747
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	748 catch_interrupts ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	749
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	750 // 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	751 // 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	752 octave_initialized = true;
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	753
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	754 m_initialized = true;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	755 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	756
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	757 // 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	758 // experimental terminal widget.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	759
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	760 void 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	761 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	762 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	763 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	764
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	765 // 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	766 // 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	767
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	768 class cli_input_reader
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	769 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	770 public:
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	771
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	772 cli_input_reader (interpreter& interp)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	773 : m_interpreter (interp), m_thread () { }
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	774
31855 1daf8bfceac3 default or disable more ctors, dtors, and assignment ops John W. Eaton <jwe@octave.org> parents: 31846 diff changeset	775 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	776
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	777 ~cli_input_reader ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	778 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	779 // 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	780 // 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	781 // m_thread.join () here?
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	782
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	783 m_thread.detach ();
23092 0fed4c678795 additional restructuring of startup and shutdown John W. Eaton <jwe@octave.org> parents: 23087 diff changeset	784 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	785
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	786 void start ()
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	787 {
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	788 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	789 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	790
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	791 private:
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	792
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	793 interpreter& m_interpreter;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	794
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	795 std::thread m_thread;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	796 };
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	797
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	798 void interpreter::parse_and_execute (const std::string& input,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	799 bool& incomplete_parse)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	800 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	801 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	802 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	803
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	804 // 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	805 // we enforce that restriction?
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	806
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	807 int interpreter::execute ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	808 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	809 int exit_status = 0;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	810
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	811 try
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	812 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	813 initialize ();
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	814
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	815 execute_startup_files ();
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 if (m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	818 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	819 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	820
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	821 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	822 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	823 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	824
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	825 if (status )
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	826 exit_status = status;
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 if (! options.persist ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	829 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	830 shutdown ();
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	831
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	832 return exit_status;
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 }
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 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	837 // 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	838 // for the script.
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 (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	841 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	842 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	843
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	844 if (status)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	845 exit_status = status;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	846
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	847 if (! options.persist ())
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 shutdown ();
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 return exit_status;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	852 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	853 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	854
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	855 if (options.forced_interactive ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	856 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	857
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	858 if (options.server ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	859 exit_status = server_loop ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	860 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	861 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	862 if (options.gui ())
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 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	865
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	866 exit_status = server_loop ();
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 else
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 // 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	871 // 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	872 // this function.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	873
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	874 cli_input_reader reader (*this);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	875
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	876 reader.start ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	877
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	878 exit_status = server_loop ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	879 }
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 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	882 exit_status = main_loop ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	883
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	884 shutdown ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	885 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	886 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	887 catch (const exit_exception& xe)
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	888 {
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	889 exit_status = xe.exit_status ();
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	890
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	891 shutdown ();
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	892 }
3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	893
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	894 return exit_status;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	895 }
23819 5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	896
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	897 // 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	898 // errors while shutting down.
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	899
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	900 #define OCTAVE_IGNORE_EXCEPTION(E) \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	901 catch (E) \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	902 { \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	903 recover_from_exception (); \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	904 \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	905 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	906 << std::endl; \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	907 }
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	908
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	909 #define OCTAVE_SAFE_CALL(F, ARGS) \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	910 do \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	911 { \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	912 try \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	913 { \
29253 28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29171 diff changeset	914 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	915 (&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	916 m_error_system.debug_on_error ()); \
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	917 \
29253 28913793f678 prefer unwind_action over unwind_protect in more places John W. Eaton <jwe@octave.org> parents: 29171 diff changeset	918 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	919 (&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	920 m_error_system.debug_on_warning ()); \
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	921 \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	922 m_error_system.debug_on_error (false); \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	923 m_error_system.debug_on_warning (false); \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	924 \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	925 F ARGS; \
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 OCTAVE_IGNORE_EXCEPTION (const exit_exception&) \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	928 OCTAVE_IGNORE_EXCEPTION (const interrupt_exception&) \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	929 OCTAVE_IGNORE_EXCEPTION (const execution_exception&) \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	930 OCTAVE_IGNORE_EXCEPTION (const std::bad_alloc&) \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	931 } \
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	932 while (0)
00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	933
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	934 void interpreter::shutdown ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	935 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	936 // 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	937
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	938 if (! m_initialized)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	939 return;
29545 841ca9987302 perform shutdown actions in interpreter destructor (bug #60334) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	940
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	941 m_initialized = false;
29545 841ca9987302 perform shutdown actions in interpreter destructor (bug #60334) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	942
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	943 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	944
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	945 // 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	946 // 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	947 // 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	948
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	949 execute_atexit_fcns ();
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	950
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	951 // 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	952 // 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	953 // 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	954
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	955 // 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	956 // 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	957 // 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	958 // 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	959 // 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	960 // 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	961 // 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	962 // 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	963 // 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	964
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	965 // 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	966 // 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	967 // and functions to be cleared.
28622 d075c2f26d1d reorder shutdown steps (bug #57591) John W. Eaton <jwe@octave.org> parents: 28616 diff changeset	968
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	969 OCTAVE_SAFE_CALL (clear_all, ());
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	970 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	971
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	972 // 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	973 // 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	974 // disable the link.
30738 3c4368f0a4ab clear workspace model before exit (bug #61994) John W. Eaton <jwe@octave.org> parents: 30736 diff changeset	975
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	976 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	977 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	978 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	979
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	980 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	981
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	982 // 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	983
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	984 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	985
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	986 // 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	987 // 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	988 // 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	989 // 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	990 // 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	991 // to end.
28622 d075c2f26d1d reorder shutdown steps (bug #57591) John W. Eaton <jwe@octave.org> parents: 28616 diff changeset	992
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	993 // 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	994 // 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	995 // 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	996
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	997 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	998
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	999 // 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	1000 // 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	1001 // called.
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	1002
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1003 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	1004
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1005 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	1006
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1007 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	1008
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1009 if (! command_history::ignoring_entries ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1010 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	1011
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1012 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	1013
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1014 // 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	1015 // symbols to be cleared.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1016
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1017 OCTAVE_SAFE_CALL (clear_all, (true));
28622 d075c2f26d1d reorder shutdown steps (bug #57591) John W. Eaton <jwe@octave.org> parents: 28616 diff changeset	1018
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1019 // 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	1020 // 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	1021 // 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	1022 // 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	1023 // 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	1024
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1025 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	1026
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1027 OCTAVE_SAFE_CALL (sysdep_cleanup, ());
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	1028
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1029 OCTAVE_SAFE_CALL (flush_stdout, ());
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	1030
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1031 // 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	1032 // 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	1033 // 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	1034 // 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	1035 // 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	1036 // 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	1037 // 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	1038 // .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	1039 // is unloaded.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1040 //
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1041 // 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	1042 }
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	1043
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1044 void interpreter::execute_atexit_fcns ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1045 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1046 // 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	1047 m_executing_atexit = true;
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	1048
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1049 while (! m_atexit_fcns.empty ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1050 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1051 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	1052
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1053 m_atexit_fcns.pop_front ();
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	1054
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1055 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	1056
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1057 OCTAVE_SAFE_CALL (flush_stdout, ());
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1058 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1059 }
28347 00a9a49c7670 improve interpreter shutdown process (bug #56952) John W. Eaton <jwe@octave.org> parents: 28266 diff changeset	1060
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1061 void 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	1062 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1063 bool inhibit_startup_message = false;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1064
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1065 if (m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1066 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1067 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	1068
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1069 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	1070 }
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1071
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1072 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	1073 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	1074 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1075
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1076 // Initialize by reading startup files. Return non-zero if an exception
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1077 // 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	1078 // exception.
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1079
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1080 int interpreter::execute_startup_files ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1081 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1082 bool read_site_files = m_read_site_files;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1083 bool read_init_files = m_read_init_files;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1084 bool verbose = m_verbose;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1085 bool inhibit_startup_message = m_inhibit_startup_message;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1086
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1087 if (m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1088 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1089 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	1090
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1091 read_site_files = options.read_site_files ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1092 read_init_files = options.read_init_files ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1093 verbose = options.verbose_flag ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1094 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	1095 }
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1096
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1097 verbose = (verbose && ! inhibit_startup_message);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1098
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1099 bool require_file = false;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1100
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1101 std::string context;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1102
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1103 int exit_status = 0;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1104
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1105 if (read_site_files)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1106 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1107 // 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	1108 // 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	1109 // (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	1110 // $(prefix)/share/octave/$(version)/m/octaverc (if it exists).
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1111
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1112 int status = safe_source_file (config::local_site_defaults_file (),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1113 context, verbose, require_file);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1114
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1115 if (status)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1116 exit_status = status;
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 status = safe_source_file (config::site_defaults_file (),
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1119 context, verbose, require_file);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1120
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1121 if (status)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1122 exit_status = status;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1123 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1124
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1125 if (read_init_files)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1126 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1127 // 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	1128 // 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	1129 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	1130
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1131 if (! ff_startup_m.empty ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1132 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1133 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	1134
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1135 try
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1136 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1137 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	1138 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1139 catch (const interrupt_exception&)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1140 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1141 recover_from_exception ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1142 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1143 catch (const execution_exception& ee)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1144 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1145 handle_exception (ee);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1146 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1147 }
27832 8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27693 diff changeset	1148
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1149 // 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	1150 // $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	1151 // configuration files.
27832 8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27693 diff changeset	1152
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1153 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	1154
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1155 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	1156 + "octave";
27832 8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27693 diff changeset	1157
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1158 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	1159
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1160 if (! cfg_rc.empty ())
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 int status = safe_source_file (cfg_rc, context, verbose,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1163 require_file);
27832 8fd7d1d2a4ca Read startup files from XDG_CONFIG_HOME or LOCALAPPDATA (bug #36477). Mike Miller <mtmiller@octave.org> parents: 27693 diff changeset	1164
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1165 if (status)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1166 exit_status = status;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1167 }
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1168
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1169 // 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	1170 // $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	1171 // .octaverc is assumed.
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1172
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1173 bool home_rc_already_executed = false;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1174
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1175 std::string initfile = sys::env::getenv ("OCTAVE_INITFILE");
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1176
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1177 if (initfile.empty ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1178 initfile = ".octaverc";
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1179
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1180 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	1181
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1182 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	1183
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1184 std::string local_rc;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1185
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1186 if (! home_rc.empty ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1187 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1188 int status = safe_source_file (home_rc, context, verbose,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1189 require_file);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1190
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1191 if (status)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1192 exit_status = status;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1193
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1194 // Names alone are not enough.
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 sys::file_stat fs_home_rc (home_rc);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1197
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1198 if (fs_home_rc)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1199 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1200 // 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	1201 // 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	1202
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1203 local_rc = sys::env::make_absolute (initfile);
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 home_rc_already_executed = same_file (home_rc, local_rc);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1206 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1207 }
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1208
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1209 if (! home_rc_already_executed)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1210 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1211 if (local_rc.empty ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1212 local_rc = sys::env::make_absolute (initfile);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1213
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1214 int status = safe_source_file (local_rc, context, verbose,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1215 require_file);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1216
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1217 if (status)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1218 exit_status = status;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1219 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1220 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1221
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1222 if (m_interactive && verbose)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1223 std::cout << std::endl;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1224
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1225 return exit_status;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1226 }
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 // 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	1229
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1230 int 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	1231 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1232 if (! m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1233 return 0;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1234
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1235 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	1236
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1237 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	1238
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1239 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	1240
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1241 int parse_status = 0;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1242
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1243 try
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 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	1246 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1247 catch (const interrupt_exception&)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1248 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1249 recover_from_exception ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1250
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1251 return 1;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1252 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1253 catch (const execution_exception& ee)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1254 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1255 handle_exception (ee);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1256
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1257 return 1;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1258 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1259
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1260 return parse_status;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1261 }
27530 7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	1262
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1263 int 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	1264 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1265 if (! m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1266 return 0;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1267
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1268 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	1269
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1270 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	1271
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1272 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	1273 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	1274
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1275 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	1276
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1277 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	1278 args.numel () - 1);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1279
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1280 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	1281 = &application::program_invocation_name;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1282 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	1283 (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	1284 application::program_invocation_name ());
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1285
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1286 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	1287 = &application::program_name;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1288 unwind_action restore_program_name
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1289 (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	1290
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1291 m_interactive = false;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1292
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1293 // 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	1294 // 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	1295
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1296 string_vector script_args = options.remaining_args ();
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1297
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1298 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	1299 intern_nargin (script_args.numel () - 1);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1300
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1301 std::string fname = script_args[0];
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1302
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1303 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	1304
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1305 std::string context;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1306 bool verbose = false;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1307 bool require_file = true;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1308
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1309 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	1310 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1311
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1312 int interpreter::main_loop ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1313 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1314 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	1315
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1316 return m_evaluator.repl ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1317 }
30749 076e19eac74a allow deletion of dynamic_library objects to be delayed John W. Eaton <jwe@octave.org> parents: 30747 diff changeset	1318
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1319 int interpreter::server_loop ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1320 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1321 return m_evaluator.server_loop ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1322 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1323
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1324 tree_evaluator& interpreter::get_evaluator ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1325 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1326 return m_evaluator;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1327 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1328
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1329 stream_list& interpreter::get_stream_list ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1330 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1331 return m_stream_list;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1332 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1333
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1334 url_handle_manager& 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	1335 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1336 return m_url_handle_manager;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1337 }
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	1338
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1339 symbol_scope
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1340 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	1341 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1342 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	1343 }
23742 1f0daaf81955 don't use singleton for ch_manager, rename to url_handle_manager John W. Eaton <jwe@octave.org> parents: 23738 diff changeset	1344
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1345 symbol_scope
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1346 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	1347 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1348 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	1349 }
23609 99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1350
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1351 symbol_scope
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1352 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	1353 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1354 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	1355
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1356 if (! scope)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1357 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	1358
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1359 return scope;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1360 }
23609 99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1361
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1362 profiler& interpreter::get_profiler ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1363 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1364 return m_evaluator.get_profiler ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1365 }
23609 99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1366
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1367 int interpreter::chdir (const std::string& dir)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1368 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1369 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	1370
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1371 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	1372
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1373 if (! cd_ok)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1374 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	1375
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1376 Vlast_chdir_time.stamp ();
27408 9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1377
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1378 // 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	1379 // 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	1380
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1381 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	1382 m_load_path.update ();
27408 9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1383
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1384 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	1385
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1386 return cd_ok;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1387 }
27408 9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1388
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1389 void interpreter::mlock (bool skip_first) const
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1390 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1391 m_evaluator.mlock (skip_first);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1392 }
23703 6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1393
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1394 void interpreter::munlock (bool skip_first) const
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1395 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1396 m_evaluator.munlock (skip_first);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1397 }
27873 020d0e8f7ac6 reafactor mlock, munlock, and mislocked functions John W. Eaton <jwe@octave.org> parents: 27832 diff changeset	1398
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1399 bool interpreter::mislocked (bool skip_first) const
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1400 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1401 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	1402 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1403
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1404 void interpreter::munlock (const char *nm)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1405 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1406 if (! nm)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1407 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	1408
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1409 munlock (std::string (nm));
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1410 }
23703 6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1411
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1412 void interpreter::munlock (const std::string& nm)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1413 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1414 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	1415
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1416 if (val.is_defined ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1417 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1418 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	1419
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1420 if (fcn)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1421 fcn->unlock ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1422 }
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
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1425 bool interpreter::mislocked (const char *nm)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1426 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1427 if (! nm)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1428 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	1429
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1430 return mislocked (std::string (nm));
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1431 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1432
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1433 bool interpreter::mislocked (const std::string& nm)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1434 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1435 bool retval = false;
23703 6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1436
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1437 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	1438
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1439 if (val.is_defined ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1440 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1441 octave_function *fcn = val.function_value ();
27873 020d0e8f7ac6 reafactor mlock, munlock, and mislocked functions John W. Eaton <jwe@octave.org> parents: 27832 diff changeset	1442
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1443 if (fcn)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1444 retval = fcn->islocked ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1445 }
23703 6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1446
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1447 return retval;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1448 }
23703 6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1449
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1450 std::string interpreter::mfilename (const std::string& opt) const
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1451 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1452 return m_evaluator.mfilename (opt);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1453 }
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 octave_value_list interpreter::eval_string (const std::string& eval_str,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1456 bool silent, int& parse_status,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1457 int nargout)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1458 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1459 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	1460 }
23703 6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1461
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1462 octave_value interpreter::eval_string (const std::string& eval_str,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1463 bool silent, int& parse_status)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1464 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1465 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	1466 }
27015 4d9e1a832a55 move core of mfilename function to evaluator John W. Eaton <jwe@octave.org> parents: 27014 diff changeset	1467
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1468 octave_value_list interpreter::eval_string (const octave_value& arg,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1469 bool silent, int& parse_status,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1470 int nargout)
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 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	1473 }
26113 8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1474
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1475 octave_value_list interpreter::eval (const std::string& try_code,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1476 int nargout)
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 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	1479 }
26113 8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1480
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1481 octave_value_list interpreter::eval (const std::string& try_code,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1482 const std::string& catch_code,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1483 int nargout)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1484 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1485 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	1486 }
26113 8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1487
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1488 octave_value_list interpreter::evalin (const std::string& context,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1489 const std::string& try_code,
27019 6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	1490 int nargout)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1491 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1492 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	1493 }
27019 6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	1494
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1495 octave_value_list interpreter::evalin (const std::string& context,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1496 const std::string& try_code,
27019 6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	1497 const std::string& catch_code,
6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	1498 int nargout)
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1499 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1500 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	1501 }
27019 6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	1502
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1503 //! 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	1504 //! the list of result values.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1505 //!
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1506 //! @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	1507 //! @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	1508 //! @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	1509 //! @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	1510 //! 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	1511
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1512 octave_value_list interpreter::feval (const char *name,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1513 const octave_value_list& args,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1514 int nargout)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1515 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1516 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	1517 }
27018 a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	1518
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1519 octave_value_list interpreter::feval (const std::string& name,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1520 const octave_value_list& args,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1521 int nargout)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1522 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1523 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	1524
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1525 if (fcn.is_undefined ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1526 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	1527
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1528 octave_function *of = fcn.function_value ();
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1529
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1530 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	1531 }
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1532
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1533 octave_value_list interpreter::feval (octave_function *fcn,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1534 const octave_value_list& args,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1535 int nargout)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1536 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1537 if (fcn)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1538 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	1539
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1540 return octave_value_list ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1541 }
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1542
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1543 octave_value_list interpreter::feval (const octave_value& val,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1544 const octave_value_list& args,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1545 int nargout)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1546 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1547 // 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	1548 // 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	1549 // 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	1550 // 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	1551 // (for example, __ode15__).
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1552
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1553 if (val.is_undefined ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1554 return ovl ();
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1555
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1556 if (val.is_function ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1557 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1558 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	1559 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1560 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	1561 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1562 // 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	1563 // functions.
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1564
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1565 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	1566 arg_list.push_back (args);
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1567
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1568 // 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	1569 // 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	1570 // 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	1571 // 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	1572 // handling reference counting.
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1573
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1574 octave_value xval = val;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1575 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	1576 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1577 else if (val.is_string ())
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1578 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1579 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	1580 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1581 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1582 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	1583
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1584 return ovl ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1585 }
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1586
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1587 //! 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	1588 //! the list of result values.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1589 //!
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1590 //! @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	1591 //! 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	1592 //! 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	1593 //! passed to the function.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1594 //! @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	1595 //! @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	1596 //! necessarily the same as @c nargout.
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1597
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1598 octave_value_list interpreter::feval (const octave_value_list& args,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1599 int nargout)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1600 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1601 if (args.length () == 0)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1602 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	1603
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1604 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	1605
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1606 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	1607
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1608 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	1609 }
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1610
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1611 octave_value interpreter::make_function_handle (const std::string& name)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1612 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1613 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	1614 }
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1615
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1616 void interpreter::install_variable (const std::string& name,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1617 const octave_value& value, bool global)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1618 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1619 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	1620 }
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1621
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1622 octave_value interpreter::global_varval (const std::string& name) const
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1623 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1624 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	1625 }
28433 d05a4194f1ad move make_fcn_handle to tree_evaluator class John W. Eaton <jwe@octave.org> parents: 28427 diff changeset	1626
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1627 void interpreter::global_assign (const std::string& name,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1628 const octave_value& val)
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 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	1631 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1632
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1633 octave_value interpreter::top_level_varval (const std::string& name) const
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1634 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1635 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	1636 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1637
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1638 void interpreter::top_level_assign (const std::string& name,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1639 const octave_value& val)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1640 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1641 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	1642 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1643
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1644 bool interpreter::is_variable (const std::string& name) const
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1645 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1646 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	1647 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1648
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1649 bool interpreter::is_local_variable (const std::string& name) const
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 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	1652 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 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 interpreter::varval (const std::string& name) const
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 return m_evaluator.varval (name);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1657 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1658
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1659 void interpreter::assign (const std::string& name,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1660 const octave_value& val)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1661 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1662 m_evaluator.assign (name, val);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1663 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1664
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1665 void interpreter::assignin (const std::string& context,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1666 const std::string& name,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1667 const octave_value& val)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1668 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1669 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	1670 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1671
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1672 void interpreter::source_file (const std::string& file_name,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1673 const std::string& context, bool verbose,
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1674 bool require_file)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1675 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1676 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	1677 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1678
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1679 bool 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	1680 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1681 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	1682 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1683
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1684 bool interpreter::isglobal (const std::string& name) const
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1685 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1686 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	1687 }
27014 daab1b311a98 move core of assignin function to evaluator John W. Eaton <jwe@octave.org> parents: 26826 diff changeset	1688
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1689 octave_value interpreter::find (const std::string& name)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1690 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1691 return m_evaluator.find (name);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1692 }
27017 24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	1693
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1694 void interpreter::clear_all (bool force)
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 m_evaluator.clear_all (force);
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
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1699 void interpreter::clear_objects ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1700 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1701 m_evaluator.clear_objects ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1702 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1703
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1704 void interpreter::clear_variable (const std::string& name)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1705 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1706 m_evaluator.clear_variable (name);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1707 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1708
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1709 void interpreter::clear_variable_pattern (const std::string& pattern)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1710 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1711 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	1712 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1713
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1714 void interpreter::clear_variable_regexp (const std::string& pattern)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1715 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1716 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	1717 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1718
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1719 void interpreter::clear_variables ()
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 m_evaluator.clear_variables ();
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
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1724 void interpreter::clear_global_variable (const std::string& name)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1725 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1726 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	1727 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1728
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1729 void interpreter::clear_global_variable_pattern (const std::string& pattern)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1730 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1731 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	1732 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1733
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1734 void interpreter::clear_global_variable_regexp (const std::string& pattern)
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.clear_global_variable_regexp (pattern);
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
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1739 void interpreter::clear_global_variables ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1740 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1741 m_evaluator.clear_global_variables ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1742 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1743
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1744 void interpreter::clear_functions (bool force)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1745 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1746 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	1747 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1748
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1749 void interpreter::clear_function (const std::string& name)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1750 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1751 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	1752 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1753
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1754 void interpreter::clear_symbol (const std::string& name)
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 m_evaluator.clear_symbol (name);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1757 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1758
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1759 void interpreter::clear_function_pattern (const std::string& pat)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1760 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1761 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	1762 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1763
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1764 void interpreter::clear_function_regexp (const std::string& pat)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1765 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1766 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	1767 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1768
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1769 void interpreter::clear_symbol_pattern (const std::string& pat)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1770 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1771 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	1772 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1773
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1774 void interpreter::clear_symbol_regexp (const std::string& pat)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1775 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1776 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	1777 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1778
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1779 std::list<std::string> interpreter::global_variable_names ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1780 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1781 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	1782 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1783
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1784 std::list<std::string> 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	1785 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1786 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	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
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1789 std::list<std::string> interpreter::variable_names ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1790 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1791 return m_evaluator.variable_names ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1792 }
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1793
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1794 std::list<std::string> interpreter::user_function_names ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1795 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1796 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	1797 }
27594 e091e09d26f0 restore some symbol table functions for backward compatibility John W. Eaton <jwe@octave.org> parents: 27593 diff changeset	1798
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1799 std::list<std::string> interpreter::autoloaded_functions () const
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1800 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1801 return m_evaluator.autoloaded_functions ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1802 }
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 // 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	1805 // 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	1806
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1807 void interpreter::interrupt ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1808 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1809 static int sigint = 0;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1810 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	1811
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1812 if (first)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1813 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1814 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	1815 first = false;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1816 }
29292 eb1e10abe9d5 use method in interpreter class to interrupt interpreter execution in GUI John W. Eaton <jwe@octave.org> parents: 29281 diff changeset	1817
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1818 // 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	1819 // 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	1820 // 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	1821 // 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	1822 // 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	1823 // 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	1824 // 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	1825 // 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	1826 // 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	1827 // 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	1828
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1829 pid_t pid
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1830 = 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	1831
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1832 octave_kill_wrapper (pid, sigint);
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
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1835 void interpreter::pause ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1836 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1837 // 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	1838 // 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	1839
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1840 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	1841 m_evaluator.reset_debug_state ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1842 }
29306 0231189f630d provide interpreter methods for pausing, resuming, and stopping evaluation John W. Eaton <jwe@octave.org> parents: 29295 diff changeset	1843
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1844 void interpreter::stop ()
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 // 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	1847 // made thread safe.
29306 0231189f630d provide interpreter methods for pausing, resuming, and stopping evaluation John W. Eaton <jwe@octave.org> parents: 29295 diff changeset	1848
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1849 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	1850 m_evaluator.dbquit (true);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1851 else
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1852 interrupt ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1853 }
29306 0231189f630d provide interpreter methods for pausing, resuming, and stopping evaluation John W. Eaton <jwe@octave.org> parents: 29295 diff changeset	1854
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1855 void interpreter::resume ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1856 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1857 // 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	1858 // made thread safe.
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1859
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1860 // 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	1861 // 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	1862
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1863 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	1864 m_evaluator.dbcont ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1865 }
29306 0231189f630d provide interpreter methods for pausing, resuming, and stopping evaluation John W. Eaton <jwe@octave.org> parents: 29295 diff changeset	1866
31727 1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1867 octave_value interpreter::PS1 (const octave_value_list& args, int nargout)
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1868 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1869 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	1870 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1871
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1872 std::string 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	1873 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1874 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	1875 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1876
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1877 std::string interpreter::PS1 (const std::string& s)
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1878 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1879 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	1880 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1881
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1882 void interpreter::set_PS1 (const std::string& s)
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1883 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1884 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	1885 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1886
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1887 octave_value interpreter::PS2 (const octave_value_list& args, int nargout)
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1888 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1889 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	1890 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1891
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1892 std::string 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	1893 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1894 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	1895 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1896
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1897 std::string interpreter::PS2 (const std::string& s)
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1898 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1899 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	1900 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1901
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1902 void interpreter::set_PS2 (const std::string& s)
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1903 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1904 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	1905 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1906
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1907 octave_value interpreter::PS4 (const octave_value_list& args, int nargout)
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1908 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1909 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	1910 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1911
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1912 std::string 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	1913 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1914 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	1915 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1916
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1917 std::string interpreter::PS4 (const std::string& s)
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1918 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1919 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	1920 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1921
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1922 void interpreter::set_PS4 (const std::string& s)
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1923 {
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1924 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	1925 }
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	1926
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1927 // 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	1928 // old terminal widget.
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1929 bool 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	1930 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1931 if (! m_app_context)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1932 return false;
29306 0231189f630d provide interpreter methods for pausing, resuming, and stopping evaluation John W. Eaton <jwe@octave.org> parents: 29295 diff changeset	1933
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1934 // 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	1935 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	1936
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1937 return options.experimental_terminal_widget ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1938 }
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	1939
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1940 void interpreter::add_debug_watch_expression (const std::string& expr)
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 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	1943 }
29503 3bfec185c9e2 experimental command window widget with server loop John W. Eaton <jwe@octave.org> parents: 29501 diff changeset	1944
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1945 void interpreter::remove_debug_watch_expression (const std::string& expr)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1946 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1947 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	1948 }
29446 435fc29162c0 maintain a set of watch expressions for possible use in tracing/debugging John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1949
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1950 void 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	1951 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1952 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	1953 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1954
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1955 std::set<std::string> 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	1956 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1957 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	1958 }
29446 435fc29162c0 maintain a set of watch expressions for possible use in tracing/debugging John W. Eaton <jwe@octave.org> parents: 29359 diff changeset	1959
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1960 void interpreter::handle_exception (const execution_exception& ee)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1961 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1962 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	1963
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1964 // 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	1965 // 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	1966 // to an event manager function?
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1967 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	1968
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1969 recover_from_exception ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1970 }
27471 fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	1971
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1972 void interpreter::recover_from_exception ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1973 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1974 if (octave_interrupt_state)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1975 m_event_manager.interpreter_interrupted ();
27471 fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	1976
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1977 can_interrupt = true;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1978 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	1979 octave_signal_caught = false;
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1980 octave_restore_signal_mask ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1981 catch_interrupts ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1982 }
29293 8784f20b9b8c new interpreter_event to signal that interpreter was interrupted John W. Eaton <jwe@octave.org> parents: 29292 diff changeset	1983
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1984 void interpreter::mark_for_deletion (const std::string& file)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1985 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1986 m_tmp_files.insert (file);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1987 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1988
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	1989 void interpreter::cleanup_tmp_files ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1990 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1991 m_tmp_files.cleanup ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1992 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1993
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1994 void interpreter::quit (int exit_status, bool force, bool confirm)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1995 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1996 if (! force)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1997 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1998 try
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	1999 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2000 bool cancel = false;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	2001
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2002 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	2003 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2004 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	2005 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	2006
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2007 evalin ("base", "finish", 0);
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	2008
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2009 cancel = m_cancel_quit;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2010 }
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	2011
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2012 if (cancel)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2013 return;
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	2014
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2015 // Check for confirmation.
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	2016
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2017 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	2018 return;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2019 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2020 catch (const execution_exception&)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2021 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2022 // 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	2023 // 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	2024 // 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	2025 // 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	2026 // 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	2027 // called recursively from finish.m.
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	2028
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2029 throw;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2030 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2031 }
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	2032
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2033 throw exit_exception (exit_status);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2034 }
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	2035
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2036 void interpreter::add_atexit_fcn (const std::string& fname)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2037 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2038 if (m_executing_atexit)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2039 return;
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	2040
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2041 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	2042 }
27690 c81139d8dcc3 prevent atexit functions from adding new atexit functions John W. Eaton <jwe@octave.org> parents: 27689 diff changeset	2043
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2044 bool interpreter::remove_atexit_fcn (const std::string& fname)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2045 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2046 bool found = false;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	2047
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2048 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	2049 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	2050 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2051 if (*it == fname)
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_atexit_fcns.erase (it);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2054 found = true;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2055 break;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2056 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2057 }
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 return found;
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2060 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	2061
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2062 // 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	2063
31771 21f9b34eb893 maint: Eliminate "(void)" in C++ function prototypes/declarations. Rik <rik@octave.org> parents: 31731 diff changeset	2064 void interpreter::maximum_braindamage ()
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2065 {
31727 1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2066 PS1 (">> ");
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2067 PS2 ("");
1f04951057bf avoid some calls to get_input_system and get_evaluator John W. Eaton <jwe@octave.org> parents: 31706 diff changeset	2068 PS4 ("");
23723 ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	2069
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2070 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	2071 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	2072
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2073 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	2074
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2075 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	2076
31813 73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	2077 Fconfirm_recursive_rmdir (ovl (false));
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	2078 Foptimize_diagonal_matrix (ovl (false));
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	2079 Foptimize_permutation_matrix (ovl (false));
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	2080 Foptimize_range (ovl (false));
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	2081 Ffixed_point_format (ovl (true));
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	2082 Fprint_empty_dimensions (ovl (false));
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	2083 Fprint_struct_array_contents (ovl (true));
73fdf7f8381b maint: Use consistent coding style when calling Ffunction(). Rik <rik@octave.org> parents: 31771 diff changeset	2084 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	2085
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2086 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	2087 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	2088 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	2089 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	2090 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	2091 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	2092 }
25345 ce6f7a5cd68e avoid global access of load path in interpreter class John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	2093
31607 aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2094 void interpreter::execute_pkg_add (const std::string& dir)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2095 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2096 try
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2097 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2098 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	2099 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2100 catch (const interrupt_exception&)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2101 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2102 recover_from_exception ();
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2103 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2104 catch (const execution_exception& ee)
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2105 {
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2106 handle_exception (ee);
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2107 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros. Rik <rik@octave.org> parents: 31605 diff changeset	2108 }
29960 939bef0b66e0 merge "namespace octave" and OCTAVE_NAMESPACE_BEGIN/END blocks John W. Eaton <jwe@octave.org> parents: 29958 diff changeset	2109
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	2110 // 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	2111 // 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	2112 // 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	2113 // 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	2114
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2115 int interpreter::safe_source_file (const std::string& file_name,
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2116 const std::string& context,
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2117 bool verbose, bool 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	2118 {
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2119 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	2120 {
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2121 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	2122 }
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2123 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	2124 {
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2125 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	2126
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2127 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	2128 }
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2129 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	2130 {
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2131 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	2132
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2133 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	2134 }
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2135
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2136 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	2137 }
06bd4e4d4a92 make safe_source_file a private member function instead of a static function John W. Eaton <jwe@octave.org> parents: 31730 diff changeset	2138
31605 e88a07dec498 maint: Use macros to begin/end C++ namespaces. Rik <rik@octave.org> parents: 31593 diff changeset	2139 OCTAVE_END_NAMESPACE(octave)

Mercurial > octave

annotate libinterp/corefcn/interpreter.cc @ 31855:1daf8bfceac3