octave: libinterp/corefcn/interpreter.cc annotate

annotate libinterp/corefcn/interpreter.cc @ 25054:6652d3823428 stable

maint: Update copyright dates in all source files.

author	John W. Eaton <jwe@octave.org>
date	Fri, 30 Mar 2018 09:19:05 -0400
parents	7c88cf242111
children	a211e39e59d9

rev	line source
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1 /*
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	2
25054 6652d3823428 maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 24833 diff changeset	3 Copyright (C) 1993-2018 John W. Eaton
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	4
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	5 This file is part of Octave.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	6
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24520 diff changeset	7 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22718 diff changeset	8 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24520 diff changeset	9 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22718 diff changeset	10 (at your option) any later version.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	11
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22718 diff changeset	12 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22718 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22718 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22718 diff changeset	15 GNU General Public License for more details.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	16
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	17 You should have received a copy of the GNU General Public License
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	18 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 24520 diff changeset	19 <https://www.gnu.org/licenses/>.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	20
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	21 */
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	22
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	23 #if defined (HAVE_CONFIG_H)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	24 # include "config.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	25 #endif
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	26
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	27 #include <string>
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	28 #include <iostream>
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	29
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	30 #include "cmd-edit.h"
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	31 #include "cmd-hist.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	32 #include "file-ops.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	33 #include "file-stat.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	34 #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	35 #include "lo-blas-proto.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	36 #include "lo-error.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	37 #include "oct-env.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	38 #include "str-vec.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	39 #include "signal-wrappers.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	40 #include "unistd-wrappers.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	41
23711 5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	42 #include "builtin-defun-decls.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	43 #include "defaults.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	44 #include "Cell.h"
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23552 diff changeset	45 #include "call-stack.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	46 #include "defun.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	47 #include "display.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	48 #include "error.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	49 #include "file-io.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	50 #include "graphics.h"
23721 b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23719 diff changeset	51 #include "help.h"
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	52 #include "interpreter-private.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	53 #include "interpreter.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	54 #include "load-path.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	55 #include "load-save.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	56 #include "octave-link.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	57 #include "octave.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	58 #include "oct-hist.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	59 #include "oct-map.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	60 #include "oct-mutex.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	61 #include "ovl.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	62 #include "ov.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	63 #include "ov-classdef.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	64 #include "parse.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	65 #include "pt-eval.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	66 #include "pt-jump.h"
23127 5a91168a30be avoid including parse tree headers in other header files unnecessarily John W. Eaton <jwe@octave.org> parents: 23117 diff changeset	67 #include "pt-mat.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	68 #include "pt-stmt.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	69 #include "sighandlers.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	70 #include "sysdep.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	71 #include "unwind-prot.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	72 #include "utils.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	73 #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	74 #include "version.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	75
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	76 // TRUE means the quit() call is allowed.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	77 bool quit_allowed = true;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	78
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	79 // 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	80 // is ready for interactive use.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	81 bool octave_interpreter_ready = false;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	82
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	83 // TRUE means we've processed all the init code and we are good to go.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	84 bool octave_initialized = false;
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 DEFUN (__version_info__, args, ,
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	87 doc: /* -- texinfo --
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	88 @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	89 Undocumented internal function.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	90 @end deftypefn */)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	91 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	92 static octave_map vinfo;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	93
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	94 int nargin = args.length ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	95
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	96 if (nargin != 0 && nargin != 4)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	97 print_usage ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	98
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	99 octave_value retval;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	100
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	101 if (nargin == 0)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	102 retval = vinfo;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	103 else if (nargin == 4)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	104 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	105 if (vinfo.nfields () == 0)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	106 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	107 vinfo.assign ("Name", args(0));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	108 vinfo.assign ("Version", args(1));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	109 vinfo.assign ("Release", args(2));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	110 vinfo.assign ("Date", args(3));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	111 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	112 else
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	113 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	114 octave_idx_type n = vinfo.numel () + 1;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	115
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	116 vinfo.resize (dim_vector (n, 1));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	117
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	118 octave_value idx (n);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	119
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	120 vinfo.assign (idx, "Name", Cell (octave_value (args(0))));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	121 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	122 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	123 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	124 }
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
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	127 return retval;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	128 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	129
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	130 static void
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	131 initialize_version_info (void)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	132 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	133 octave_value_list args;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	134
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	135 args(3) = OCTAVE_RELEASE_DATE;
23717 06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23712 diff changeset	136 args(2) = octave::config::release ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	137 args(1) = OCTAVE_VERSION;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	138 args(0) = "GNU Octave";
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	139
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	140 F__version_info__ (args, 0);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	141 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	142
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	143 OCTAVE_NORETURN static void
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	144 lo_error_handler (const char *fmt, ...)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	145 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	146 va_list args;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	147 va_start (args, fmt);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	148 verror_with_cfn (fmt, args);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	149 va_end (args);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	150
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	151 octave_throw_execution_exception ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	152 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	153
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	154 OCTAVE_NORETURN static void
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	155 lo_error_with_id_handler (const char id, const char fmt, ...)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	156 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	157 va_list args;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	158 va_start (args, fmt);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	159 verror_with_id_cfn (id, fmt, args);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	160 va_end (args);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	161
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	162 octave_throw_execution_exception ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	163 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	164
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	165 static void
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	166 initialize_error_handlers ()
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	167 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	168 set_liboctave_error_handler (lo_error_handler);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	169 set_liboctave_error_with_id_handler (lo_error_with_id_handler);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	170 set_liboctave_warning_handler (warning);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	171 set_liboctave_warning_with_id_handler (warning_with_id);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	172 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	173
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	174 DEFUN (quit, args, ,
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	175 doc: /* -- texinfo --
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	176 @deftypefn {} {} exit
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	177 @deftypefnx {} {} exit (@var{status})
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	178 @deftypefnx {} {} quit
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	179 @deftypefnx {} {} quit (@var{status})
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	180 Exit the current Octave session.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	181
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	182 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	183 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	184
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	185 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	186 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	187 may be placed in that file. Alternatively, another m-file may be scheduled
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	188 to run using @code{atexit}.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	189 @seealso{atexit}
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	190 @end deftypefn */)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	191 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	192 // Confirm OK to shutdown. Note: A dynamic function installation similar
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	193 // to overriding polymorphism for which the GUI can install its own "quit"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	194 // yet call this base "quit" could be nice. No link would be needed here.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	195 if (! octave_link::confirm_shutdown ())
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	196 return ovl ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	197
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	198 if (! quit_allowed)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	199 error ("quit: not supported in embedded mode");
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	200
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	201 int exit_status = 0;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	202
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	203 if (args.length () > 0)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	204 exit_status = args(0).nint_value ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	205
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	206 // Instead of simply calling exit, we thrown an exception so that no
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	207 // matter where the call to quit occurs, we will run the
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	208 // unwind_protect stack, clear the OCTAVE_LOCAL_BUFFER allocations,
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	209 // etc. before exiting.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	210
23087 9f406f0b36da rework clean_up_and_exit (bug #50068) John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	211 throw octave::exit_exception (exit_status);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	212
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	213 return ovl ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	214 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	215
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	216 DEFALIAS (exit, quit);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	217
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	218 DEFUN (atexit, args, nargout,
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	219 doc: /* -- texinfo --
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	220 @deftypefn {} {} atexit (@var{fcn})
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	221 @deftypefnx {} {} atexit (@var{fcn}, @var{flag})
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	222 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	223
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	224 For example,
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	225
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	226 @example
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	227 @group
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	228 function last_words ()
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	229 disp ("Bye bye");
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	230 endfunction
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	231 atexit ("last_words");
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	232 @end group
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	233 @end example
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	234
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	235 @noindent
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	236 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	237
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	238 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	239 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	240 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	241 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	242 above,
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 @example
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	245 atexit ("last_words", false);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	246 @end example
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	247
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	248 @noindent
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	249 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	250 @code{last_words} when it exits.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	251
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	252 Note that @code{atexit} only removes the first occurrence of a function
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	253 from the list, so if a function was placed in the list multiple times with
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	254 @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	255 @seealso{quit}
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	256 @end deftypefn */)
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 int nargin = args.length ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	259
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	260 if (nargin < 1 \|\| nargin > 2)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	261 print_usage ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	262
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	263 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	264
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	265 bool add_mode = (nargin == 2)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	266 ? args(1).xbool_value ("atexit: FLAG argument must be a logical value")
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	267 : true;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	268
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	269 octave_value_list retval;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	270
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	271 if (add_mode)
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	272 octave::interpreter::add_atexit_function (arg);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	273 else
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	274 {
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	275 bool found = octave::interpreter::remove_atexit_function (arg);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	276
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	277 if (nargout > 0)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	278 retval = ovl (found);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	279 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	280
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	281 return retval;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	282 }
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 // Execute commands from a file and catch potential exceptions in a consistent
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	285 // way. This function should be called anywhere we might parse and execute
22173 8de49f15e182 doc: Fix "doubled words" typos (\b(\w+)\s+\1\b) Andreas Weber <andy.weber.aw@gmail.com> parents: 22133 diff changeset	286 // commands from a file before we have entered the main loop in
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	287 // toplev.cc.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	288
23087 9f406f0b36da rework clean_up_and_exit (bug #50068) John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	289 static int
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	290 safe_source_file (const std::string& file_name,
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	291 const std::string& context = "",
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	292 bool verbose = false, bool require_file = true,
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	293 const std::string& warn_for = "")
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 try
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	296 {
23075 4e3d47dc7e25 move parse tree classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 23060 diff changeset	297 octave::source_file (file_name, context, verbose, require_file, warn_for);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	298 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	299 catch (const octave::interrupt_exception&)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	300 {
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	301 octave::interpreter::recover_from_exception ();
23087 9f406f0b36da rework clean_up_and_exit (bug #50068) John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	302
9f406f0b36da rework clean_up_and_exit (bug #50068) John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	303 return 1;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	304 }
23537 94968aa621a8 show stack trace for errors in command line and startup files (bug #49346) John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	305 catch (const octave::execution_exception& e)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	306 {
23537 94968aa621a8 show stack trace for errors in command line and startup files (bug #49346) John W. Eaton <jwe@octave.org> parents: 23533 diff changeset	307 std::string stack_trace = e.info ();
23536 14b61de53028 show stack trace for errors in command line and startup files (bug #49346) John W. Eaton <jwe@octave.org> parents: 23219 diff changeset	308
14b61de53028 show stack trace for errors in command line and startup files (bug #49346) John W. Eaton <jwe@octave.org> parents: 23219 diff changeset	309 if (! stack_trace.empty ())
14b61de53028 show stack trace for errors in command line and startup files (bug #49346) John W. Eaton <jwe@octave.org> parents: 23219 diff changeset	310 std::cerr << stack_trace;
14b61de53028 show stack trace for errors in command line and startup files (bug #49346) John W. Eaton <jwe@octave.org> parents: 23219 diff changeset	311
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	312 octave::interpreter::recover_from_exception ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	313
23087 9f406f0b36da rework clean_up_and_exit (bug #50068) John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	314 return 1;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	315 }
23087 9f406f0b36da rework clean_up_and_exit (bug #50068) John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	316
9f406f0b36da rework clean_up_and_exit (bug #50068) John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	317 return 0;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	318 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	319
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	320 static void
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	321 execute_pkg_add (const std::string& dir)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	322 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	323 std::string file_name = octave::sys::file_ops::concat (dir, "PKG_ADD");
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	324
23445 8e310ef0fa97 move load_path class to octave namespace John W. Eaton <jwe@octave.org> parents: 23438 diff changeset	325 octave::load_path& lp = octave::__get_load_path__ ("execute_pkg_add");
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	326
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	327 try
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	328 {
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	329 lp.execute_pkg_add (dir);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	330 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	331 catch (const octave::interrupt_exception&)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	332 {
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	333 octave::interpreter::recover_from_exception ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	334 }
22327 d0562b3159c7 move more classes inside octave namespace John W. Eaton <jwe@octave.org> parents: 22323 diff changeset	335 catch (const octave::execution_exception&)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	336 {
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	337 octave::interpreter::recover_from_exception ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	338 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	339 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	340
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	341 namespace octave
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	342 {
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	343 // Create an interpreter object and perform initialization up to the
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	344 // point of setting reading command history and setting the load
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	345 // path.
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22186 diff changeset	346
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	347 interpreter::interpreter (application *app_context)
23627 0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	348 : m_app_context (app_context),
23719 69a111259a2c eliminate some global variables John W. Eaton <jwe@octave.org> parents: 23717 diff changeset	349 m_environment (),
23721 b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23719 diff changeset	350 m_help_system (*this),
23627 0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	351 m_dynamic_loader (*this),
0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	352 m_load_path (),
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24538 diff changeset	353 m_type_info (),
23627 0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	354 m_symbol_table (),
23630 8a47d4735655 avoid memory leak in interpreter John W. Eaton <jwe@octave.org> parents: 23627 diff changeset	355 m_evaluator (*this),
24738 3695c2cd69b8 don't use singleton pattern for bp_table John W. Eaton <jwe@octave.org> parents: 24734 diff changeset	356 m_bp_table (),
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	357 m_stream_list (*this),
24734 5d8c4cbc56d7 don't use singleton pattern for child_list John W. Eaton <jwe@octave.org> parents: 24727 diff changeset	358 m_child_list (),
23742 1f0daaf81955 don't use singleton for ch_manager, rename to url_handle_manager John W. Eaton <jwe@octave.org> parents: 23738 diff changeset	359 m_url_handle_manager (),
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23630 diff changeset	360 m_cdef_manager (*this),
23774 41795b504a8b don't use singleton for gtk_manager John W. Eaton <jwe@octave.org> parents: 23753 diff changeset	361 m_gtk_manager (),
23627 0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	362 m_interactive (false),
0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	363 m_read_site_files (true),
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23775 diff changeset	364 m_read_init_files (m_app_context != nullptr),
23627 0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	365 m_verbose (false),
0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	366 m_inhibit_startup_message (false),
0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	367 m_load_path_initialized (false),
0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	368 m_history_initialized (false),
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23552 diff changeset	369 m_initialized (false)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	370 {
24538 2b273df71aa0 allow experimenting with thread_local storage John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	371 // FIXME: When thread_local storage is used by default, this message
2b273df71aa0 allow experimenting with thread_local storage John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	372 // should change to say something like
2b273df71aa0 allow experimenting with thread_local storage John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	373 //
2b273df71aa0 allow experimenting with thread_local storage John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	374 // only one Octave interpreter may be active in any given thread
2b273df71aa0 allow experimenting with thread_local storage John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	375
23511 232c8d69d934 manage interpreter instance in interpreter object John W. Eaton <jwe@octave.org> parents: 23466 diff changeset	376 if (instance)
232c8d69d934 manage interpreter instance in interpreter object John W. Eaton <jwe@octave.org> parents: 23466 diff changeset	377 throw std::runtime_error
24538 2b273df71aa0 allow experimenting with thread_local storage John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	378 ("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	379
23511 232c8d69d934 manage interpreter instance in interpreter object John W. Eaton <jwe@octave.org> parents: 23466 diff changeset	380 instance = this;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	381
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	382 // Matlab uses "C" locale for LC_NUMERIC class regardless of local setting
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	383 setlocale (LC_NUMERIC, "C");
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	384 setlocale (LC_TIME, "C");
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	385 sys::env::putenv ("LC_NUMERIC", "C");
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	386 sys::env::putenv ("LC_TIME", "C");
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	387
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	388 // Initialize the default floating point unit control state.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	389 octave_set_default_fpucw ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	390
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	391 thread::init ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	392
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	393 set_default_prompts ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	394
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	395 // Initialize default warning state before --traditional option
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	396 // that may reset them.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	397
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	398 initialize_default_warning_state ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	399
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	400 octave_ieee_init ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	401
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	402 octave_prepare_hdf5 ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	403
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	404 // The idea here is to force xerbla to be referenced so that we will link to
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	405 // our own version instead of the one provided by the BLAS library. But
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	406 // numeric_limits<double>::NaN () should never be -1, so we
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	407 // should never actually call xerbla. FIXME (again!): If this
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	408 // becomes a constant expression the test might be optimized away and
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	409 // then the reference to the function might also disappear.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	410
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	411 if (numeric_limits<double>::NaN () == -1)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	412 F77_FUNC (xerbla, XERBLA) ("octave", 13 F77_CHAR_ARG_LEN (6));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	413
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	414 initialize_error_handlers ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	415
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	416 if (m_app_context)
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	417 install_signal_handlers ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	418 else
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	419 quit_allowed = false;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	420
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	421 bool line_editing = false;
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	422 bool traditional = false;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	423
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	424 if (m_app_context)
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	425 {
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	426 // Embedded interpeters don't execute command line options.
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	427 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	428
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	429 // Make all command-line arguments available to startup files,
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	430 // including PKG_ADD files.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	431
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	432 string_vector args = options.all_args ();
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	433
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	434 m_app_context->intern_argv (args);
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	435 intern_nargin (args.numel () - 1);
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	436
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	437 bool is_octave_program = m_app_context->is_octave_program ();
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	438
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	439 std::list<std::string> command_line_path = options.command_line_path ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	440
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	441 for (const auto& pth : command_line_path)
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	442 m_load_path.set_command_line_path (pth);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	443
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	444 std::string exec_path = options.exec_path ();
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	445 if (! exec_path.empty ())
23719 69a111259a2c eliminate some global variables John W. Eaton <jwe@octave.org> parents: 23717 diff changeset	446 m_environment.exec_path (exec_path);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	447
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	448 std::string image_path = options.image_path ();
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	449 if (! image_path.empty ())
23719 69a111259a2c eliminate some global variables John W. Eaton <jwe@octave.org> parents: 23717 diff changeset	450 m_environment.image_path (image_path);
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	451
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	452 if (options.no_window_system ())
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	453 display_info::no_window_system ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	454
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	455 // Is input coming from a terminal? If so, we are probably
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	456 // interactive.
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	457
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	458 // If stdin is not a tty, then we are reading commands from a
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	459 // pipe or a redirected file.
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	460 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	461
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	462 m_interactive = (! is_octave_program && stdin_is_tty
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	463 && octave_isatty_wrapper (fileno (stdout)));
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	464
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	465 // Check if the user forced an interactive session.
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	466 if (options.forced_interactive ())
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	467 m_interactive = true;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	468
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	469 line_editing = options.line_editing ();
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	470 if ((! m_interactive \|\| options.forced_interactive ())
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	471 && ! options.forced_line_editing ())
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	472 line_editing = false;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	473
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	474 traditional = options.traditional ();
23711 5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	475
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	476 // FIXME: if possible, perform the following actions directly
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	477 // instead of using the interpreter-level functions.
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	478
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	479 if (options.echo_commands ())
23723 ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	480 m_evaluator.echo
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	481 (tree_evaluator::ECHO_SCRIPTS \| tree_evaluator::ECHO_FUNCTIONS);
23711 5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	482
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	483 std::string docstrings_file = options.docstrings_file ();
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	484 if (! docstrings_file.empty ())
23721 b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23719 diff changeset	485 Fbuilt_in_docstrings_file (*this, octave_value (docstrings_file));
23711 5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	486
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	487 std::string doc_cache_file = options.doc_cache_file ();
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	488 if (! doc_cache_file.empty ())
23721 b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23719 diff changeset	489 Fdoc_cache_file (*this, octave_value (doc_cache_file));
23711 5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	490
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	491 std::string info_file = options.info_file ();
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	492 if (! info_file.empty ())
23721 b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23719 diff changeset	493 Finfo_file (*this, octave_value (info_file));
23711 5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	494
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	495 std::string info_program = options.info_program ();
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	496 if (! info_program.empty ())
23721 b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23719 diff changeset	497 Finfo_program (*this, octave_value (info_program));
23711 5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	498
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	499 if (options.debug_jit ())
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	500 Fdebug_jit (octave_value (true));
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	501
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	502 if (options.jit_compiler ())
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	503 Fjit_enable (octave_value (true));
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	504
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	505 std::string texi_macros_file = options.texi_macros_file ();
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	506 if (! texi_macros_file.empty ())
23721 b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23719 diff changeset	507 Ftexi_macros_file (*this, octave_value (texi_macros_file));
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	508 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	509
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	510 // Force default line editor if we don't want readline editing.
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	511 if (line_editing)
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	512 initialize_command_input ();
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	513 else
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	514 command_editor::force_default_editor ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	515
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	516 // These can come after command line args since none of them set any
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	517 // defaults that might be changed by command line options.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	518
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	519 initialize_version_info ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	520
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	521 // This should be done before initializing the load path because
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	522 // 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	523
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	524 if (traditional)
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	525 maximum_braindamage ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	526
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	527 octave_interpreter_ready = true;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	528 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	529
24538 2b273df71aa0 allow experimenting with thread_local storage John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	530 OCTAVE_THREAD_LOCAL interpreter *interpreter::instance = nullptr;
23511 232c8d69d934 manage interpreter instance in interpreter object John W. Eaton <jwe@octave.org> parents: 23466 diff changeset	531
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22186 diff changeset	532 interpreter::~interpreter (void)
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22186 diff changeset	533 {
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	534 cleanup ();
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	535 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22186 diff changeset	536
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	537 void interpreter::intern_nargin (octave_idx_type nargs)
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	538 {
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23609 diff changeset	539 // FIXME: should this explicitly be top_scope?
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	540 symbol_scope scope = m_symbol_table.current_scope ();
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23609 diff changeset	541
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23609 diff changeset	542 if (scope)
91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23609 diff changeset	543 {
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	544 scope.assign (".nargin.", nargs);
8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	545 scope.mark_hidden (".nargin.");
23611 91c8f006ed8b remove additional functions from symbol_table class John W. Eaton <jwe@octave.org> parents: 23609 diff changeset	546 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22186 diff changeset	547 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22186 diff changeset	548
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	549 // Read the history file unless a command-line option inhibits that.
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	550
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	551 void interpreter::initialize_history (bool read_history_file)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	552 {
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	553 if (! m_history_initialized)
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	554 {
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	555 // Allow command-line option to override.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	556
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	557 if (m_app_context)
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	558 {
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	559 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	560
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	561 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	562
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	563 if (! read_history_file)
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	564 command_history::ignore_entries ();
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	565 }
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	566
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	567 ::initialize_history (read_history_file);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	568
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	569 if (! m_app_context)
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	570 command_history::ignore_entries ();
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	571
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	572 m_history_initialized = true;
23092 0fed4c678795 additional restructuring of startup and shutdown John W. Eaton <jwe@octave.org> parents: 23087 diff changeset	573 }
0fed4c678795 additional restructuring of startup and shutdown John W. Eaton <jwe@octave.org> parents: 23087 diff changeset	574 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	575
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	576 // Set the initial path to the system default unless command-line
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	577 // option says to leave it empty.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	578
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	579 void interpreter::initialize_load_path (bool set_initial_path)
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	580 {
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	581 if (! m_load_path_initialized)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	582 {
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	583 // Allow command-line option to override.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	584
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	585 if (m_app_context)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	586 {
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	587 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	588
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	589 set_initial_path = options.set_initial_path ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	590 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	591
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	592 // Temporarily set the execute_pkg_add function to one that
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	593 // catches exceptions. This is better than wrapping
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	594 // load_path::initialize in a try-catch block because it will
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	595 // not stop executing PKG_ADD files at the first exception.
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	596 // It's also better than changing the default execute_pkg_add
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	597 // function to use safe_source file because that will normally
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	598 // be evaluated from the normal intepreter loop where exceptions
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	599 // are already handled.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	600
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	601 unwind_protect frame;
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	602
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	603 frame.add_method (m_load_path, &load_path::set_add_hook,
d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	604 m_load_path.get_add_hook ());
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	605
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	606 m_load_path.set_add_hook (execute_pkg_add);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	607
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	608 m_load_path.initialize (set_initial_path);
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	609
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	610 m_load_path_initialized = true;
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	611 }
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	612 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	613
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	614 // This may be called separately from execute
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	615
23819 5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	616 void interpreter::initialize (void)
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	617 {
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	618 if (m_initialized)
23819 5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	619 return;
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	620
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	621 display_startup_message ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	622
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	623 // Wait to read the history file until the interpreter reads input
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	624 // files and begins evaluating commands.
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	625
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	626 initialize_history ();
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	627
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	628 // Initializing the load path may execute PKG_ADD files, so can't be
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	629 // done until the interpreter is ready to execute commands.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	630
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	631 // Deferring it to the execute step also allows the path to be
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	632 // initialized between creating and execute the interpreter, for
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	633 // example, to set a custom path for an embedded interpreter.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	634
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	635 initialize_load_path ();
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	636
23819 5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	637 m_initialized = true;
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	638 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	639
23819 5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	640 // FIXME: this function is intended to be executed only once. Should
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	641 // we enforce that restriction?
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	642
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	643 int interpreter::execute (void)
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	644 {
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	645 try
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	646 {
23819 5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	647 initialize ();
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	648
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	649 // We ignore errors in startup files.
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	650
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	651 execute_startup_files ();
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	652
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	653 int exit_status = 0;
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	654
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	655 if (m_app_context)
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	656 {
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	657 const cmdline_options& options = m_app_context->options ();
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	658
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	659 if (m_app_context->have_eval_option_code ())
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	660 {
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	661 int status = execute_eval_option_code ();
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	662
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	663 if (status )
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	664 exit_status = status;
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	665
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	666 if (! options.persist ())
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	667 return exit_status;
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	668 }
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	669
23819 5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	670 // If there is an extra argument, see if it names a file to
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	671 // read. Additional arguments are taken as command line options
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	672 // for the script.
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	673
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	674 if (m_app_context->have_script_file ())
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	675 {
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	676 int status = execute_command_line_file ();
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	677
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	678 if (status)
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	679 exit_status = status;
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	680
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	681 if (! options.persist ())
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	682 return exit_status;
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	683 }
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	684
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	685 if (options.forced_interactive ())
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	686 command_editor::blink_matching_paren (false);
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	687 }
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	688
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	689 // Avoid counting commands executed from startup or script files.
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	690
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	691 command_editor::reset_current_command_number (1);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	692
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	693 return main_loop ();
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	694 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	695 catch (const exit_exception& ex)
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	696 {
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	697 return ex.exit_status ();
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	698 }
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	699 }
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	700
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	701 void interpreter::display_startup_message (void) const
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	702 {
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	703 bool inhibit_startup_message = false;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	704
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	705 if (m_app_context)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	706 {
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	707 const cmdline_options& options = m_app_context->options ();
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	708
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	709 inhibit_startup_message = options.inhibit_startup_message ();
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	710 }
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	711
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	712 if (m_interactive && ! inhibit_startup_message)
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	713 std::cout << octave_startup_message () << "\n" << std::endl;
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	714 }
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	715
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	716 // Initialize by reading startup files. Return non-zero if an exception
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	717 // occurs when reading any of them, but don't exit early because of an
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	718 // exception.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	719
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	720 int interpreter::execute_startup_files (void) const
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	721 {
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	722 bool read_site_files = m_read_site_files;
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	723 bool read_init_files = m_read_init_files;
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	724 bool verbose = m_verbose;
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	725 bool inhibit_startup_message = m_inhibit_startup_message;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	726
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	727 if (m_app_context)
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	728 {
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	729 const cmdline_options& options = m_app_context->options ();
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	730
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	731 read_site_files = options.read_site_files ();
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	732 read_init_files = options.read_init_files ();
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	733 verbose = options.verbose_flag ();
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	734 inhibit_startup_message = options.inhibit_startup_message ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	735 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	736
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	737 verbose = (verbose && ! inhibit_startup_message);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	738
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	739 bool require_file = false;
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	740
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	741 std::string context;
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	742
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	743 int exit_status = 0;
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	744
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	745 if (read_site_files)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	746 {
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	747 // Execute commands from the site-wide configuration file.
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	748 // First from the file $(prefix)/lib/octave/site/m/octaverc
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	749 // (if it exists), then from the file
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	750 // $(prefix)/share/octave/$(version)/m/octaverc (if it exists).
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	751
23717 06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23712 diff changeset	752 int status = safe_source_file (config::local_site_defaults_file (),
06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23712 diff changeset	753 context, verbose, require_file);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	754
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	755 if (status)
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	756 exit_status = status;
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	757
23717 06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23712 diff changeset	758 status = safe_source_file (config::site_defaults_file (),
06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23712 diff changeset	759 context, verbose, require_file);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	760
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	761 if (status)
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	762 exit_status = status;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	763 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	764
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	765 if (read_init_files)
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	766 {
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	767 // Try to execute commands from $HOME/$OCTAVE_INITFILE and
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	768 // $OCTAVE_INITFILE. If $OCTAVE_INITFILE is not set,
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	769 // .octaverc is assumed.
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	770
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	771 bool home_rc_already_executed = false;
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	772
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	773 std::string initfile = sys::env::getenv ("OCTAVE_INITFILE");
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	774
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	775 if (initfile.empty ())
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	776 initfile = ".octaverc";
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	777
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	778 std::string home_dir = sys::env::get_home_directory ();
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	779
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	780 std::string home_rc = sys::env::make_absolute (initfile, home_dir);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	781
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	782 std::string local_rc;
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	783
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	784 if (! home_rc.empty ())
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	785 {
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	786 int status = safe_source_file (home_rc, context, verbose,
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	787 require_file);
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	788
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	789 if (status)
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	790 exit_status = status;
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	791
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	792 // Names alone are not enough.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	793
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	794 sys::file_stat fs_home_rc (home_rc);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	795
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	796 if (fs_home_rc)
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	797 {
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	798 // We want to check for curr_dir after executing home_rc
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	799 // because doing that may change the working directory.
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	800
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	801 local_rc = sys::env::make_absolute (initfile);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	802
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	803 home_rc_already_executed = same_file (home_rc, local_rc);
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	804 }
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	805 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	806
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	807 if (! home_rc_already_executed)
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	808 {
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	809 if (local_rc.empty ())
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	810 local_rc = sys::env::make_absolute (initfile);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	811
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	812 int status = safe_source_file (local_rc, context, verbose,
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	813 require_file);
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	814
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	815 if (status)
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	816 exit_status = status;
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	817 }
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	818 }
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	819
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	820 if (m_interactive && verbose)
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	821 std::cout << std::endl;
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	822
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	823 return exit_status;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	824 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	825
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	826 // Execute any code specified with --eval 'CODE'
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	827
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	828 int interpreter::execute_eval_option_code (void)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	829 {
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	830 const cmdline_options& options = m_app_context->options ();
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	831
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	832 std::string code_to_eval = options.code_to_eval ();
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	833
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	834 unwind_protect frame;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	835
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	836 octave_save_signal_mask ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	837
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	838 can_interrupt = true;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	839
24520 c5c11b07598a refactor signal handling (bug #52757) John W. Eaton <jwe@octave.org> parents: 24361 diff changeset	840 octave_signal_hook = respond_to_pending_signals;
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23775 diff changeset	841 octave_interrupt_hook = nullptr;
980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23775 diff changeset	842 octave_bad_alloc_hook = nullptr;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	843
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	844 catch_interrupts ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	845
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	846 octave_initialized = true;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	847
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	848 frame.add_method (this, &interpreter::interactive, m_interactive);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	849
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	850 m_interactive = false;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	851
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	852 int parse_status = 0;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	853
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	854 try
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	855 {
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	856 eval_string (code_to_eval, false, parse_status, 0);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	857 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	858 catch (const interrupt_exception&)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	859 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	860 recover_from_exception ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	861
23087 9f406f0b36da rework clean_up_and_exit (bug #50068) John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	862 return 1;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	863 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	864 catch (const execution_exception&)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	865 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	866 recover_from_exception ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	867
23087 9f406f0b36da rework clean_up_and_exit (bug #50068) John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	868 return 1;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	869 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	870
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	871 return parse_status;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	872 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	873
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	874 int interpreter::execute_command_line_file (void)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	875 {
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	876 const cmdline_options& options = m_app_context->options ();
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	877
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	878 unwind_protect frame;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	879
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	880 octave_save_signal_mask ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	881
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	882 can_interrupt = true;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	883
24520 c5c11b07598a refactor signal handling (bug #52757) John W. Eaton <jwe@octave.org> parents: 24361 diff changeset	884 octave_signal_hook = respond_to_pending_signals;
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23775 diff changeset	885 octave_interrupt_hook = nullptr;
980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23775 diff changeset	886 octave_bad_alloc_hook = nullptr;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	887
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	888 catch_interrupts ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	889
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	890 octave_initialized = true;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	891
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	892 frame.add_method (this, &interpreter::interactive, m_interactive);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	893
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	894 string_vector args = options.all_args ();
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	895
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	896 frame.add_method (m_app_context, &application::intern_argv, args);
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	897
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	898 frame.add_method (this, &interpreter::intern_nargin, args.numel () - 1);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	899
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	900 frame.add_method (m_app_context,
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	901 &application::program_invocation_name,
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	902 application::program_invocation_name ());
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	903
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	904 frame.add_method (m_app_context,
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	905 &application::program_name,
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	906 application::program_name ());
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	907
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	908 m_interactive = false;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	909
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	910 // If we are running an executable script (#! /bin/octave) then
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	911 // we should only see the args passed to the script.
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	912
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	913 string_vector script_args = options.remaining_args ();
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	914
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	915 m_app_context->intern_argv (script_args);
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	916 intern_nargin (script_args.numel () - 1);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	917
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	918 std::string fname = script_args[0];
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	919
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	920 m_app_context->set_program_names (fname);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	921
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	922 std::string context;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	923 bool verbose = false;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	924 bool require_file = true;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	925
23087 9f406f0b36da rework clean_up_and_exit (bug #50068) John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	926 return safe_source_file (fname, context, verbose, require_file, "octave");
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	927 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	928
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	929 int interpreter::main_loop (void)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	930 {
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	931 if (! m_app_context)
23104 2805cc365a86 fix thinko in previous change John W. Eaton <jwe@octave.org> parents: 23102 diff changeset	932 return 0;
2805cc365a86 fix thinko in previous change John W. Eaton <jwe@octave.org> parents: 23102 diff changeset	933
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	934 octave_save_signal_mask ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	935
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	936 can_interrupt = true;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	937
24520 c5c11b07598a refactor signal handling (bug #52757) John W. Eaton <jwe@octave.org> parents: 24361 diff changeset	938 octave_signal_hook = respond_to_pending_signals;
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23775 diff changeset	939 octave_interrupt_hook = nullptr;
980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23775 diff changeset	940 octave_bad_alloc_hook = nullptr;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	941
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	942 catch_interrupts ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	943
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	944 octave_initialized = true;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	945
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	946 // The big loop.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	947
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	948 lexer *lxr = (application::interactive ()
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	949 ? new lexer ()
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	950 : new lexer (stdin));
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	951
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	952 parser parser (*lxr);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	953
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	954 int retval = 0;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	955 do
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	956 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	957 try
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	958 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	959 reset_error_handler ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	960
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	961 parser.reset ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	962
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	963 if (m_symbol_table.at_top_level ())
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	964 tree_evaluator::reset_debug_state ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	965
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	966 retval = parser.run ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	967
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	968 if (retval == 0)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	969 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23651 diff changeset	970 if (parser.m_stmt_list)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	971 {
23694 4a62da62af09 use m_ prefix for member variables in parser John W. Eaton <jwe@octave.org> parents: 23651 diff changeset	972 parser.m_stmt_list->accept (m_evaluator);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	973
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	974 octave_quit ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	975
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	976 if (! application::interactive ())
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	977 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	978 bool quit = (tree_return_command::returning
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	979 \|\| tree_break_command::breaking);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	980
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	981 if (tree_return_command::returning)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	982 tree_return_command::returning = 0;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	983
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	984 if (tree_break_command::breaking)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	985 tree_break_command::breaking--;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	986
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	987 if (quit)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	988 break;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	989 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	990
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	991 if (octave_completion_matches_called)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	992 octave_completion_matches_called = false;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	993 else
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	994 command_editor::increment_current_command_number ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	995 }
24833 7c88cf242111 use m_ prefix for data members in more classes John W. Eaton <jwe@octave.org> parents: 24738 diff changeset	996 else if (parser.m_lexer.m_end_of_input)
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	997 {
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	998 retval = EOF;
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	999 break;
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	1000 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1001 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1002 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1003 catch (const interrupt_exception&)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1004 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1005 recover_from_exception ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1006
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1007 // Required newline when the user does Ctrl+C at the prompt.
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1008 if (application::interactive ())
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1009 octave_stdout << "\n";
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1010 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1011 catch (const index_exception& e)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1012 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1013 recover_from_exception ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1014
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1015 std::cerr << "error: unhandled index exception: "
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1016 << e.message () << " -- trying to return to prompt"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1017 << std::endl;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1018 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1019 catch (const execution_exception& e)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1020 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1021 std::string stack_trace = e.info ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1022
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1023 if (! stack_trace.empty ())
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1024 std::cerr << stack_trace;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1025
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1026 if (application::interactive ())
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1027 recover_from_exception ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1028 else
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1029 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1030 // We should exit with a nonzero status.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1031 retval = 1;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1032 break;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1033 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1034 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1035 catch (const std::bad_alloc&)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1036 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1037 recover_from_exception ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1038
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1039 std::cerr << "error: out of memory -- trying to return to prompt"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1040 << std::endl;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1041 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1042
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1043 #if defined (DBSTOP_NANINF)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1044 if (Vdebug_on_naninf)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1045 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1046 if (setjump (naninf_jump) != 0)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1047 debug_or_throw_exception (true); // true = stack trace
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1048 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1049 #endif
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1050 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1051 while (retval == 0);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1052
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1053 if (retval == EOF)
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	1054 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1055 if (application::interactive ())
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	1056 octave_stdout << "\n";
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1057
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	1058 retval = 0;
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	1059 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1060
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1061 return retval;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1062 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1063
23106 1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1064 // Call a function with exceptions handled to avoid problems with
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1065 // errors while shutting down.
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1066
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1067 #define OCTAVE_IGNORE_EXCEPTION(E) \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1068 catch (E) \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1069 { \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1070 recover_from_exception (); \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1071 \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1072 std::cerr << "error: ignoring " #E " while preparing to exit" \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1073 << std::endl; \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1074 }
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1075
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1076 #define OCTAVE_SAFE_CALL(F, ARGS) \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1077 do \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1078 { \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1079 try \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1080 { \
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1081 unwind_protect frame; \
23106 1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1082 \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1083 frame.protect_var (Vdebug_on_error); \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1084 frame.protect_var (Vdebug_on_warning); \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1085 \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1086 Vdebug_on_error = false; \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1087 Vdebug_on_warning = false; \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1088 \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1089 F ARGS; \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1090 } \
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1091 OCTAVE_IGNORE_EXCEPTION (const exit_exception&) \
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1092 OCTAVE_IGNORE_EXCEPTION (const interrupt_exception&) \
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1093 OCTAVE_IGNORE_EXCEPTION (const execution_exception&) \
23106 1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1094 OCTAVE_IGNORE_EXCEPTION (const std::bad_alloc&) \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1095 } \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1096 while (0)
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1097
23087 9f406f0b36da rework clean_up_and_exit (bug #50068) John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	1098 void interpreter::cleanup (void)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1099 {
23092 0fed4c678795 additional restructuring of startup and shutdown John W. Eaton <jwe@octave.org> parents: 23087 diff changeset	1100 // If we are attached to a GUI, process pending events and
0fed4c678795 additional restructuring of startup and shutdown John W. Eaton <jwe@octave.org> parents: 23087 diff changeset	1101 // disconnect the link.
0fed4c678795 additional restructuring of startup and shutdown John W. Eaton <jwe@octave.org> parents: 23087 diff changeset	1102
0fed4c678795 additional restructuring of startup and shutdown John W. Eaton <jwe@octave.org> parents: 23087 diff changeset	1103 octave_link::process_events (true);
0fed4c678795 additional restructuring of startup and shutdown John W. Eaton <jwe@octave.org> parents: 23087 diff changeset	1104 octave_link::disconnect_link ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1105
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1106 OCTAVE_SAFE_CALL (remove_input_event_hook_functions, ());
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1107
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1108 while (! atexit_functions.empty ())
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1109 {
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1110 std::string fcn = atexit_functions.front ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1111
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1112 atexit_functions.pop_front ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1113
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1114 OCTAVE_SAFE_CALL (reset_error_handler, ());
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1115
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1116 OCTAVE_SAFE_CALL (feval, (fcn, octave_value_list (), 0));
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1117
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1118 OCTAVE_SAFE_CALL (flush_stdout, ());
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1119 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1120
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1121 // Do this explicitly so that destructors for mex file objects
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1122 // are called, so that functions registered with mexAtExit are
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1123 // called.
23699 b29904962d2d deprecate some global functions that access the symbol table John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	1124 OCTAVE_SAFE_CALL (m_symbol_table.clear_mex_functions, ());
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1125
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1126 OCTAVE_SAFE_CALL (command_editor::restore_terminal_state, ());
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1127
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1128 OCTAVE_SAFE_CALL (octave_history_write_timestamp, ());
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1129
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1130 if (! command_history::ignoring_entries ())
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1131 OCTAVE_SAFE_CALL (command_history::clean_up_and_save, ());
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1132
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1133 OCTAVE_SAFE_CALL (gh_manager::close_all_figures, ());
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1134
23774 41795b504a8b don't use singleton for gtk_manager John W. Eaton <jwe@octave.org> parents: 23753 diff changeset	1135 m_gtk_manager.unload_all_toolkits ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1136
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1137 OCTAVE_SAFE_CALL (cleanup_tmp_files, ());
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1138
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	1139 // FIXME: May still need something like this to ensure that
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	1140 // destructors for class objects will run properly. Should that be
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	1141 // done earlier? Before or after atexit functions are executed?
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	1142 m_symbol_table.cleanup ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1143
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1144 OCTAVE_SAFE_CALL (sysdep_cleanup, ());
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1145
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1146 OCTAVE_SAFE_CALL (octave_finalize_hdf5, ());
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1147
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1148 OCTAVE_SAFE_CALL (flush_stdout, ());
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1149
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1150 // Don't call singleton_cleanup_list::cleanup until we have the
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1151 // problems with registering/unregistering types worked out. For
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1152 // example, uncomment the following line, then use the make_int
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1153 // function from the examples directory to create an integer
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1154 // object and then exit Octave. Octave should crash with a
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1155 // segfault when cleaning up the typinfo singleton. We need some
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1156 // way to force new octave_value_X types that are created in
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1157 // .oct files to be unregistered when the .oct file shared library
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1158 // is unloaded.
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1159 //
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1160 // OCTAVE_SAFE_CALL (singleton_cleanup_list::cleanup, ());
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1161 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1162
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23511 diff changeset	1163 tree_evaluator& interpreter::get_evaluator (void)
084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23511 diff changeset	1164 {
23630 8a47d4735655 avoid memory leak in interpreter John W. Eaton <jwe@octave.org> parents: 23627 diff changeset	1165 return m_evaluator;
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23511 diff changeset	1166 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1167
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	1168 stream_list& interpreter::get_stream_list (void)
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	1169 {
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	1170 return m_stream_list;
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	1171 }
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	1172
23742 1f0daaf81955 don't use singleton for ch_manager, rename to url_handle_manager John W. Eaton <jwe@octave.org> parents: 23738 diff changeset	1173 url_handle_manager& interpreter::get_url_handle_manager (void)
1f0daaf81955 don't use singleton for ch_manager, rename to url_handle_manager John W. Eaton <jwe@octave.org> parents: 23738 diff changeset	1174 {
1f0daaf81955 don't use singleton for ch_manager, rename to url_handle_manager John W. Eaton <jwe@octave.org> parents: 23738 diff changeset	1175 return m_url_handle_manager;
1f0daaf81955 don't use singleton for ch_manager, rename to url_handle_manager John W. Eaton <jwe@octave.org> parents: 23738 diff changeset	1176 }
1f0daaf81955 don't use singleton for ch_manager, rename to url_handle_manager John W. Eaton <jwe@octave.org> parents: 23738 diff changeset	1177
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	1178 symbol_scope
23609 99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1179 interpreter::get_current_scope (void)
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1180 {
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1181 return m_symbol_table.current_scope ();
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1182 }
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1183
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	1184 symbol_scope
23609 99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1185 interpreter::require_current_scope (const std::string& who)
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1186 {
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	1187 symbol_scope scope = get_current_scope ();
23609 99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1188
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1189 if (! scope)
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1190 error ("%s: symbol table scope missing", who.c_str ());
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1191
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1192 return scope;
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1193 }
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1194
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23552 diff changeset	1195 call_stack& interpreter::get_call_stack (void)
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23552 diff changeset	1196 {
23630 8a47d4735655 avoid memory leak in interpreter John W. Eaton <jwe@octave.org> parents: 23627 diff changeset	1197 return m_evaluator.get_call_stack ();
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23552 diff changeset	1198 }
14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23552 diff changeset	1199
23753 c3828bd031cd move profiler inside evaluator and inside octave namespace John W. Eaton <jwe@octave.org> parents: 23742 diff changeset	1200 profiler& interpreter::get_profiler (void)
c3828bd031cd move profiler inside evaluator and inside octave namespace John W. Eaton <jwe@octave.org> parents: 23742 diff changeset	1201 {
c3828bd031cd move profiler inside evaluator and inside octave namespace John W. Eaton <jwe@octave.org> parents: 23742 diff changeset	1202 return m_evaluator.get_profiler ();
c3828bd031cd move profiler inside evaluator and inside octave namespace John W. Eaton <jwe@octave.org> parents: 23742 diff changeset	1203 }
c3828bd031cd move profiler inside evaluator and inside octave namespace John W. Eaton <jwe@octave.org> parents: 23742 diff changeset	1204
23703 6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1205 void interpreter::mlock (void)
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1206 {
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1207 call_stack& cs = get_call_stack ();
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1208
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1209 octave_function *fcn = cs.current ();
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1210
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1211 if (! fcn)
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1212 error ("mlock: invalid use outside a function");
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1213
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1214 fcn->lock ();
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1215 }
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1216
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1217 void interpreter::munlock (const std::string& nm)
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1218 {
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1219 octave_value val = m_symbol_table.find_function (nm);
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1220
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1221 if (val.is_defined ())
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1222 {
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1223 octave_function *fcn = val.function_value ();
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1224
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1225 if (fcn)
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1226 fcn->unlock ();
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1227 }
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1228 }
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1229
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1230 bool interpreter::mislocked (const std::string& nm)
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1231 {
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1232 bool retval = false;
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1233
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1234 octave_value val = m_symbol_table.find_function (nm);
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1235
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1236 if (val.is_defined ())
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1237 {
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1238 octave_function *fcn = val.function_value ();
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1239
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1240 if (fcn)
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1241 retval = fcn->islocked ();
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1242 }
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1243
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1244 return retval;
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1245 }
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1246
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	1247 void interpreter::recover_from_exception (void)
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1248 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1249 can_interrupt = true;
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1250 octave_interrupt_state = 0;
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1251 octave_signal_caught = 0;
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1252 octave_exception_state = octave_no_exception;
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1253 octave_restore_signal_mask ();
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1254 catch_interrupts ();
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1255 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1256
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1257 // Functions to call when the interpreter exits.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1258
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	1259 std::list<std::string> interpreter::atexit_functions;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1260
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1261 void interpreter::add_atexit_function (const std::string& fname)
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1262 {
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1263 atexit_functions.push_front (fname);
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1264 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1265
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1266 bool interpreter::remove_atexit_function (const std::string& fname)
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1267 {
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1268 bool found = false;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1269
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1270 for (auto it = atexit_functions.begin ();
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1271 it != atexit_functions.end (); it++)
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1272 {
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1273 if (*it == fname)
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1274 {
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1275 atexit_functions.erase (it);
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1276 found = true;
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1277 break;
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1278 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1279 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1280
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1281 return found;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1282 }
23723 ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1283
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1284 // What internal options get configured by --traditional.
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1285
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1286 void interpreter::maximum_braindamage (void)
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1287 {
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1288 FPS1 (octave_value (">> "));
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1289 FPS2 (octave_value (""));
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1290
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1291 m_evaluator.PS4 ("");
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1292
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1293 Fbeep_on_error (octave_value (true));
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1294 Fconfirm_recursive_rmdir (octave_value (false));
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1295 Fcrash_dumps_octave_core (octave_value (false));
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1296 Fdisable_diagonal_matrix (octave_value (true));
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1297 Fdisable_permutation_matrix (octave_value (true));
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1298 Fdisable_range (octave_value (true));
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1299 Ffixed_point_format (octave_value (true));
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1300 Fhistory_timestamp_format_string (octave_value ("%%-- %D %I:%M %p --%%"));
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1301 Fpage_screen_output (octave_value (false));
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1302 Fprint_empty_dimensions (octave_value (false));
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1303 Fsave_default_options (octave_value ("-mat-binary"));
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1304 Fstruct_levels_to_print (octave_value (0));
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1305
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1306 disable_warning ("Octave:abbreviated-property-match");
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1307 disable_warning ("Octave:data-file-in-path");
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1308 disable_warning ("Octave:function-name-clash");
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1309 disable_warning ("Octave:possible-matlab-short-circuit-operator");
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1310 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1311 }

Mercurial > octave

annotate libinterp/corefcn/interpreter.cc @ 25054:6652d3823428 stable