octave: libinterp/corefcn/interpreter.cc annotate

annotate libinterp/corefcn/interpreter.cc @ 27588:f0e3f3e28a8e

move qt_interpreter_events object from interpreter_qobject to octave_qobject * interpreter-qobject.h, interpreter-qobject.cc (interpreter_qobject::m_qt_link): Delete data member and all uses. (interpreter_qobject::execute): Don't connect confirm_shutdown_signal and copy_image_to_clipboard_signal here. (interpreter_qobject::confirm_shutdown): Delete. * octave-qobject.h, octave-qobject.cc (base_qobject::octave_qobject): Connect copy_image_to_clipboard_signal here. (base_qobject::m_qt_interpreter_events): New data member. (base_qobject::confirm_shutdown): New function. (base_qobject::confirm_shutdown_octave): Delete. (bool gui_qobject::confirm_shutdown): New function. (base_qobject::get_qt_interpreter_events, base_qobject::qt_link): New functions. * interpreter.h, interpreter.cc (interpreter::quit): New arg, confirm. * main-window.h, main-window.cc (main_window::confirm_shutdown): Rename from confirm_shutdown_octave. Change all uses. (main_window::closeEvent): Check confirm_shutdown first, then if exit is confirmed, call interpreter::quit with extra argument to skip confirmation. * qt-interpreter-events.h, qt-interpreter-events.cc (qt_interpreter_events::m_octave_qobject): New data member. (qt_interpreter_events::qt_interpreter_events): Connect confirm_shutdown_signal to confirm_shutdown_octave slot here. (qt_interpreter_events::confirm_shutdown_octave): New function.

