octave: libinterp/octave.h annotate

annotate libinterp/octave.h @ 23102:373771419d51

refactor interpreter::execute * octave.h, octave.cc (application::m_have_eval_option_code): New data member. (application::have_eval_option_code): New function. (application::init): Initialize m_have_eval_option_code. * interpreter.h, interpreter.cc: Use const reference symbol to refer to application options. (interpreter::execute_eval_option_code, interpreter::execute_command_line_file): Now private. Eliminate arguments. (interpreter::execute_startup_files): Make member function from file scope static function. Eliminate arguments. (display_startup_message): New function. (execute_internal): Refactor. (execute_command_line_file): Use unwind_protect to restore application arguments.

author	John W. Eaton <jwe@octave.org>
date	Fri, 27 Jan 2017 11:13:47 -0500
parents	9f406f0b36da
children	252975fdc444

rev	line source
4113 f4bf4833e6c7 [project @ 2002-10-17 19:58:42 by jwe] jwe parents: diff changeset	1 /*
f4bf4833e6c7 [project @ 2002-10-17 19:58:42 by jwe] jwe parents: diff changeset	2
22323 bac0d6f07a3e maint: Update copyright notices for 2016. John W. Eaton <jwe@octave.org> parents: 22094 diff changeset	3 Copyright (C) 2002-2016 John W. Eaton
4113 f4bf4833e6c7 [project @ 2002-10-17 19:58:42 by jwe] jwe parents: diff changeset	4
f4bf4833e6c7 [project @ 2002-10-17 19:58:42 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
f4bf4833e6c7 [project @ 2002-10-17 19:58:42 by jwe] jwe parents: diff changeset	6
f4bf4833e6c7 [project @ 2002-10-17 19:58:42 by jwe] jwe parents: 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: 22407 diff changeset	8 under the terms of the GNU General Public License as published by
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	9 the Free Software Foundation; either version 3 of the License, or
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	10 (at your option) any later version.
4113 f4bf4833e6c7 [project @ 2002-10-17 19:58:42 by jwe] jwe parents: diff changeset	11
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 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: 22407 diff changeset	13 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22407 diff changeset	15 GNU General Public License for more details.
4113 f4bf4833e6c7 [project @ 2002-10-17 19:58:42 by jwe] jwe parents: diff changeset	16
f4bf4833e6c7 [project @ 2002-10-17 19:58:42 by jwe] jwe parents: diff changeset	17 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6109 diff changeset	18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6109 diff changeset	19 <http://www.gnu.org/licenses/>.
4113 f4bf4833e6c7 [project @ 2002-10-17 19:58:42 by jwe] jwe parents: diff changeset	20
f4bf4833e6c7 [project @ 2002-10-17 19:58:42 by jwe] jwe parents: diff changeset	21 */
f4bf4833e6c7 [project @ 2002-10-17 19:58:42 by jwe] jwe parents: diff changeset	22
20791 f7084eae3318 maint: Use Octave coding conventions for #if statements. Rik <rik@octave.org> parents: 19697 diff changeset	23 #if ! defined (octave_octave_h)
4113 f4bf4833e6c7 [project @ 2002-10-17 19:58:42 by jwe] jwe parents: diff changeset	24 #define octave_octave_h 1
f4bf4833e6c7 [project @ 2002-10-17 19:58:42 by jwe] jwe parents: diff changeset	25
21244 1473547f50f5 include octave-config.h in public header files John W. Eaton <jwe@octave.org> parents: 20791 diff changeset	26 #include "octave-config.h"
1473547f50f5 include octave-config.h in public header files John W. Eaton <jwe@octave.org> parents: 20791 diff changeset	27
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21244 diff changeset	28 #if defined (__cplusplus)
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	29
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	30 #include <list>
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	31 #include <string>
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	32
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	33 #include <str-vec.h>
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	34
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	35 namespace octave
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	36 {
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	37 // Command line arguments. See also options-usage.h.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	38
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	39 class OCTINTERP_API cmdline_options
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	40 {
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	41 public:
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	42
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	43 cmdline_options (void);
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	44
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	45 cmdline_options (int argc, char **argv);
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	46
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	47 cmdline_options (const cmdline_options& opts);
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	48
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	49 cmdline_options& operator = (const cmdline_options& opts);
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	50
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	51 bool force_gui (void) const { return m_force_gui; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	52 bool forced_interactive (void) const { return m_forced_interactive; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	53 bool forced_line_editing (void) const { return m_forced_line_editing; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	54 bool inhibit_startup_message (void) const { return m_inhibit_startup_message; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	55 bool line_editing (void) const { return m_line_editing; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	56 bool no_gui (void) const { return m_no_gui; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	57 bool no_window_system (void) const { return m_no_window_system; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	58 bool persist (void) const { return m_persist; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	59 bool read_history_file (void) const { return m_read_history_file; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	60 bool read_init_files (void) const { return m_read_init_files; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	61 bool read_site_files (void) const { return m_read_site_files; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	62 bool set_initial_path (void) const { return m_set_initial_path; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	63 bool traditional (void) const { return m_traditional; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	64 bool verbose_flag (void) const { return m_verbose_flag; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	65 std::string code_to_eval (void) const { return m_code_to_eval; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	66 std::list<std::string> command_line_path (void) const { return m_command_line_path; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	67 std::string exec_path (void) const { return m_exec_path; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	68 std::string image_path (void) const { return m_image_path; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	69 string_vector all_args (void) const { return m_all_args; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	70 string_vector remaining_args (void) const { return m_remaining_args; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	71
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	72 void force_gui (bool arg) { m_force_gui = arg; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	73 void forced_line_editing (bool arg) { m_forced_line_editing = arg; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	74 void forced_interactive (bool arg) { m_forced_interactive = arg; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	75 void inhibit_startup_message (bool arg) { m_inhibit_startup_message = arg; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	76 void line_editing (bool arg) { m_line_editing = arg; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	77 void no_gui (bool arg) { m_no_gui = arg; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	78 void no_window_system (bool arg) { m_no_window_system = arg; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	79 void persist (bool arg) { m_persist = arg; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	80 void read_history_file (bool arg) { m_read_history_file = arg; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	81 void read_init_files (bool arg) { m_read_init_files = arg; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	82 void read_site_files (bool arg) { m_read_site_files = arg; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	83 void set_initial_path (bool arg) { m_set_initial_path = arg; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	84 void traditional (bool arg) { m_traditional = arg; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	85 void verbose_flag (bool arg) { m_verbose_flag = arg; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	86 void code_to_eval (const std::string& arg) { m_code_to_eval = arg; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	87 void command_line_path (const std::list<std::string>& arg) { m_command_line_path = arg; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	88 void exec_path (const std::string& arg) { m_exec_path = arg; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	89 void image_path (const std::string& arg) { m_image_path = arg; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	90 void all_args (const string_vector& arg) { m_all_args = arg; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	91 void remaining_args (const string_vector& arg) { m_remaining_args = arg; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	92
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	93 private:
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	94
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	95 // If TRUE, force the GUI to start.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	96 // (--force-gui)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	97 bool m_force_gui = false;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	98
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	99 // TRUE means the user forced this shell to be interactive.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	100 // (--interactive, -i)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	101 bool m_forced_interactive = false;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	102
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	103 // If TRUE, force readline command line editing.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	104 // (--line-editing)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	105 bool m_forced_line_editing = false;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	106
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	107 // TRUE means we don't print the usual startup message.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	108 // (--quiet; --silent; -q)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	109 bool m_inhibit_startup_message = false;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	110
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	111 // TRUE means we are using readline.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	112 // (--no-line-editing)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	113 bool m_line_editing = true;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	114
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	115 // If TRUE don't start the GUI.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	116 // (--no-gui)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	117 bool m_no_gui = false;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	118
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	119 // If TRUE, ignore the window system even if it is available.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	120 // (--no-window-system, -W)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	121 bool m_no_window_system = false;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	122
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	123 // If TRUE, don't exit after evaluating code given by --eval option.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	124 // (--persist)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	125 bool m_persist = false;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	126
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	127 // If TRUE, initialize history list from saved history file.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	128 // (--no-history; -H)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	129 bool m_read_history_file = true;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	130
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	131 // TRUE means we read ~/.octaverc and ./.octaverc.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	132 // (--norc; --no-init-file; -f)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	133 bool m_read_init_files = true;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	134
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	135 // TRUE means we read the site-wide octaverc files.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	136 // (--norc; --no-site-file; -f)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	137 bool m_read_site_files = true;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	138
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	139 // TRUE means we set the initial path to configured defaults.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	140 // (--no-init-path)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	141 bool m_set_initial_path = true;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	142
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	143 // If TRUE use traditional (maximally MATLAB compatible) settings
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	144 // (--traditional)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	145 bool m_traditional = false;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	146
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	147 // If TRUE, print verbose info in some cases.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	148 // (--verbose; -V)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	149 bool m_verbose_flag = false;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	150
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	151 // The code to evaluate at startup
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	152 // (--eval CODE)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	153 std::string m_code_to_eval;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	154
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	155 // The value of "path" specified on the command line.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	156 // (--path; -p)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	157 std::list<std::string> m_command_line_path;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	158
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	159 // The value for "EXEC_PATH" specified on the command line.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	160 // (--exec-path)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	161 std::string m_exec_path;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	162
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	163 // The value for "IMAGE_PATH" specified on the command line.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	164 // (--image-path)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	165 std::string m_image_path;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	166
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	167 // All arguments passed to the argc, argv constructor.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	168 string_vector m_all_args;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	169
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	170 // Arguments remaining after parsing.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	171 string_vector m_remaining_args;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	172 };
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	173
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	174 // The application object contains a pointer to the current
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	175 // interpreter and the interpreter contains a pointer back to the
22094 9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: 22089 diff changeset	176 // application context so we need a forward declaration for one (or
9203833cab7d move new interpreter class to separate file John W. Eaton <jwe@octave.org> parents: 22089 diff changeset	177 // both) of them...
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	178
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	179 class interpreter;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	180
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	181 // Base class for an Octave application.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	182
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	183 class OCTINTERP_API application
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	184 {
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	185 public:
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	186
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	187 application (const cmdline_options& opts = cmdline_options ());
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	188
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	189 application (int argc, char **argv);
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	190
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	191 // No copying, at least not yet...
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	192
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	193 application (const application&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	194
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	195 application& operator = (const application&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	196
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	197 virtual ~application (void);
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	198
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	199 void set_program_names (const std::string& pname);
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	200
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	201 void intern_argv (const string_vector& args);
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	202
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	203 cmdline_options options (void) const { return m_options; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	204
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23087 diff changeset	205 bool have_eval_option_code (void) const { return m_have_eval_option_code; }
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23087 diff changeset	206
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	207 bool have_script_file (void) const { return m_have_script_file; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	208
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	209 bool is_octave_program (void) const { return m_is_octave_program; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	210
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	211 virtual void create_interpreter (void);
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	212
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	213 virtual int execute_interpreter (void);
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	214
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	215 virtual int execute (void) = 0;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	216
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	217 virtual bool gui_running (void) const { return false; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	218 virtual void gui_running (bool) { }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	219
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	220 void program_invocation_name (const std::string& nm) { m_program_invocation_name = nm; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	221
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	222 void program_name (const std::string& nm) { m_program_name = nm; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	223
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	224 void forced_interactive (bool arg) { m_options.forced_interactive (arg); }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	225
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	226 void interactive (bool arg);
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	227
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	228 // Should be an error if instance is 0.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	229 static application *app (void) { return instance; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	230
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	231 static std::string program_invocation_name (void) { return instance->m_program_invocation_name; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	232
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	233 static std::string program_name (void) { return instance->m_program_name; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	234
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	235 static string_vector argv (void) { return instance->m_argv; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	236
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	237 static bool is_gui_running (void) { return instance->gui_running (); }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	238
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	239 static interpreter *the_interpreter (void) { return instance->m_interpreter; }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	240
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	241 // Convenience functions.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	242
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	243 static bool forced_interactive (void);
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	244 static bool interactive (void);
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	245
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	246 private:
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	247
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	248 // The application instance; There should be only one.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	249 static application *instance;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	250
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	251 void init (void);
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	252
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	253 protected:
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	254
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	255 // The name used to invoke Octave.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	256 std::string m_program_invocation_name;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	257
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	258 // The last component of octave_program_invocation_name.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	259 std::string m_program_name;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	260
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	261 // The current argument vector (may change if we are running a
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	262 // script with --persist because after the script is done, the
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	263 // arguments revert to the full list given to the octave
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	264 // interpreter at startup.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	265 string_vector m_argv;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	266
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	267 cmdline_options m_options;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	268
23102 373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23087 diff changeset	269 // TRUE means we have --eval CODE
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23087 diff changeset	270 bool m_have_eval_option_code = false;
373771419d51 refactor interpreter::execute John W. Eaton <jwe@octave.org> parents: 23087 diff changeset	271
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	272 // TRUE if there is a command line argument that looks like the
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	273 // name of a file to execute.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	274 bool m_have_script_file = false;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	275
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	276 // TRUE if this is a program and no interpreter and interaction is
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	277 // needed. For example, an octave program with shebang line, or code
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	278 // from eval without persist.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	279 bool m_is_octave_program = false;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	280
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	281 // If TRUE, the GUI should be started.
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	282 bool m_gui_running = false;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	283
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	284 interpreter *m_interpreter = 0;
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	285 };
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	286
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	287 class OCTINTERP_API cli_application : public application
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	288 {
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	289 public:
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	290
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	291 cli_application (const cmdline_options& opts = cmdline_options ())
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	292 : application (opts)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	293 { }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	294
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	295 cli_application (int argc, char **argv)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	296 : application (argc, argv)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	297 { }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	298
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	299 // No copying, at least not yet...
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	300
22865 89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	301 cli_application (const cli_application&) = delete;
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	302
22865 89756f2f085b use c++11 style for deleting default copy constructor and assignment operator John W. Eaton <jwe@octave.org> parents: 22755 diff changeset	303 cli_application& operator = (const cli_application&) = delete;
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	304
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	305 ~cli_application (void) = default;
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	306
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	307 int execute (void);
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	308 };
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	309
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	310 class OCTINTERP_API embedded_application : public application
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	311 {
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	312 public:
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	313
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	314 embedded_application (const cmdline_options& opts = cmdline_options ())
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	315 : application (opts)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	316 { }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	317
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	318 embedded_application (int argc, char **argv)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	319 : application (argc, argv)
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	320 { }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	321
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	322 // No copying, at least not yet...
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	323
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	324 embedded_application (const embedded_application&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	325
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	326 embedded_application& operator = (const embedded_application&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22868 diff changeset	327
22868 87e3163f6c87 use c++11 "= default" syntax for declaration of trivial destructors John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	328 ~embedded_application (void) = default;
22089 c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	329
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	330 void create_interpreter (void);
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	331
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	332 int execute (void);
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	333 };
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	334 }
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	335
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	336 #endif
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	337
c2c668b3051b use classes for octave application and interpreter John W. Eaton <jwe@octave.org> parents: 21724 diff changeset	338 #if defined (__cplusplus)
4113 f4bf4833e6c7 [project @ 2002-10-17 19:58:42 by jwe] jwe parents: diff changeset	339 extern "C" {
f4bf4833e6c7 [project @ 2002-10-17 19:58:42 by jwe] jwe parents: diff changeset	340 #endif
f4bf4833e6c7 [project @ 2002-10-17 19:58:42 by jwe] jwe parents: diff changeset	341
23087 9f406f0b36da rework clean_up_and_exit (bug #50068) John W. Eaton <jwe@octave.org> parents: 23084 diff changeset	342 OCTAVE_DEPRECATED ("see the Octave documentation for other options")
6109 c68896f193e3 [project @ 2006-10-27 02:16:18 by jwe] jwe parents: 5307 diff changeset	343 extern OCTINTERP_API int octave_main (int argc, char **argv, int embedded);
4113 f4bf4833e6c7 [project @ 2002-10-17 19:58:42 by jwe] jwe parents: diff changeset	344
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21244 diff changeset	345 #if defined (__cplusplus)
4113 f4bf4833e6c7 [project @ 2002-10-17 19:58:42 by jwe] jwe parents: diff changeset	346 }
f4bf4833e6c7 [project @ 2002-10-17 19:58:42 by jwe] jwe parents: diff changeset	347 #endif
f4bf4833e6c7 [project @ 2002-10-17 19:58:42 by jwe] jwe parents: diff changeset	348
f4bf4833e6c7 [project @ 2002-10-17 19:58:42 by jwe] jwe parents: diff changeset	349 #endif

Mercurial > octave

annotate libinterp/octave.h @ 23102:373771419d51