author	John W. Eaton <jwe@octave.org>
date	Sat, 26 Oct 2019 12:20:29 -0400
parents	494d6243c188
children	b54d6ac62fbf

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
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 26113 diff changeset	3 Copyright (C) 1993-2019 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
27017 24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	27 #include <cstdio>
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	28
27542 b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	29 #include <set>
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	30 #include <string>
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	31 #include <iostream>
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	32
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	33 #include "cmd-edit.h"
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	34 #include "cmd-hist.h"
27408 9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	35 #include "file-ops.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	36 #include "file-stat.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	37 #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	38 #include "lo-blas-proto.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	39 #include "lo-error.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	40 #include "oct-env.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	41 #include "str-vec.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	42 #include "signal-wrappers.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	43 #include "unistd-wrappers.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	44
23711 5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	45 #include "builtin-defun-decls.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	46 #include "defaults.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	47 #include "Cell.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	48 #include "defun.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	49 #include "display.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	50 #include "error.h"
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27262 diff changeset	51 #include "event-manager.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	52 #include "file-io.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	53 #include "graphics.h"
23721 b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23719 diff changeset	54 #include "help.h"
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25404 diff changeset	55 #include "input.h"
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	56 #include "interpreter-private.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	57 #include "interpreter.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	58 #include "load-path.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	59 #include "load-save.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	60 #include "octave.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	61 #include "oct-hist.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	62 #include "oct-map.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	63 #include "oct-mutex.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	64 #include "ovl.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	65 #include "ov.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	66 #include "ov-classdef.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	67 #include "parse.h"
27017 24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	68 #include "pt-classdef.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	69 #include "pt-eval.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	70 #include "pt-jump.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	71 #include "pt-stmt.h"
25443 2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25440 diff changeset	72 #include "settings.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	73 #include "sighandlers.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	74 #include "sysdep.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	75 #include "unwind-prot.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	76 #include "utils.h"
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	77 #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	78 #include "version.h"
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	79
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	80 // TRUE means the quit() call is allowed.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	81 bool quit_allowed = true;
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 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	84 // is ready for interactive use.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	85 bool octave_interpreter_ready = false;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	86
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	87 // TRUE means 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	88 bool octave_initialized = false;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	89
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	90 DEFUN (__version_info__, args, ,
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	91 doc: /* -- texinfo --
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	92 @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	93 Undocumented internal function.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	94 @end deftypefn */)
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 static octave_map vinfo;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	97
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	98 int nargin = args.length ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	99
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	100 if (nargin != 0 && nargin != 4)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	101 print_usage ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	102
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	103 octave_value retval;
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 (nargin == 0)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	106 retval = vinfo;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	107 else if (nargin == 4)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	108 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	109 if (vinfo.nfields () == 0)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	110 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	111 vinfo.assign ("Name", args(0));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	112 vinfo.assign ("Version", args(1));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	113 vinfo.assign ("Release", args(2));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	114 vinfo.assign ("Date", args(3));
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 else
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_idx_type n = vinfo.numel () + 1;
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.resize (dim_vector (n, 1));
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	121
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	122 octave_value idx (n);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	123
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	124 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	125 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	126 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	127 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	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
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	131 return retval;
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
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27214 diff changeset	134 DEFMETHOD (quit, interp, args, ,
dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27214 diff changeset	135 doc: /* -- texinfo --
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	136 @deftypefn {} {} quit
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	137 @deftypefnx {} {} quit cancel
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	138 @deftypefnx {} {} quit force
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	139 @deftypefnx {} {} quit ("cancel")
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	140 @deftypefnx {} {} quit ("force")
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	141 @deftypefnx {} {} quit (@var{status})
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	142 @deftypefnx {} {} quit (@var{status}, "force")
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	143 Quit the current Octave session.
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	144
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	145 The @code{exit} function is an alias for @code{quit}.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	146
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	147 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	148 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	149
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	150 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	151 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	152 may be placed in that file. Alternatively, another m-file may be scheduled
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	153 to run using @code{atexit}. If an error occurs while executing the
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	154 @file{finish.m} file, Octave does not exit and control is returned to
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	155 the command prompt.
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	156
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	157 If the optional argument @qcode{"cancel"} is provided, Octave does not
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	158 exit and control is returned to the command prompt. This feature allows
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	159 the @code{finish.m} file to cancel the quit process.
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	160
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	161 If the user preference to request confirmation before exiting, Octave
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	162 will display a dialog and give the user an option to cancel the exit
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	163 process.
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	164
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	165 If the optional argument @qcode{"force"} is provided, no confirmation is
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	166 requested, and the execution of the @file{finish.m} file is skipped.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	167 @seealso{atexit}
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	168 @end deftypefn */)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	169 {
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	170 int numel = args.length ();
27261 dccdc3b001a2 eliminate static functions from octave_link class John W. Eaton <jwe@octave.org> parents: 27214 diff changeset	171
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	172 if (numel > 2)
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	173 print_usage ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	174
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	175 int exit_status = 0;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	176
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	177 bool force = false;
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	178 bool cancel = false;
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	179
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	180 if (numel == 2)
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	181 {
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	182 exit_status = args(0).xnint_value ("quit: STATUS must be an integer");
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	183 std::string frc
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	184 = args(1).xstring_value ("quit: second argument must be a string");
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	185
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	186 if (frc == "force")
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	187 force = true;
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	188 else
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	189 error (R"(quit: second argument must be string "force")");
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	190 }
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	191 else if (numel == 1)
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	192 {
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	193 if (args(0).is_string ())
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	194 {
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	195 const char *msg
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	196 = R"(quit: option must be string "cancel" or "force")";
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	197
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	198 std::string opt = args(0).xstring_value (msg);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	199
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	200 if (opt == "cancel")
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	201 cancel = true;
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	202 else if (opt == "force")
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	203 force = true;
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	204 else
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	205 error (msg);
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	206 }
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	207 else
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	208 exit_status = args(0).xnint_value ("quit: STATUS must be an integer");
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	209 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	210
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	211 if (cancel)
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	212 {
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	213 if (interp.executing_finish_script ())
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	214 {
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	215 interp.cancel_quit (true);
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	216 return ovl ();
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	217 }
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	218 else
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	219 error (R"(invalid use of "cancel" option)");
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	220 }
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	221
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	222 interp.quit (exit_status, force);
22094 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 return ovl ();
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
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	227 DEFALIAS (exit, quit);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	228
27474 3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27471 diff changeset	229 DEFMETHOD (atexit, interp, args, nargout,
3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27471 diff changeset	230 doc: /* -- texinfo --
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	231 @deftypefn {} {} atexit (@var{fcn})
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	232 @deftypefnx {} {} atexit (@var{fcn}, @var{flag})
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	233 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	234
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	235 For example,
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	236
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	237 @example
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	238 @group
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	239 function last_words ()
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	240 disp ("Bye bye");
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	241 endfunction
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	242 atexit ("last_words");
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	243 @end group
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	244 @end example
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	245
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	246 @noindent
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	247 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	248
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	249 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	250 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	251 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	252 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	253 above,
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	254
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	255 @example
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	256 atexit ("last_words", false);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	257 @end example
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	258
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	259 @noindent
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	260 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	261 @code{last_words} when it exits.
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 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	264 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	265 @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	266 @seealso{quit}
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	267 @end deftypefn */)
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 int nargin = args.length ();
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 (nargin < 1 \|\| nargin > 2)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	272 print_usage ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	273
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	274 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	275
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	276 bool add_mode = (nargin == 2)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	277 ? 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	278 : true;
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 octave_value_list retval;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	281
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	282 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	283 octave::interpreter::add_atexit_function (arg);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	284 else
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	285 {
27474 3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27471 diff changeset	286 bool found = interp.remove_atexit_function (arg);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	287
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	288 if (nargout > 0)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	289 retval = ovl (found);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	290 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	291
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	292 return retval;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	293 }
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 namespace octave
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	296 {
27542 b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	297 temporary_file_list::~temporary_file_list (void)
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	298 {
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	299 cleanup ();
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	300 }
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	301
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	302 void temporary_file_list::insert (const std::string& file)
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	303 {
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	304 m_files.insert (file);
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	305 }
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	306
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	307 void temporary_file_list::cleanup (void)
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	308 {
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	309 while (! m_files.empty ())
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	310 {
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	311 auto it = m_files.begin ();
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	312
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	313 octave_unlink_wrapper (it->c_str ());
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	314
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	315 m_files.erase (it);
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	316 }
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	317 }
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	318
27408 9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	319 // The time we last time we changed directories.
9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	320 sys::time Vlast_chdir_time = 0.0;
9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	321
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	322 // Execute commands from a file and catch potential exceptions in a consistent
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	323 // way. This function should be called anywhere we might parse and execute
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	324 // commands from a file before we have entered the main loop in
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	325 // toplev.cc.
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	326
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	327 static int safe_source_file (const std::string& file_name,
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	328 const std::string& context = "",
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	329 bool verbose = false,
27507 2d537a089e5d eliminate warn_for argument for source_file and parse_fcn_file functions John W. Eaton <jwe@octave.org> parents: 27506 diff changeset	330 bool require_file = true)
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	331 {
27474 3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27471 diff changeset	332 interpreter& interp = __get_interpreter__ ("safe_source_file");
3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27471 diff changeset	333
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	334 try
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	335 {
27507 2d537a089e5d eliminate warn_for argument for source_file and parse_fcn_file functions John W. Eaton <jwe@octave.org> parents: 27506 diff changeset	336 source_file (file_name, context, verbose, require_file);
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	337 }
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	338 catch (const interrupt_exception&)
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	339 {
27474 3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27471 diff changeset	340 interp.recover_from_exception ();
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	341
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	342 return 1;
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	343 }
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	344 catch (const execution_exception& e)
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	345 {
27471 fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	346 interp.handle_exception (e);
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	347
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	348 return 1;
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	349 }
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	350
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	351 return 0;
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	352 }
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	353
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	354 static void initialize_version_info (void)
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	355 {
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	356 octave_value_list args;
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	357
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	358 args(3) = OCTAVE_RELEASE_DATE;
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	359 args(2) = config::release ();
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	360 args(1) = OCTAVE_VERSION;
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	361 args(0) = "GNU Octave";
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	362
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	363 F__version_info__ (args, 0);
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	364 }
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	365
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	366 static void xerbla_abort (void)
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	367 {
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	368 error ("Fortran procedure terminated by call to XERBLA");
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	369 }
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	370
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	371 static void initialize_xerbla_error_handler (void)
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	372 {
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	373 // The idea here is to force xerbla to be referenced so that we will
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	374 // link to our own version instead of the one provided by the BLAS
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	375 // library. But numeric_limits<double>::NaN () should never be -1, so
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	376 // we should never actually call xerbla. FIXME (again!): If this
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	377 // becomes a constant expression the test might be optimized away and
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	378 // then the reference to the function might also disappear.
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	379
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	380 if (numeric_limits<double>::NaN () == -1)
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	381 F77_FUNC (xerbla, XERBLA) ("octave", 13 F77_CHAR_ARG_LEN (6));
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	382
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	383 typedef void (*xerbla_handler_ptr) (void);
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	384
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	385 typedef void (*octave_set_xerbla_handler_ptr) (xerbla_handler_ptr);
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	386
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	387 dynamic_library libs ("");
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	388
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	389 if (libs)
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	390 {
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	391 octave_set_xerbla_handler_ptr octave_set_xerbla_handler
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	392 = reinterpret_cast<octave_set_xerbla_handler_ptr>
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	393 (libs.search ("octave_set_xerbla_handler"));
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	394
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	395 if (octave_set_xerbla_handler)
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	396 octave_set_xerbla_handler (xerbla_abort);
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	397 }
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	398 }
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	399
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	400 OCTAVE_NORETURN static void
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	401 lo_error_handler (const char *fmt, ...)
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	402 {
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	403 va_list args;
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	404 va_start (args, fmt);
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	405 verror_with_cfn (fmt, args);
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	406 va_end (args);
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	407
27480 63b417917f5e remove some obsolete signal handling functions John W. Eaton <jwe@octave.org> parents: 27474 diff changeset	408 throw execution_exception ();
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	409 }
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	410
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	411 OCTAVE_NORETURN static void
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	412 lo_error_with_id_handler (const char id, const char fmt, ...)
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	413 {
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	414 va_list args;
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	415 va_start (args, fmt);
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	416 verror_with_id_cfn (id, fmt, args);
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	417 va_end (args);
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	418
27480 63b417917f5e remove some obsolete signal handling functions John W. Eaton <jwe@octave.org> parents: 27474 diff changeset	419 throw execution_exception ();
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	420 }
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	421
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	422 static void initialize_error_handlers (void)
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	423 {
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	424 set_liboctave_error_handler (lo_error_handler);
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	425 set_liboctave_error_with_id_handler (lo_error_with_id_handler);
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	426 set_liboctave_warning_handler (warning);
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	427 set_liboctave_warning_with_id_handler (warning_with_id);
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	428 }
fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	429
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	430 // 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	431 // 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	432 // path.
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22186 diff changeset	433
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	434 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	435 : m_app_context (app_context),
27542 b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	436 m_tmp_files (),
27266 596312d4f25d don't use singleton pattern for display_info class John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	437 m_display_info (),
23719 69a111259a2c eliminate some global variables John W. Eaton <jwe@octave.org> parents: 23717 diff changeset	438 m_environment (),
25443 2fa7cd178c4a new class for miscellaneous interpreter settings John W. Eaton <jwe@octave.org> parents: 25440 diff changeset	439 m_settings (),
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	440 m_error_system (*this),
23721 b2d55b52ee51 new class to manage help system and associated variables John W. Eaton <jwe@octave.org> parents: 23719 diff changeset	441 m_help_system (*this),
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25404 diff changeset	442 m_input_system (*this),
25435 a52e6fb674b1 eliminate some singletons and static & global variables John W. Eaton <jwe@octave.org> parents: 25407 diff changeset	443 m_output_system (*this),
25994 f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc John W. Eaton <jwe@octave.org> parents: 25993 diff changeset	444 m_history_system (*this),
23627 0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	445 m_dynamic_loader (*this),
27394 489c74ac36da store reference to interpreter in load_path object John W. Eaton <jwe@octave.org> parents: 27335 diff changeset	446 m_load_path (*this),
25993 f75bb9d659e0 eliminate global and file-scope static variables from load-save.cc (bug #54571) John W. Eaton <jwe@octave.org> parents: 25488 diff changeset	447 m_load_save_system (*this),
24540 46440078d73b don't use singleton for octave_value_typeinfo John W. Eaton <jwe@octave.org> parents: 24538 diff changeset	448 m_type_info (),
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	449 m_symbol_table (*this),
23630 8a47d4735655 avoid memory leak in interpreter John W. Eaton <jwe@octave.org> parents: 23627 diff changeset	450 m_evaluator (*this),
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	451 m_stream_list (*this),
24734 5d8c4cbc56d7 don't use singleton pattern for child_list John W. Eaton <jwe@octave.org> parents: 24727 diff changeset	452 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	453 m_url_handle_manager (),
23651 5c6cceef132b don't use singleton for cdef_manager object John W. Eaton <jwe@octave.org> parents: 23630 diff changeset	454 m_cdef_manager (*this),
23774 41795b504a8b don't use singleton for gtk_manager John W. Eaton <jwe@octave.org> parents: 23753 diff changeset	455 m_gtk_manager (),
27302 5f170ea12fa1 use Qt signals to pass interpreter callbacks to octave-qobject John W. Eaton <jwe@octave.org> parents: 27301 diff changeset	456 m_event_manager (*this),
27321 eddce82a57cc don't use singleton pattern for gh_manager object John W. Eaton <jwe@octave.org> parents: 27309 diff changeset	457 m_gh_manager (nullptr),
23627 0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	458 m_interactive (false),
0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	459 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	460 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	461 m_verbose (false),
0a6e87804cab don't use singleton pattern for dynamic_loader class John W. Eaton <jwe@octave.org> parents: 23611 diff changeset	462 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	463 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	464 m_history_initialized (false),
27519 804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	465 m_in_top_level_repl (false),
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	466 m_cancel_quit (false),
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	467 m_executing_finish_script (false),
23553 14723784b9f2 don't use singleton for call_stack John W. Eaton <jwe@octave.org> parents: 23552 diff changeset	468 m_initialized (false)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	469 {
24538 2b273df71aa0 allow experimenting with thread_local storage John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	470 // 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	471 // should change to say something like
2b273df71aa0 allow experimenting with thread_local storage John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	472 //
2b273df71aa0 allow experimenting with thread_local storage John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	473 // 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	474
23511 232c8d69d934 manage interpreter instance in interpreter object John W. Eaton <jwe@octave.org> parents: 23466 diff changeset	475 if (instance)
232c8d69d934 manage interpreter instance in interpreter object John W. Eaton <jwe@octave.org> parents: 23466 diff changeset	476 throw std::runtime_error
24538 2b273df71aa0 allow experimenting with thread_local storage John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	477 ("only one Octave interpreter may be active");
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22186 diff changeset	478
23511 232c8d69d934 manage interpreter instance in interpreter object John W. Eaton <jwe@octave.org> parents: 23466 diff changeset	479 instance = this;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	480
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	481 // Matlab uses "C" locale for LC_NUMERIC class regardless of local setting
27309 463fc0cfed90 initialize locale from values in the environment on interpreter start Mike Miller <mtmiller@octave.org> parents: 27302 diff changeset	482 setlocale (LC_ALL, "");
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	483 setlocale (LC_NUMERIC, "C");
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	484 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	485 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	486 sys::env::putenv ("LC_TIME", "C");
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	487
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	488 // 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	489 octave_set_default_fpucw ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	490
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	491 thread::init ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	492
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	493 octave_ieee_init ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	494
25487 fbc270aeb55d * interpreter.cc (intialize_xerbla_error_handler, xerbla_abort): New functions. John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	495 initialize_xerbla_error_handler ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	496
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	497 initialize_error_handlers ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	498
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	499 if (m_app_context)
26826 20881d195d20 fix handling of SIGTSTP (bug #51903) John W. Eaton <jwe@octave.org> parents: 26722 diff changeset	500 {
20881d195d20 fix handling of SIGTSTP (bug #51903) John W. Eaton <jwe@octave.org> parents: 26722 diff changeset	501 install_signal_handlers ();
20881d195d20 fix handling of SIGTSTP (bug #51903) John W. Eaton <jwe@octave.org> parents: 26722 diff changeset	502 octave_unblock_signal_by_name ("SIGTSTP");
20881d195d20 fix handling of SIGTSTP (bug #51903) John W. Eaton <jwe@octave.org> parents: 26722 diff changeset	503 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	504 else
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	505 quit_allowed = false;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	506
27266 596312d4f25d don't use singleton pattern for display_info class John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	507 if (! m_app_context)
596312d4f25d don't use singleton pattern for display_info class John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	508 m_display_info.initialize ();
596312d4f25d don't use singleton pattern for display_info class John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	509
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	510 bool line_editing = false;
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	511 bool traditional = false;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	512
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	513 if (m_app_context)
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	514 {
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	515 // 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	516 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	517
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	518 // 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	519 // including PKG_ADD files.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	520
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	521 string_vector args = options.all_args ();
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	522
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	523 m_app_context->intern_argv (args);
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	524 intern_nargin (args.numel () - 1);
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	525
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	526 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	527
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	528 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	529
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	530 for (const auto& pth : command_line_path)
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	531 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	532
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	533 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	534 if (! exec_path.empty ())
23719 69a111259a2c eliminate some global variables John W. Eaton <jwe@octave.org> parents: 23717 diff changeset	535 m_environment.exec_path (exec_path);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	536
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	537 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	538 if (! image_path.empty ())
23719 69a111259a2c eliminate some global variables John W. Eaton <jwe@octave.org> parents: 23717 diff changeset	539 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	540
27266 596312d4f25d don't use singleton pattern for display_info class John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	541 if (! options.no_window_system ())
596312d4f25d don't use singleton pattern for display_info class John W. Eaton <jwe@octave.org> parents: 27263 diff changeset	542 m_display_info.initialize ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	543
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	544 // 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	545 // interactive.
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	546
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	547 // 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	548 // pipe or a redirected file.
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	549 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	550
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	551 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	552 && octave_isatty_wrapper (fileno (stdout)));
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	553
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	554 // 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	555 if (options.forced_interactive ())
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	556 m_interactive = true;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	557
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	558 line_editing = options.line_editing ();
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	559 if ((! m_interactive \|\| options.forced_interactive ())
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	560 && ! options.forced_line_editing ())
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	561 line_editing = false;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	562
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	563 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	564
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	565 // 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	566 // 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	567
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	568 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	569 m_evaluator.echo
25063 a211e39e59d9 restore '--echo-commands' option to same behavior as 'echo on all' (bug #53453) Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	570 (tree_evaluator::ECHO_SCRIPTS \| tree_evaluator::ECHO_FUNCTIONS
a211e39e59d9 restore '--echo-commands' option to same behavior as 'echo on all' (bug #53453) Mike Miller <mtmiller@octave.org> parents: 25054 diff changeset	571 \| tree_evaluator::ECHO_ALL);
23711 5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	572
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	573 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	574 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	575 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	576
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	577 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	578 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	579 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	580
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	581 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	582 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	583 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	584
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	585 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	586 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	587 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	588
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	589 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	590 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	591
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	592 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	593 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	594
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	595 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	596 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	597 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	598 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	599
27322 cb92168e48f6 defer gh_manager creation until after display_info initialization John W. Eaton <jwe@octave.org> parents: 27321 diff changeset	600 // FIXME: we defer creation of the gh_manager object because it
cb92168e48f6 defer gh_manager creation until after display_info initialization John W. Eaton <jwe@octave.org> parents: 27321 diff changeset	601 // creates a root_figure object that requires the display_info
cb92168e48f6 defer gh_manager creation until after display_info initialization John W. Eaton <jwe@octave.org> parents: 27321 diff changeset	602 // object, but that is currently only accessible through the global
cb92168e48f6 defer gh_manager creation until after display_info initialization John W. Eaton <jwe@octave.org> parents: 27321 diff changeset	603 // interpreter object and that is not available until after the
cb92168e48f6 defer gh_manager creation until after display_info initialization John W. Eaton <jwe@octave.org> parents: 27321 diff changeset	604 // interpreter::instance pointer is set (above). It would be better
cb92168e48f6 defer gh_manager creation until after display_info initialization John W. Eaton <jwe@octave.org> parents: 27321 diff changeset	605 // if m_gh_manager could be an object value instead of a pointer and
cb92168e48f6 defer gh_manager creation until after display_info initialization John W. Eaton <jwe@octave.org> parents: 27321 diff changeset	606 // created as part of the interpreter initialization. To do that,
cb92168e48f6 defer gh_manager creation until after display_info initialization John W. Eaton <jwe@octave.org> parents: 27321 diff changeset	607 // we should either make the display_info object independent of the
cb92168e48f6 defer gh_manager creation until after display_info initialization John W. Eaton <jwe@octave.org> parents: 27321 diff changeset	608 // interpreter object (does it really need to cache any
cb92168e48f6 defer gh_manager creation until after display_info initialization John W. Eaton <jwe@octave.org> parents: 27321 diff changeset	609 // information?) or defer creation of the root_figure object until
cb92168e48f6 defer gh_manager creation until after display_info initialization John W. Eaton <jwe@octave.org> parents: 27321 diff changeset	610 // it is actually needed.
cb92168e48f6 defer gh_manager creation until after display_info initialization John W. Eaton <jwe@octave.org> parents: 27321 diff changeset	611 m_gh_manager = new gh_manager (*this);
cb92168e48f6 defer gh_manager creation until after display_info initialization John W. Eaton <jwe@octave.org> parents: 27321 diff changeset	612
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25404 diff changeset	613 m_input_system.initialize (line_editing);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	614
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	615 // 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	616 // 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	617
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	618 initialize_version_info ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	619
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	620 // 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	621 // 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	622
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	623 if (traditional)
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	624 maximum_braindamage ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	625
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	626 octave_interpreter_ready = true;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	627 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	628
24538 2b273df71aa0 allow experimenting with thread_local storage John W. Eaton <jwe@octave.org> parents: 24534 diff changeset	629 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	630
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22186 diff changeset	631 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	632 {
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	633 cleanup ();
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27322 diff changeset	634
50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27322 diff changeset	635 delete m_gh_manager;
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	636 }
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22186 diff changeset	637
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	638 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	639 {
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	640 m_evaluator.set_auto_fcn_var (stack_frame::NARGIN, nargs);
22196 dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22186 diff changeset	641 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator John W. Eaton <jwe@octave.org> parents: 22186 diff changeset	642
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	643 // 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	644
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	645 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	646 {
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	647 if (! m_history_initialized)
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	648 {
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	649 // Allow command-line option to override.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	650
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	651 if (m_app_context)
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	652 {
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	653 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	654
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	655 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	656
5a97aafb12a9 don't call built-in interpreter functions from the application context John W. Eaton <jwe@octave.org> parents: 23703 diff changeset	657 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	658 command_history::ignore_entries ();
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	659 }
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	660
25994 f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc John W. Eaton <jwe@octave.org> parents: 25993 diff changeset	661 m_history_system.initialize (read_history_file);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	662
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	663 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	664 command_history::ignore_entries ();
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	665
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	666 m_history_initialized = true;
23092 0fed4c678795 additional restructuring of startup and shutdown John W. Eaton <jwe@octave.org> parents: 23087 diff changeset	667 }
0fed4c678795 additional restructuring of startup and shutdown John W. Eaton <jwe@octave.org> parents: 23087 diff changeset	668 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	669
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	670 // 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	671 // option says to leave it empty.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	672
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	673 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	674 {
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	675 if (! m_load_path_initialized)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	676 {
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	677 // Allow command-line option to override.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	678
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	679 if (m_app_context)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	680 {
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	681 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	682
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	683 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	684 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	685
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	686 // 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	687 // 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	688 // 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	689 // 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	690 // 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	691 // 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	692 // 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	693 // are already handled.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: 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 unwind_protect frame;
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	696
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	697 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	698 m_load_path.get_add_hook ());
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	699
25345 ce6f7a5cd68e avoid global access of load path in interpreter class John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	700 m_load_path.set_add_hook ([this] (const std::string& dir)
ce6f7a5cd68e avoid global access of load path in interpreter class John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	701 { this->execute_pkg_add (dir); });
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	702
23438 d24d01273bd0 eliminate load-path singleton John W. Eaton <jwe@octave.org> parents: 23435 diff changeset	703 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	704
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	705 m_load_path_initialized = true;
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	706 }
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	707 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	708
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	709 // 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	710
23819 5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	711 void interpreter::initialize (void)
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	712 {
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	713 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	714 return;
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	715
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	716 display_startup_message ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	717
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	718 // 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	719 // files and begins evaluating commands.
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	720
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	721 initialize_history ();
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	722
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	723 // 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	724 // 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	725
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	726 // 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	727 // 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	728 // 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	729
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	730 initialize_load_path ();
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	731
27531 478150691336 consolidate initialization code John W. Eaton <jwe@octave.org> parents: 27530 diff changeset	732 octave_save_signal_mask ();
478150691336 consolidate initialization code John W. Eaton <jwe@octave.org> parents: 27530 diff changeset	733
478150691336 consolidate initialization code John W. Eaton <jwe@octave.org> parents: 27530 diff changeset	734 can_interrupt = true;
478150691336 consolidate initialization code John W. Eaton <jwe@octave.org> parents: 27530 diff changeset	735
478150691336 consolidate initialization code John W. Eaton <jwe@octave.org> parents: 27530 diff changeset	736 octave_signal_hook = respond_to_pending_signals;
478150691336 consolidate initialization code John W. Eaton <jwe@octave.org> parents: 27530 diff changeset	737 octave_interrupt_hook = nullptr;
478150691336 consolidate initialization code John W. Eaton <jwe@octave.org> parents: 27530 diff changeset	738
478150691336 consolidate initialization code John W. Eaton <jwe@octave.org> parents: 27530 diff changeset	739 catch_interrupts ();
478150691336 consolidate initialization code John W. Eaton <jwe@octave.org> parents: 27530 diff changeset	740
478150691336 consolidate initialization code John W. Eaton <jwe@octave.org> parents: 27530 diff changeset	741 // FIXME: could we eliminate this variable or make it not be global?
478150691336 consolidate initialization code John W. Eaton <jwe@octave.org> parents: 27530 diff changeset	742 // Global used to communicate with signal handler.
478150691336 consolidate initialization code John W. Eaton <jwe@octave.org> parents: 27530 diff changeset	743 octave_initialized = true;
478150691336 consolidate initialization code John W. Eaton <jwe@octave.org> parents: 27530 diff changeset	744
23819 5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	745 m_initialized = true;
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	746 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	747
23819 5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	748 // 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	749 // we enforce that restriction?
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	750
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	751 int interpreter::execute (void)
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	752 {
27530 7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	753 int exit_status = 0;
7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	754
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	755 try
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	756 {
23819 5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	757 initialize ();
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	758
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	759 execute_startup_files ();
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	760
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	761 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	762 {
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	763 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	764
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	765 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	766 {
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	767 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	768
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	769 if (status )
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	770 exit_status = status;
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	771
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	772 if (! options.persist ())
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	773 return exit_status;
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	774 }
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	775
23819 5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	776 // 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	777 // 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	778 // for the script.
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	779
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	780 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	781 {
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	782 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	783
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	784 if (status)
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	785 exit_status = status;
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	786
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	787 if (! options.persist ())
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	788 return exit_status;
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	789 }
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	790
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	791 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	792 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	793 }
5d8ef9b859f8 defer execution of user code to interpreter::execute (bug #51631) John W. Eaton <jwe@octave.org> parents: 23795 diff changeset	794
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	795 return main_loop ();
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	796 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	797 catch (const exit_exception& ex)
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	798 {
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	799 return ex.exit_status ();
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	800 }
27530 7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	801
7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	802 return exit_status;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	803 }
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 void interpreter::display_startup_message (void) const
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	806 {
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	807 bool inhibit_startup_message = false;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	808
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	809 if (m_app_context)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	810 {
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	811 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	812
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	813 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	814 }
23396 945b53af4655 maint: Strip trailing whitespace from source files. John W. Eaton <jwe@octave.org> parents: 23220 diff changeset	815
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	816 if (m_interactive && ! inhibit_startup_message)
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	817 std::cout << octave_startup_message () << "\n" << std::endl;
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
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	820 // 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	821 // 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	822 // exception.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	823
26722 f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	824 int interpreter::execute_startup_files (void)
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	825 {
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	826 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	827 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	828 bool verbose = m_verbose;
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	829 bool inhibit_startup_message = m_inhibit_startup_message;
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	830
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	831 if (m_app_context)
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	832 {
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	833 const cmdline_options& options = m_app_context->options ();
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	834
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	835 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	836 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	837 verbose = options.verbose_flag ();
252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	838 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	839 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	840
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	841 verbose = (verbose && ! inhibit_startup_message);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	842
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	843 bool require_file = false;
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	844
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	845 std::string context;
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	846
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	847 int exit_status = 0;
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	848
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	849 if (read_site_files)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	850 {
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	851 // Execute commands from the site-wide configuration file.
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	852 // First from the file $(prefix)/lib/octave/site/m/octaverc
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	853 // (if it exists), then from the file
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	854 // $(prefix)/share/octave/$(version)/m/octaverc (if it exists).
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	855
23717 06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23712 diff changeset	856 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	857 context, verbose, require_file);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	858
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	859 if (status)
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	860 exit_status = status;
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	861
23717 06579337237b move configuration variables inside octave::config namespace John W. Eaton <jwe@octave.org> parents: 23712 diff changeset	862 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	863 context, verbose, require_file);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	864
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	865 if (status)
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	866 exit_status = status;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	867 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	868
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	869 if (read_init_files)
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	870 {
26722 f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	871 // Try to execute commands from the Matlab compatible startup.m file
f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	872 // if it exists anywhere in the load path when starting Octave.
f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	873 std::string ff_startup_m = file_in_path ("startup.m", "");
f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	874
f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	875 if (! ff_startup_m.empty ())
f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	876 {
f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	877 int parse_status = 0;
f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	878
f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	879 try
f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	880 {
f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	881 eval_string (std::string ("startup"), false, parse_status, 0);
f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	882 }
f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	883 catch (const interrupt_exception&)
f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	884 {
f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	885 recover_from_exception ();
f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	886 }
f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	887 catch (const execution_exception& e)
f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	888 {
27471 fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	889 handle_exception (e);
26722 f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	890 }
f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	891 }
f51e8a7c33f4 run Matlab user files from interpreter, not startup scripts (bug #55681) Mike Miller <mtmiller@octave.org> parents: 26661 diff changeset	892
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	893 // Try to execute commands from $HOME/$OCTAVE_INITFILE and
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	894 // $OCTAVE_INITFILE. If $OCTAVE_INITFILE is not set,
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	895 // .octaverc is assumed.
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	896
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	897 bool home_rc_already_executed = false;
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	898
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	899 std::string initfile = sys::env::getenv ("OCTAVE_INITFILE");
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	900
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	901 if (initfile.empty ())
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	902 initfile = ".octaverc";
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	903
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	904 std::string home_dir = sys::env::get_home_directory ();
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	905
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	906 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	907
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	908 std::string local_rc;
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	909
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	910 if (! home_rc.empty ())
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	911 {
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	912 int status = safe_source_file (home_rc, context, verbose,
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	913 require_file);
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 if (status)
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	916 exit_status = status;
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 // Names alone are not enough.
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	919
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	920 sys::file_stat fs_home_rc (home_rc);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	921
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	922 if (fs_home_rc)
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	923 {
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	924 // 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	925 // because doing that may change the working directory.
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	926
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	927 local_rc = sys::env::make_absolute (initfile);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	928
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	929 home_rc_already_executed = same_file (home_rc, local_rc);
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	930 }
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	931 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	932
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	933 if (! home_rc_already_executed)
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	934 {
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	935 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	936 local_rc = sys::env::make_absolute (initfile);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	937
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	938 int status = safe_source_file (local_rc, context, verbose,
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	939 require_file);
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	940
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	941 if (status)
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	942 exit_status = status;
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	943 }
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	944 }
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	945
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	946 if (m_interactive && verbose)
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	947 std::cout << std::endl;
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	948
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	949 return exit_status;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	950 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	951
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	952 // Execute any code specified with --eval 'CODE'
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	953
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	954 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	955 {
27530 7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	956 if (! m_app_context)
7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	957 return 0;
7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	958
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	959 const cmdline_options& options = m_app_context->options ();
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	960
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	961 std::string code_to_eval = options.code_to_eval ();
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	962
27532 2af853f94b97 use unwind_protect_var instead of unwind_protect object for a single var John W. Eaton <jwe@octave.org> parents: 27531 diff changeset	963 unwind_protect_var<bool> upv (m_interactive, false);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	964
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	965 int parse_status = 0;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	966
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	967 try
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	968 {
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	969 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	970 }
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	971 catch (const interrupt_exception&)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	972 {
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	973 recover_from_exception ();
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	974
23087 9f406f0b36da rework clean_up_and_exit (bug #50068) John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	975 return 1;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	976 }
27471 fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	977 catch (const execution_exception& e)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	978 {
27471 fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	979 handle_exception (e);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	980
23087 9f406f0b36da rework clean_up_and_exit (bug #50068) John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	981 return 1;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	982 }
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 return parse_status;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	985 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	986
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	987 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	988 {
27530 7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	989 if (! m_app_context)
7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	990 return 0;
7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	991
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	992 const cmdline_options& options = m_app_context->options ();
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	993
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	994 unwind_protect frame;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	995
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	996 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	997
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	998 string_vector args = options.all_args ();
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	999
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	1000 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	1001
5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	1002 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	1003
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1004 frame.add_method (m_app_context,
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1005 &application::program_invocation_name,
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1006 application::program_invocation_name ());
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1007
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1008 frame.add_method (m_app_context,
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1009 &application::program_name,
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1010 application::program_name ());
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1011
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1012 m_interactive = false;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1013
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1014 // If we are running an executable script (#! /bin/octave) then
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1015 // we should only see the args passed to the script.
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1016
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1017 string_vector script_args = options.remaining_args ();
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1018
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1019 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	1020 intern_nargin (script_args.numel () - 1);
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1021
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1022 std::string fname = script_args[0];
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23100 diff changeset	1023
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1024 m_app_context->set_program_names (fname);
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1025
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1026 std::string context;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1027 bool verbose = false;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1028 bool require_file = true;
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1029
27507 2d537a089e5d eliminate warn_for argument for source_file and parse_fcn_file functions John W. Eaton <jwe@octave.org> parents: 27506 diff changeset	1030 return safe_source_file (fname, context, verbose, require_file);
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1031 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1032
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1033 int interpreter::main_loop (void)
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1034 {
27530 7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	1035 int exit_status = 0;
23104 2805cc365a86 fix thinko in previous change John W. Eaton <jwe@octave.org> parents: 23102 diff changeset	1036
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1037 // The big loop.
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1038
27519 804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1039 #if defined (OCTAVE_ENABLE_COMMAND_LINE_PUSH_PARSER)
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1040
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1041 input_reader reader (*this);
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1042
27526 cb964b74d8a0 Backed out changeset 28ed77ca1e4a John W. Eaton <jwe@octave.org> parents: 27519 diff changeset	1043 push_parser repl_parser (*this);
27519 804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1044
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1045 #else
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1046
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1047 // The pull parser takes ownership of the lexer and will delete it
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1048 // when the parser goes out of scope.
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1049
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1050 parser repl_parser (m_interactive
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1051 ? new lexer (this) : new lexer (stdin, this));
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1052
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1053 #endif
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1054
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1055 do
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1056 {
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1057 try
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1058 {
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1059 unwind_protect_var<bool> upv (m_in_top_level_repl, true);
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1060
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1061 repl_parser.reset ();
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1062
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1063 if (m_evaluator.at_top_level ())
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1064 {
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1065 m_evaluator.dbstep_flag (0);
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1066 m_evaluator.reset_debug_state ();
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1067 }
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1068
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1069 #if defined (OCTAVE_ENABLE_COMMAND_LINE_PUSH_PARSER)
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1070
27528 e51284fc0a51 eliminate promptflag from the lexer and input reader classes John W. Eaton <jwe@octave.org> parents: 27527 diff changeset	1071 std::string prompt
e51284fc0a51 eliminate promptflag from the lexer and input reader classes John W. Eaton <jwe@octave.org> parents: 27527 diff changeset	1072 = command_editor::decode_prompt_string (m_input_system.PS1 ());
e51284fc0a51 eliminate promptflag from the lexer and input reader classes John W. Eaton <jwe@octave.org> parents: 27527 diff changeset	1073
27519 804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1074 do
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1075 {
27545 397ba0a8d732 reset exit_status before getting input in pull parser input loop John W. Eaton <jwe@octave.org> parents: 27542 diff changeset	1076 // Reset status each time through the read loop so that
397ba0a8d732 reset exit_status before getting input in pull parser input loop John W. Eaton <jwe@octave.org> parents: 27542 diff changeset	1077 // it won't be set to -1 and cause us to exit the outer
397ba0a8d732 reset exit_status before getting input in pull parser input loop John W. Eaton <jwe@octave.org> parents: 27542 diff changeset	1078 // loop early if there is an exception while reading
397ba0a8d732 reset exit_status before getting input in pull parser input loop John W. Eaton <jwe@octave.org> parents: 27542 diff changeset	1079 // input or parsing.
397ba0a8d732 reset exit_status before getting input in pull parser input loop John W. Eaton <jwe@octave.org> parents: 27542 diff changeset	1080
397ba0a8d732 reset exit_status before getting input in pull parser input loop John W. Eaton <jwe@octave.org> parents: 27542 diff changeset	1081 exit_status = 0;
397ba0a8d732 reset exit_status before getting input in pull parser input loop John W. Eaton <jwe@octave.org> parents: 27542 diff changeset	1082
27527 73be3c628eac refactor input_reader class and its use in lexer John W. Eaton <jwe@octave.org> parents: 27526 diff changeset	1083 bool eof = false;
73be3c628eac refactor input_reader class and its use in lexer John W. Eaton <jwe@octave.org> parents: 27526 diff changeset	1084 std::string input_line = reader.get_input (prompt, eof);
27519 804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1085
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1086 if (eof)
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1087 {
27530 7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	1088 exit_status = EOF;
27519 804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1089 break;
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1090 }
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1091
27530 7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	1092 exit_status = repl_parser.run (input_line, false);
27528 e51284fc0a51 eliminate promptflag from the lexer and input reader classes John W. Eaton <jwe@octave.org> parents: 27527 diff changeset	1093
e51284fc0a51 eliminate promptflag from the lexer and input reader classes John W. Eaton <jwe@octave.org> parents: 27527 diff changeset	1094 prompt = command_editor::decode_prompt_string (m_input_system.PS2 ());
27519 804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1095 }
27530 7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	1096 while (exit_status < 0);
27519 804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1097
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1098 #else
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1099
27530 7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	1100 exit_status = repl_parser.run ();
27519 804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1101
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1102 #endif
27530 7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	1103 if (exit_status == 0)
27519 804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1104 {
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1105 std::shared_ptr<tree_statement_list>
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1106 stmt_list = repl_parser.statement_list ();
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1107
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1108 if (stmt_list)
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1109 {
27529 886df2049d81 only increment command number when complete block of code is parsed John W. Eaton <jwe@octave.org> parents: 27528 diff changeset	1110 command_editor::increment_current_command_number ();
886df2049d81 only increment command number when complete block of code is parsed John W. Eaton <jwe@octave.org> parents: 27528 diff changeset	1111
27519 804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1112 m_evaluator.eval (stmt_list, m_interactive);
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1113 }
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1114 else if (repl_parser.at_end_of_input ())
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1115 {
27530 7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	1116 exit_status = EOF;
27519 804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1117 break;
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1118 }
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1119 }
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1120 }
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1121 catch (const interrupt_exception&)
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1122 {
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1123 recover_from_exception ();
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1124
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1125 // Required newline when the user does Ctrl+C at the prompt.
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1126 if (m_interactive)
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1127 octave_stdout << "\n";
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1128 }
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1129 catch (const index_exception& e)
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1130 {
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1131 recover_from_exception ();
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1132
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1133 std::cerr << "error: unhandled index exception: "
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1134 << e.message () << " -- trying to return to prompt"
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1135 << std::endl;
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1136 }
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1137 catch (const execution_exception& ee)
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1138 {
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1139 m_error_system.save_exception (ee);
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1140 m_error_system.display_exception (ee, std::cerr);
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1141
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1142 if (m_interactive)
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1143 recover_from_exception ();
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1144 else
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1145 {
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1146 // We should exit with a nonzero status.
27530 7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	1147 exit_status = 1;
27519 804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1148 break;
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1149 }
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1150 }
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1151 catch (const std::bad_alloc&)
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1152 {
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1153 recover_from_exception ();
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1154
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1155 std::cerr << "error: out of memory -- trying to return to prompt"
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1156 << std::endl;
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1157 }
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1158 }
27530 7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	1159 while (exit_status == 0);
27519 804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1160
27530 7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	1161 if (exit_status == EOF)
27519 804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1162 {
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1163 if (m_interactive)
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1164 octave_stdout << "\n";
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1165
27530 7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	1166 exit_status = 0;
27519 804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1167 }
804e5d42b728 move reader and parser from evaluator repl to interpreter main_loop John W. Eaton <jwe@octave.org> parents: 27517 diff changeset	1168
27530 7a9d2b0e6da8 be more defensive about using m_app_context in interpreter code John W. Eaton <jwe@octave.org> parents: 27529 diff changeset	1169 return exit_status;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1170 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1171
23106 1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1172 // 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	1173 // errors while shutting down.
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1174
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1175 #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	1176 catch (E) \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1177 { \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1178 recover_from_exception (); \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1179 \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1180 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	1181 << std::endl; \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1182 }
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1183
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1184 #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	1185 do \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1186 { \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1187 try \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1188 { \
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	1189 unwind_protect frame; \
23106 1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1190 \
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	1191 frame.add_method (m_error_system, \
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	1192 &error_system::set_debug_on_error, \
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	1193 m_error_system.debug_on_error ()); \
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	1194 frame.add_method (m_error_system, \
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	1195 &error_system::set_debug_on_warning, \
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	1196 m_error_system.debug_on_warning ()); \
23106 1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1197 \
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	1198 m_error_system.debug_on_error (false); \
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	1199 m_error_system.debug_on_warning (false); \
23106 1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1200 \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1201 F ARGS; \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1202 } \
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	1203 OCTAVE_IGNORE_EXCEPTION (const exit_exception&) \
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	1204 OCTAVE_IGNORE_EXCEPTION (const interrupt_exception&) \
6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	1205 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	1206 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	1207 } \
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1208 while (0)
1a53f9d42ec1 move OCTAVE_SAFE_CALL macro out of header file John W. Eaton <jwe@octave.org> parents: 23105 diff changeset	1209
23087 9f406f0b36da rework clean_up_and_exit (bug #50068) John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	1210 void interpreter::cleanup (void)
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1211 {
23092 0fed4c678795 additional restructuring of startup and shutdown John W. Eaton <jwe@octave.org> parents: 23087 diff changeset	1212 // If we are attached to a GUI, process pending events and
27262 d67f369b3074 use shared_ptr to manage octave_link_events object John W. Eaton <jwe@octave.org> parents: 27261 diff changeset	1213 // disable the link.
23092 0fed4c678795 additional restructuring of startup and shutdown John W. Eaton <jwe@octave.org> parents: 23087 diff changeset	1214
27263 99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27262 diff changeset	1215 m_event_manager.process_events (true);
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace John W. Eaton <jwe@octave.org> parents: 27262 diff changeset	1216 m_event_manager.disable ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1217
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25404 diff changeset	1218 OCTAVE_SAFE_CALL (m_input_system.clear_input_event_hooks, ());
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1219
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1220 while (! atexit_functions.empty ())
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1221 {
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1222 std::string fcn = atexit_functions.front ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1223
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1224 atexit_functions.pop_front ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1225
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1226 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	1227
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1228 OCTAVE_SAFE_CALL (flush_stdout, ());
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1229 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1230
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1231 // 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	1232 // 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	1233 // called.
23699 b29904962d2d deprecate some global functions that access the symbol table John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	1234 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	1235
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1236 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	1237
25994 f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc John W. Eaton <jwe@octave.org> parents: 25993 diff changeset	1238 OCTAVE_SAFE_CALL (m_history_system.write_timestamp, ());
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1239
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1240 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	1241 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	1242
27335 50216d7a2f6b eliminate static wrapper functions in gh_manager class John W. Eaton <jwe@octave.org> parents: 27322 diff changeset	1243 OCTAVE_SAFE_CALL (m_gh_manager->close_all_figures, ());
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1244
23774 41795b504a8b don't use singleton for gtk_manager John W. Eaton <jwe@octave.org> parents: 23753 diff changeset	1245 m_gtk_manager.unload_all_toolkits ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1246
23599 5cb3a2bb5e1e don't use singleton for symbol_table John W. Eaton <jwe@octave.org> parents: 23553 diff changeset	1247 // 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	1248 // 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	1249 // 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	1250 m_symbol_table.cleanup ();
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1251
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1252 OCTAVE_SAFE_CALL (sysdep_cleanup, ());
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1253
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1254 OCTAVE_SAFE_CALL (flush_stdout, ());
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1255
23117 17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1256 // 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	1257 // 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	1258 // 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	1259 // 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	1260 // 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	1261 // 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	1262 // 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	1263 // .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	1264 // is unloaded.
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1265 //
17a3567a7b01 separate final interpreter initialization from execution John W. Eaton <jwe@octave.org> parents: 23111 diff changeset	1266 // 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	1267 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1268
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23511 diff changeset	1269 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	1270 {
23630 8a47d4735655 avoid memory leak in interpreter John W. Eaton <jwe@octave.org> parents: 23627 diff changeset	1271 return m_evaluator;
23532 084245f9bd03 pass reference to evaluator to octave_function call methods John W. Eaton <jwe@octave.org> parents: 23511 diff changeset	1272 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1273
23738 8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	1274 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	1275 {
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	1276 return m_stream_list;
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	1277 }
8acd390d16c9 don't use singleton for stream_list object John W. Eaton <jwe@octave.org> parents: 23723 diff changeset	1278
23742 1f0daaf81955 don't use singleton for ch_manager, rename to url_handle_manager John W. Eaton <jwe@octave.org> parents: 23738 diff changeset	1279 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	1280 {
1f0daaf81955 don't use singleton for ch_manager, rename to url_handle_manager John W. Eaton <jwe@octave.org> parents: 23738 diff changeset	1281 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	1282 }
1f0daaf81955 don't use singleton for ch_manager, rename to url_handle_manager John W. Eaton <jwe@octave.org> parents: 23738 diff changeset	1283
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	1284 symbol_scope
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1285 interpreter::get_top_scope (void) const
23609 99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1286 {
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1287 return m_evaluator.get_top_scope ();
23609 99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1288 }
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1289
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	1290 symbol_scope
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1291 interpreter::get_current_scope (void) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1292 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1293 return m_evaluator.get_current_scope ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1294 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1295
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1296 symbol_scope
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1297 interpreter::require_current_scope (const std::string& who) const
23609 99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1298 {
24361 8bcfddad15ec use shared_ptr to manage symbol_scope objects John W. Eaton <jwe@octave.org> parents: 24270 diff changeset	1299 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	1300
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1301 if (! scope)
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1302 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	1303
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1304 return scope;
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1305 }
99989ab8f142 new convenience functions for accessing current scope John W. Eaton <jwe@octave.org> parents: 23599 diff changeset	1306
23753 c3828bd031cd move profiler inside evaluator and inside octave namespace John W. Eaton <jwe@octave.org> parents: 23742 diff changeset	1307 profiler& interpreter::get_profiler (void)
c3828bd031cd move profiler inside evaluator and inside octave namespace John W. Eaton <jwe@octave.org> parents: 23742 diff changeset	1308 {
c3828bd031cd move profiler inside evaluator and inside octave namespace John W. Eaton <jwe@octave.org> parents: 23742 diff changeset	1309 return m_evaluator.get_profiler ();
c3828bd031cd move profiler inside evaluator and inside octave namespace John W. Eaton <jwe@octave.org> parents: 23742 diff changeset	1310 }
c3828bd031cd move profiler inside evaluator and inside octave namespace John W. Eaton <jwe@octave.org> parents: 23742 diff changeset	1311
27408 9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1312 int interpreter::chdir (const std::string& dir)
9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1313 {
9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1314 std::string xdir = sys::file_ops::tilde_expand (dir);
9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1315
9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1316 int cd_ok = sys::env::chdir (xdir);
9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1317
9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1318 if (! cd_ok)
9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1319 error ("%s: %s", dir.c_str (), std::strerror (errno));
9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1320
9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1321 Vlast_chdir_time.stamp ();
9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1322
9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1323 // FIXME: should these actions be handled as a list of functions
9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1324 // to call so users can add their own chdir handlers?
9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1325
9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1326 m_load_path.update ();
9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1327
27409 a0d49e55acae rename change_directory to directory_changed in event manager John W. Eaton <jwe@octave.org> parents: 27408 diff changeset	1328 m_event_manager.directory_changed (sys::env::get_current_directory ());
27408 9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1329
9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1330 return cd_ok;
9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1331 }
9b19eec60931 move change directory function to interpreter class John W. Eaton <jwe@octave.org> parents: 27394 diff changeset	1332
23703 6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1333 void interpreter::mlock (void)
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1334 {
27212 f84c5528e932 eliminate direct access to call stack in interpreter::mlock John W. Eaton <jwe@octave.org> parents: 27161 diff changeset	1335 m_evaluator.mlock ();
23703 6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1336 }
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1337
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1338 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	1339 {
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1340 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	1341
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1342 if (val.is_defined ())
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1343 {
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1344 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	1345
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1346 if (fcn)
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1347 fcn->unlock ();
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1348 }
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1349 }
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1350
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1351 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	1352 {
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1353 bool retval = false;
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1354
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1355 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	1356
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1357 if (val.is_defined ())
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1358 {
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1359 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	1360
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1361 if (fcn)
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1362 retval = fcn->islocked ();
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1363 }
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1364
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1365 return retval;
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1366 }
6eb5f6199a5a move mlock, munlock, and mislocked to interpreter class John W. Eaton <jwe@octave.org> parents: 23699 diff changeset	1367
27015 4d9e1a832a55 move core of mfilename function to evaluator John W. Eaton <jwe@octave.org> parents: 27014 diff changeset	1368 std::string interpreter::mfilename (const std::string& opt) const
4d9e1a832a55 move core of mfilename function to evaluator John W. Eaton <jwe@octave.org> parents: 27014 diff changeset	1369 {
4d9e1a832a55 move core of mfilename function to evaluator John W. Eaton <jwe@octave.org> parents: 27014 diff changeset	1370 return m_evaluator.mfilename (opt);
4d9e1a832a55 move core of mfilename function to evaluator John W. Eaton <jwe@octave.org> parents: 27014 diff changeset	1371 }
4d9e1a832a55 move core of mfilename function to evaluator John W. Eaton <jwe@octave.org> parents: 27014 diff changeset	1372
26113 8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1373 octave_value_list interpreter::eval_string (const std::string& eval_str,
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1374 bool silent, int& parse_status,
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1375 int nargout)
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1376 {
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1377 return m_evaluator.eval_string (eval_str, silent, parse_status, nargout);
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1378 }
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1379
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1380 octave_value interpreter::eval_string (const std::string& eval_str,
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1381 bool silent, int& parse_status)
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1382 {
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1383 return m_evaluator.eval_string (eval_str, silent, parse_status);
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1384 }
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1385
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1386 octave_value_list interpreter::eval_string (const octave_value& arg,
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1387 bool silent, int& parse_status,
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1388 int nargout)
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1389 {
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1390 return m_evaluator.eval_string (arg, silent, parse_status, nargout);
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1391 }
8a15f3bace49 move eval_string inside interpreter/evaluator class John W. Eaton <jwe@octave.org> parents: 25994 diff changeset	1392
27019 6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	1393 octave_value_list interpreter::eval (const std::string& try_code,
6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	1394 int nargout)
6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	1395 {
6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	1396 return m_evaluator.eval (try_code, nargout);
6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	1397 }
6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	1398
6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	1399 octave_value_list interpreter::eval (const std::string& try_code,
6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	1400 const std::string& catch_code,
6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	1401 int nargout)
6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	1402 {
6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	1403 return m_evaluator.eval (try_code, catch_code, nargout);
6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	1404 }
6cb675912f2b move core of eval function to evaluator John W. Eaton <jwe@octave.org> parents: 27018 diff changeset	1405
27018 a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	1406 octave_value_list interpreter::evalin (const std::string& context,
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	1407 const std::string& try_code,
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	1408 int nargout)
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	1409 {
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	1410 return m_evaluator.evalin (context, try_code, nargout);
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	1411 }
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	1412
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	1413 octave_value_list interpreter::evalin (const std::string& context,
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	1414 const std::string& try_code,
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	1415 const std::string& catch_code,
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	1416 int nargout)
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	1417 {
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	1418 return m_evaluator.evalin (context, try_code, catch_code, nargout);
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	1419 }
a20ead51515d move core of evalin function to evaluator John W. Eaton <jwe@octave.org> parents: 27017 diff changeset	1420
27020 30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1421 //! Evaluate an Octave function (built-in or interpreted) and return
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1422 //! the list of result values.
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1423 //!
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1424 //! @param name The name of the function to call.
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1425 //! @param args The arguments to the function.
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1426 //! @param nargout The number of output arguments expected.
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1427 //! @return A list of output values. The length of the list is not
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1428 //! necessarily the same as @c nargout.
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1429
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1430 octave_value_list interpreter::feval (const char *name,
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1431 const octave_value_list& args,
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1432 int nargout)
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1433 {
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1434 return feval (std::string (name), args, nargout);
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1435 }
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1436
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1437 octave_value_list interpreter::feval (const std::string& name,
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1438 const octave_value_list& args,
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1439 int nargout)
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1440 {
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1441 octave_value fcn = m_symbol_table.find_function (name, args);
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1442
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1443 if (fcn.is_undefined ())
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1444 error ("feval: function '%s' not found", name.c_str ());
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1445
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1446 octave_function *of = fcn.function_value ();
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1447
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1448 return of->call (m_evaluator, nargout, args);
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1449 }
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1450
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1451 octave_value_list interpreter::feval (octave_function *fcn,
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1452 const octave_value_list& args,
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1453 int nargout)
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1454 {
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1455 if (fcn)
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1456 return fcn->call (m_evaluator, nargout, args);
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1457
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1458 return octave_value_list ();
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1459 }
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1460
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1461 octave_value_list interpreter::feval (const octave_value& val,
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1462 const octave_value_list& args,
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1463 int nargout)
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1464 {
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1465 // FIXME: do we really want to silently return an empty ovl if
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1466 // the function object is undefined? It's essentially what the
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1467 // version above that accepts a pointer to an octave_function
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1468 // object does and some code was apparently written to rely on it
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1469 // (for example, __ode15__).
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1470
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1471 if (val.is_undefined ())
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1472 return ovl ();
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1473
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1474 if (val.is_function ())
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1475 {
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1476 return feval (val.function_value (), args, nargout);
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1477 }
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1478 else if (val.is_function_handle ())
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1479 {
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1480 // This covers function handles, inline functions, and anonymous
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1481 // functions.
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1482
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1483 std::list<octave_value_list> arg_list;
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1484 arg_list.push_back (args);
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1485
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1486 // FIXME: could we make octave_value::subsref a const method?
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1487 // It would be difficult because there are instances of
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1488 // incrementing the reference count inside subsref methods,
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1489 // which means they can't be const with the current way of
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1490 // handling reference counting.
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1491
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1492 octave_value xval = val;
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1493 return xval.subsref ("(", arg_list, nargout);
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1494 }
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1495 else if (val.is_string ())
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1496 {
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1497 return feval (val.string_value (), args, nargout);
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1498 }
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1499 else
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1500 error ("feval: first argument must be a string, inline function, or a function handle");
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1501
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1502 return ovl ();
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1503 }
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1504
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1505 //! Evaluate an Octave function (built-in or interpreted) and return
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1506 //! the list of result values.
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1507 //!
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1508 //! @param args The first element of @c args is the function to call.
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1509 //! It may be the name of the function as a string, a function
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1510 //! handle, or an inline function. The remaining arguments are
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1511 //! passed to the function.
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1512 //! @param nargout The number of output arguments expected.
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1513 //! @return A list of output values. The length of the list is not
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1514 //! necessarily the same as @c nargout.
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1515
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1516 octave_value_list interpreter::feval (const octave_value_list& args,
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1517 int nargout)
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1518 {
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1519 if (args.length () == 0)
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1520 error ("feval: first argument must be a string, inline function, or a function handle");
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1521
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1522 octave_value f_arg = args(0);
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1523
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1524 octave_value_list tmp_args = args.slice (1, args.length () - 1, true);
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1525
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1526 return feval (f_arg, tmp_args, nargout);
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1527 }
30e9204de313 move feval functions to interpreter class John W. Eaton <jwe@octave.org> parents: 27019 diff changeset	1528
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1529 void interpreter::install_variable (const std::string& name,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1530 const octave_value& value, bool global)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1531 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1532 m_evaluator.install_variable (name, value, global);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1533 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1534
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1535 octave_value interpreter::global_varval (const std::string& name) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1536 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1537 return m_evaluator.global_varval (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1538 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1539
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1540 void interpreter::global_assign (const std::string& name,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1541 const octave_value& val)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1542 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1543 m_evaluator.global_assign (name, val);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1544 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1545
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1546 octave_value interpreter::top_level_varval (const std::string& name) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1547 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1548 return m_evaluator.top_level_varval (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1549 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1550
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1551 void interpreter::top_level_assign (const std::string& name,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1552 const octave_value& val)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1553 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1554 m_evaluator.top_level_assign (name, val);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1555 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1556
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1557 bool interpreter::is_variable (const std::string& name) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1558 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1559 return m_evaluator.is_variable (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1560 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1561
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1562 bool interpreter::is_local_variable (const std::string& name) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1563 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1564 return m_evaluator.is_local_variable (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1565 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1566
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1567 octave_value interpreter::varval (const std::string& name) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1568 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1569 return m_evaluator.varval (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1570 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1571
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1572 void interpreter::assign (const std::string& name,
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1573 const octave_value& val)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1574 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1575 m_evaluator.assign (name, val);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1576 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1577
27014 daab1b311a98 move core of assignin function to evaluator John W. Eaton <jwe@octave.org> parents: 26826 diff changeset	1578 void interpreter::assignin (const std::string& context,
daab1b311a98 move core of assignin function to evaluator John W. Eaton <jwe@octave.org> parents: 26826 diff changeset	1579 const std::string& name,
daab1b311a98 move core of assignin function to evaluator John W. Eaton <jwe@octave.org> parents: 26826 diff changeset	1580 const octave_value& val)
daab1b311a98 move core of assignin function to evaluator John W. Eaton <jwe@octave.org> parents: 26826 diff changeset	1581 {
daab1b311a98 move core of assignin function to evaluator John W. Eaton <jwe@octave.org> parents: 26826 diff changeset	1582 m_evaluator.assignin (context, name, val);
daab1b311a98 move core of assignin function to evaluator John W. Eaton <jwe@octave.org> parents: 26826 diff changeset	1583 }
daab1b311a98 move core of assignin function to evaluator John W. Eaton <jwe@octave.org> parents: 26826 diff changeset	1584
27017 24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	1585 void interpreter::source_file (const std::string& file_name,
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	1586 const std::string& context, bool verbose,
27507 2d537a089e5d eliminate warn_for argument for source_file and parse_fcn_file functions John W. Eaton <jwe@octave.org> parents: 27506 diff changeset	1587 bool require_file)
27017 24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	1588 {
27507 2d537a089e5d eliminate warn_for argument for source_file and parse_fcn_file functions John W. Eaton <jwe@octave.org> parents: 27506 diff changeset	1589 m_evaluator.source_file (file_name, context, verbose, require_file);
27017 24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	1590 }
24b7e6326e26 move parse_fcn_file to interpreter; source_file to evaluator John W. Eaton <jwe@octave.org> parents: 27016 diff changeset	1591
26661 cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1592 bool interpreter::at_top_level (void) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1593 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1594 return m_evaluator.at_top_level ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1595 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1596
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1597 bool interpreter::isglobal (const std::string& name) const
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1598 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1599 return m_evaluator.is_global (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1600 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1601
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1602 octave_value interpreter::find (const std::string& name)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1603 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1604 return m_evaluator.find (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1605 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1606
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1607 void interpreter::clear_all (bool force)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1608 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1609 m_evaluator.clear_all (force);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1610 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1611
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1612 void interpreter::clear_objects (void)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1613 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1614 m_evaluator.clear_objects ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1615 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1616
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1617 void interpreter::clear_variable (const std::string& name)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1618 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1619 m_evaluator.clear_variable (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1620 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1621
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1622 void interpreter::clear_variable_pattern (const std::string& pattern)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1623 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1624 m_evaluator.clear_variable_pattern (pattern);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1625 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1626
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1627 void interpreter::clear_variable_regexp (const std::string& pattern)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1628 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1629 m_evaluator.clear_variable_regexp (pattern);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1630 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1631
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1632 void interpreter::clear_variables (void)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1633 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1634 m_evaluator.clear_variables ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1635 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1636
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1637 void interpreter::clear_global_variable (const std::string& name)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1638 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1639 m_evaluator.clear_global_variable (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1640 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1641
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1642 void interpreter::clear_global_variable_pattern (const std::string& pattern)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1643 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1644 m_evaluator.clear_global_variable_pattern (pattern);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1645 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1646
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1647 void interpreter::clear_global_variable_regexp (const std::string& pattern)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1648 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1649 m_evaluator.clear_global_variable_regexp (pattern);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1650 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1651
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1652 void interpreter::clear_global_variables (void)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1653 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1654 m_evaluator.clear_global_variables ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1655 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1656
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1657 void interpreter::clear_functions (bool force)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1658 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1659 m_symbol_table.clear_functions (force);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1660 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1661
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1662 void interpreter::clear_function (const std::string& name)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1663 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1664 m_symbol_table.clear_function (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1665 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1666
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1667 void interpreter::clear_symbol (const std::string& name)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1668 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1669 m_evaluator.clear_symbol (name);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1670 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1671
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1672 void interpreter::clear_function_pattern (const std::string& pat)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1673 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1674 m_symbol_table.clear_function_pattern (pat);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1675 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1676
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1677 void interpreter::clear_function_regexp (const std::string& pat)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1678 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1679 m_symbol_table.clear_function_regexp (pat);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1680 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1681
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1682 void interpreter::clear_symbol_pattern (const std::string& pat)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1683 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1684 return m_evaluator.clear_symbol_pattern (pat);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1685 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1686
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1687 void interpreter::clear_symbol_regexp (const std::string& pat)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1688 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1689 return m_evaluator.clear_symbol_regexp (pat);
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1690 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1691
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1692 std::list<std::string> interpreter::global_variable_names (void)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1693 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1694 return m_evaluator.global_variable_names ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1695 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1696
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1697 std::list<std::string> interpreter::variable_names (void)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1698 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1699 return m_evaluator.variable_names ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1700 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1701
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1702 std::list<std::string> interpreter::user_function_names (void)
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1703 {
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1704 return m_symbol_table.user_function_names ();
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1705 }
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	1706
27016 9b261300a001 move file-scope static autoload map variable and functions to evaluator John W. Eaton <jwe@octave.org> parents: 27015 diff changeset	1707 std::list<std::string> interpreter::autoloaded_functions (void) const
9b261300a001 move file-scope static autoload map variable and functions to evaluator John W. Eaton <jwe@octave.org> parents: 27015 diff changeset	1708 {
9b261300a001 move file-scope static autoload map variable and functions to evaluator John W. Eaton <jwe@octave.org> parents: 27015 diff changeset	1709 return m_evaluator.autoloaded_functions ();
9b261300a001 move file-scope static autoload map variable and functions to evaluator John W. Eaton <jwe@octave.org> parents: 27015 diff changeset	1710 }
9b261300a001 move file-scope static autoload map variable and functions to evaluator John W. Eaton <jwe@octave.org> parents: 27015 diff changeset	1711
27471 fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	1712 void interpreter::handle_exception (const execution_exception& e)
fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	1713 {
fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	1714 m_error_system.save_exception (e);
fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	1715
fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	1716 // FIXME: use a separate stream instad of std::cerr directly so that
fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	1717 // error messages can be redirected more easily? Pass the message
fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	1718 // to an event manager function?
fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	1719 m_error_system.display_exception (e, std::cerr);
fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	1720
fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	1721 recover_from_exception ();
fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	1722 }
fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	1723
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	1724 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	1725 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23694 diff changeset	1726 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	1727 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	1728 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	1729 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	1730 catch_interrupts ();
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1731 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1732
27542 b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	1733 void interpreter::mark_for_deletion (const std::string& file)
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	1734 {
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	1735 m_tmp_files.insert (file);
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	1736 }
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	1737
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	1738 void interpreter::cleanup_tmp_files (void)
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	1739 {
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	1740 m_tmp_files.cleanup ();
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	1741 }
b8aa62c1deb5 eliminate global tmp_files variable John W. Eaton <jwe@octave.org> parents: 27532 diff changeset	1742
27588 f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27587 diff changeset	1743 void interpreter::quit (int exit_status, bool force, bool confirm)
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1744 {
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1745 if (! force)
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1746 {
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1747 try
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1748 {
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1749 // Attempt to execute finish.m. If it throws an
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1750 // exception, cancel quitting.
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1751
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1752 bool cancel = false;
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1753
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1754 if (symbol_exist ("finish.m", "file"))
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1755 {
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1756 unwind_protect_var<bool> upv1 (m_executing_finish_script, true);
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1757 unwind_protect_var<bool> upv2 (m_cancel_quit);
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1758
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1759 evalin ("base", "finish", 0);
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1760
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1761 cancel = m_cancel_quit;
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1762 }
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1763
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1764 if (cancel)
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1765 return;
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1766
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1767 // Check for confirmation.
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1768
27588 f0e3f3e28a8e move qt_interpreter_events object from interpreter_qobject to octave_qobject John W. Eaton <jwe@octave.org> parents: 27587 diff changeset	1769 if (confirm && ! m_event_manager.confirm_shutdown ())
27587 494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1770 return;
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1771 }
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1772 catch (const execution_exception& ee)
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1773 {
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1774 handle_exception (ee);
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1775
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1776 return;
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1777 }
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1778 }
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1779
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1780 throw exit_exception (exit_status);
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1781 }
494d6243c188 improve compatibility of quit function John W. Eaton <jwe@octave.org> parents: 27545 diff changeset	1782
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1783 // 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	1784
23111 252975fdc444 more refactoring of interpreter and application classes John W. Eaton <jwe@octave.org> parents: 23110 diff changeset	1785 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	1786
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1787 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	1788 {
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1789 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	1790 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1791
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1792 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	1793 {
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1794 bool found = false;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1795
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1796 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	1797 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	1798 {
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1799 if (*it == fname)
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1800 {
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1801 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	1802 found = true;
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1803 break;
af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1804 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1805 }
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1806
23110 af48d8be62b3 move recover_from_exception and atexit functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 23109 diff changeset	1807 return found;
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1808 }
23723 ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1809
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1810 // 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	1811
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1812 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	1813 {
25407 ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25404 diff changeset	1814 m_input_system.PS1 (">> ");
ab10403a0b50 new input_system class to manage user input for the interpreter John W. Eaton <jwe@octave.org> parents: 25404 diff changeset	1815 m_input_system.PS2 ("");
23723 ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1816
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1817 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	1818
25993 f75bb9d659e0 eliminate global and file-scope static variables from load-save.cc (bug #54571) John W. Eaton <jwe@octave.org> parents: 25488 diff changeset	1819 m_load_save_system.crash_dumps_octave_core (false);
f75bb9d659e0 eliminate global and file-scope static variables from load-save.cc (bug #54571) John W. Eaton <jwe@octave.org> parents: 25488 diff changeset	1820 m_load_save_system.save_default_options ("-mat-binary");
f75bb9d659e0 eliminate global and file-scope static variables from load-save.cc (bug #54571) John W. Eaton <jwe@octave.org> parents: 25488 diff changeset	1821
25994 f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc John W. Eaton <jwe@octave.org> parents: 25993 diff changeset	1822 m_history_system.timestamp_format_string ("%%-- %D %I:%M %p --%%");
f881d3e271d2 eliminate global and file-scope static variables in oct-hist.cc John W. Eaton <jwe@octave.org> parents: 25993 diff changeset	1823
27160 6b0c61a5a0f0 move global error configuration and status variables inside a class John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	1824 m_error_system.beep_on_error (true);
23723 ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1825 Fconfirm_recursive_rmdir (octave_value (false));
25993 f75bb9d659e0 eliminate global and file-scope static variables from load-save.cc (bug #54571) John W. Eaton <jwe@octave.org> parents: 25488 diff changeset	1826
23723 ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1827 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	1828 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	1829 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	1830 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	1831 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	1832 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	1833
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1834 disable_warning ("Octave:abbreviated-property-match");
27517 85ad4689aa05 Add warning when non-scalar argument presented to ':' range operator. Rik <rik@octave.org> parents: 27509 diff changeset	1835 disable_warning ("Octave:colon-nonscalar-argument");
23723 ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class John W. Eaton <jwe@octave.org> parents: 23721 diff changeset	1836 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	1837 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	1838 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	1839 }
25345 ce6f7a5cd68e avoid global access of load path in interpreter class John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	1840
ce6f7a5cd68e avoid global access of load path in interpreter class John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	1841 void interpreter::execute_pkg_add (const std::string& dir)
ce6f7a5cd68e avoid global access of load path in interpreter class John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	1842 {
ce6f7a5cd68e avoid global access of load path in interpreter class John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	1843 try
ce6f7a5cd68e avoid global access of load path in interpreter class John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	1844 {
ce6f7a5cd68e avoid global access of load path in interpreter class John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	1845 m_load_path.execute_pkg_add (dir);
ce6f7a5cd68e avoid global access of load path in interpreter class John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	1846 }
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27020 diff changeset	1847 catch (const interrupt_exception&)
25345 ce6f7a5cd68e avoid global access of load path in interpreter class John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	1848 {
27474 3fec8e9fa2aa make recover_from_exception a member function John W. Eaton <jwe@octave.org> parents: 27471 diff changeset	1849 recover_from_exception ();
25345 ce6f7a5cd68e avoid global access of load path in interpreter class John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	1850 }
27471 fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	1851 catch (const execution_exception& e)
25345 ce6f7a5cd68e avoid global access of load path in interpreter class John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	1852 {
27471 fd32c1a9b1bd revamp error handling John W. Eaton <jwe@octave.org> parents: 27409 diff changeset	1853 handle_exception (e);
25345 ce6f7a5cd68e avoid global access of load path in interpreter class John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	1854 }
ce6f7a5cd68e avoid global access of load path in interpreter class John W. Eaton <jwe@octave.org> parents: 25184 diff changeset	1855 }
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: diff changeset	1856 }

Mercurial > octave

annotate libinterp/corefcn/interpreter.cc @ 27588:f0e3f3e28a8e