Mercurial > octave

annotate libinterp/parse-tree/pt-eval.cc @ 32937:e6814a319d4e bytecode-interpreter

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge default to bytecode-interpreter
author John W. Eaton <jwe@octave.org>
date Tue, 06 Feb 2024 00:29:39 -0500
parents 3904d7116c8c 0b5f3219b650
children 7e8b5dd93fba
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
2 //
32632
2e484f9f1f18 maint: update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents: 32589
diff changeset
3 // Copyright (C) 2009-2024 The Octave Project Developers
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
4 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
7 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
9 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
14 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
19 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
23 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
24 ////////////////////////////////////////////////////////////////////////
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25
21724
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents: 21542
diff changeset
26 #if defined (HAVE_CONFIG_H)
21301
40de9f8f23a6 Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents: 21211
diff changeset
27 # include "config.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 #endif
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 #include <cctype>
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31
29619
5cf985f5760a move get_line_and_eval to parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 29572
diff changeset
32 #include <condition_variable>
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33 #include <iostream>
25438
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible
John W. Eaton <jwe@octave.org>
parents: 25407
diff changeset
34 #include <list>
29619
5cf985f5760a move get_line_and_eval to parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 29572
diff changeset
35 #include <mutex>
25438
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible
John W. Eaton <jwe@octave.org>
parents: 25407
diff changeset
36 #include <string>
29619
5cf985f5760a move get_line_and_eval to parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 29572
diff changeset
37 #include <thread>
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38
23723
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
39 #include "cmd-edit.h"
25360
bc5f225bc578 eliminate some global accesses to the breakpoint table
John W. Eaton <jwe@octave.org>
parents: 25337
diff changeset
40 #include "file-ops.h"
27016
9b261300a001 move file-scope static autoload map variable and functions to evaluator
John W. Eaton <jwe@octave.org>
parents: 27015
diff changeset
41 #include "file-stat.h"
28804
3719f5d452d4 refactor implementation of END indexing in interpreter (bug #58953)
John W. Eaton <jwe@octave.org> and Fernando Alvarruiz
parents: 28726
diff changeset
42 #include "lo-array-errwarn.h"
27100
b453b586da16 improve error message when indexing undefined object with "end" (bug #33637)
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
43 #include "lo-ieee.h"
23723
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
44 #include "oct-env.h"
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
45
23137
334119c390b3 move bp_table class to separate file
John W. Eaton <jwe@octave.org>
parents: 23110
diff changeset
46 #include "bp-table.h"
22091
0f6fc2ec3b1a move call_stack class to a separate file
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
47 #include "call-stack.h"
26975
de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451)
John W. Eaton <jwe@octave.org>
parents: 26924
diff changeset
48 #include "cdef-manager.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49 #include "defun.h"
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
50 #include "error.h"
21100
e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents: 20962
diff changeset
51 #include "errwarn.h"
27263
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27261
diff changeset
52 #include "event-manager.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
53 #include "input.h"
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23587
diff changeset
54 #include "interpreter-private.h"
22094
9203833cab7d move new interpreter class to separate file
John W. Eaton <jwe@octave.org>
parents: 22091
diff changeset
55 #include "interpreter.h"
30919
4ed7dfe28584 move eval of anon fcn handles and built-in and mex functions to pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 30896
diff changeset
56 #include "mex-private.h"
27037
8408acb7ca4f make dbup/dbdown work again (bug #56020)
John W. Eaton <jwe@octave.org>
parents: 27019
diff changeset
57 #include "octave.h"
26769
2f847e3e8d6b split classdef into multiple smaller source files
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
58 #include "ov-classdef.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
59 #include "ov-fcn-handle.h"
30919
4ed7dfe28584 move eval of anon fcn handles and built-in and mex functions to pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 30896
diff changeset
60 #include "ov-mex-fcn.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
61 #include "ov-usr-fcn.h"
23435
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
62 #include "ov-re-sparse.h"
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
63 #include "ov-cx-sparse.h"
26686
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26662
diff changeset
64 #include "parse.h"
23435
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
65 #include "profiler.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
66 #include "pt-all.h"
26661
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects
John W. Eaton <jwe@octave.org>
parents: 26512
diff changeset
67 #include "pt-anon-scopes.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
68 #include "pt-eval.h"
23435
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
69 #include "pt-tm-const.h"
28430
5bfa8e018704 store local init vars for anonymous functions in handle, not function object
John W. Eaton <jwe@octave.org>
parents: 28429
diff changeset
70 #include "stack-frame.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
71 #include "symtab.h"
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
72 #include "unwind-prot.h"
23723
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
73 #include "utils.h"
23435
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
74 #include "variables.h"
32593
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
75 #if defined (OCTAVE_ENABLE_BYTECODE_EVALUATOR)
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
76 # include "pt-bytecode-vm.h"
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
77 # include "pt-bytecode-walk.h"
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
78 #endif
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
79
31605
e88a07dec498 maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents: 30919
diff changeset
80 OCTAVE_BEGIN_NAMESPACE(octave)
29960
939bef0b66e0 merge "namespace octave" and OCTAVE_NAMESPACE_BEGIN/END blocks
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
81
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
82 // Normal evaluator.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
83
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
84 class debugger
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
85 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
86 public:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
87
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
88 enum execution_mode
31607
aac27ad79be6 maint: Re-indent code after switch to using namespace macros.
Rik <rik@octave.org>
parents: 31605
diff changeset
89 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
90 EX_NORMAL = 0,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
91 EX_CONTINUE = 1,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
92 EX_QUIT = 2,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
93 EX_QUIT_ALL = 3
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
94 };
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
95
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
96 debugger (interpreter& interp, std::size_t level)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
97 : m_interpreter (interp), m_level (level),
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
98 m_execution_mode (EX_NORMAL), m_in_debug_repl (false)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
99 { }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
100
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
101 int server_loop ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
102
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
103 void repl (const std::string& prompt = "debug> ");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
104
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
105 bool in_debug_repl () const { return m_in_debug_repl; }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
106
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
107 void dbcont () { m_execution_mode = EX_CONTINUE; }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
108
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
109 void dbquit (bool all = false)
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
110 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
111 if (all)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
112 m_execution_mode = EX_QUIT_ALL;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
113 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
114 m_execution_mode = EX_QUIT;
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
115 }
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
116
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
117 bool quitting_debugger () const;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
118
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
119 private:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
120
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
121 interpreter& m_interpreter;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
122
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
123 std::size_t m_level;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
124 execution_mode m_execution_mode;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
125 bool m_in_debug_repl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
126 };
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
127
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
128 // FIXME: Could the debugger server_loop and repl functions be merged
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
129 // with the corresponding tree_evaluator functions or do they need to
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
130 // remain separate? They perform nearly the same functions.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
131
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
132 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
133 debugger::server_loop ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
134 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
135 // Process events from the event queue.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
136
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
137 tree_evaluator& tw = m_interpreter.get_evaluator ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
138
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
139 void (tree_evaluator::*server_mode_fptr) (bool)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
140 = &tree_evaluator::server_mode;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
141 unwind_action act (server_mode_fptr, &tw, true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
142
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
143 int exit_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
144
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
145 do
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
146 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
147 if (m_execution_mode == EX_CONTINUE || tw.dbstep_flag ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
148 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
149
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
150 if (quitting_debugger ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
151 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
152
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
153 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
154 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
155 // FIXME: Should we call octave_quit in the octave::sleep
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
156 // and/or command_editor::run_event_hooks functions?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
157
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
158 octave_quit ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
159
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
160 // FIXME: Running the event queue should be decoupled from
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
161 // the command_editor.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
162
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
163 // FIXME: Is it OK to use command_editor::run_event_hooks
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
164 // here? It may run more than one queued function per call,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
165 // and it seems that the checks at the top of the loop
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
166 // probably need to be done after each individual event
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
167 // function is executed. For now, maybe the simplest thing
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
168 // would be to pass a predicate function (lambda expression)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
169 // to the command_editor::run_event_hooks and have it check
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
170 // that and break out of the eval loop(s) if the condition
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
171 // is met?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
172
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
173 // FIXME: We should also use a condition variable to manage
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
174 // the execution of entries in the queue and eliminate the
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
175 // need for the busy-wait loop.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
176
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
177 command_editor::run_event_hooks ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
178
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
179 release_unreferenced_dynamic_libraries ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
180
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
181 sleep (0.1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
182 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
183 catch (const interrupt_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
184 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
185 octave_interrupt_state = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
186 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
187
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
188 // Required newline when the user does Ctrl+C at the prompt.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
189 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
190 octave_stdout << "\n";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
191 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
192 catch (const index_exception& e)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
193 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
194 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
195
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
196 std::cerr << "error: unhandled index exception: "
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
197 << e.message () << " -- trying to return to prompt"
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
198 << std::endl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
199 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
200 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
201 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
202 error_system& es = m_interpreter.get_error_system ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
203
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
204 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
205 es.display_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
206
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
207 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
208 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
209 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
210 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
211 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
212 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
213 // We should exit with a nonzero status.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
214 exit_status = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
215 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
216 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
217 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
218 catch (const quit_debug_exception& qde)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
219 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
220 if (qde.all ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
221 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
222
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
223 // Continue in this debug level.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
224 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
225 catch (const std::bad_alloc&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
226 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
227 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
228
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
229 std::cerr << "error: out of memory -- trying to return to prompt"
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
230 << std::endl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
231 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
232 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
233 while (exit_status == 0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
234
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
235 if (exit_status == EOF)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
236 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
237 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
238 octave_stdout << "\n";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
239
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
240 exit_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
241 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
242
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
243 return exit_status;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
244 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
245
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
246 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
247 debugger::repl (const std::string& prompt_arg)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
248 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
249 unwind_protect frame;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
250
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
251 frame.protect_var (m_in_debug_repl);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
252 frame.protect_var (m_execution_mode);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
253
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
254 m_in_debug_repl = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
255
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
256 tree_evaluator& tw = m_interpreter.get_evaluator ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
257
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
258 bool silent = tw.quiet_breakpoint_flag (false);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
259
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
260 frame.add (&tree_evaluator::restore_frame, &tw,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
261 tw.current_call_stack_frame_number ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
262
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
263 tw.goto_frame (tw.debug_frame ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
264
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
265 octave_user_code *caller = tw.current_user_code ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
266 std::string fcn_file_nm, fcn_nm;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
267
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
268 if (caller)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
269 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
270 fcn_file_nm = caller->fcn_file_name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
271 fcn_nm = fcn_file_nm.empty () ? caller->name () : fcn_file_nm;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
272 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
273
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
274 int curr_debug_line = tw.current_line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
275
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
276 std::ostringstream buf;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
277
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
278 input_system& input_sys = m_interpreter.get_input_system ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
279
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
280 event_manager& evmgr = m_interpreter.get_event_manager ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
281
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
282 if (! fcn_nm.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
283 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
284 if (input_sys.gud_mode ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
285 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
286 static char ctrl_z = 'Z' & 0x1f;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
287
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
288 buf << ctrl_z << ctrl_z << fcn_nm << ':' << curr_debug_line;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
289 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
290 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
291 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
292 // FIXME: we should come up with a clean way to detect
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
293 // that we are stopped on the no-op command that marks the
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
294 // end of a function or script.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
295
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
296 if (! silent)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
297 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
298 std::shared_ptr<stack_frame> frm = tw.current_user_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
299
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
300 frm->display_stopped_in_message (buf);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
301 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
302
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
303 evmgr.enter_debugger_event (fcn_nm, fcn_file_nm, curr_debug_line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
304
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
305 evmgr.set_workspace ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
306
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
307 frame.add (&event_manager::execute_in_debugger_event, &evmgr,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
308 fcn_nm, curr_debug_line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
309
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
310 if (! silent)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
311 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
312 std::string line_buf;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
313
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
314 if (caller)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
315 line_buf = caller->get_code_line (curr_debug_line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
316
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
317 if (! line_buf.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
318 buf << curr_debug_line << ": " << line_buf;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
319 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
320 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
321 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
322
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
323 if (silent)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
324 command_editor::erase_empty_line (true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
325
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
326 std::string stopped_in_msg = buf.str ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
327
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
328 if (m_interpreter.server_mode ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
329 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
330 if (! stopped_in_msg.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
331 octave_stdout << stopped_in_msg << std::endl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
332
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
333 evmgr.push_event_queue ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
334
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
335 frame.add (&event_manager::pop_event_queue, &evmgr);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
336
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
337 frame.add (&tree_evaluator::set_parser, &tw, tw.get_parser ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
338
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
339 std::shared_ptr<push_parser>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
340 debug_parser (new push_parser (m_interpreter));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
341
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
342 tw.set_parser (debug_parser);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
343
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
344 server_loop ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
345 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
346 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
347 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
348 if (! stopped_in_msg.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
349 std::cerr << stopped_in_msg << std::endl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
350
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
351 std::string tmp_prompt = prompt_arg;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
352 if (m_level > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
353 tmp_prompt = "[" + std::to_string (m_level) + "]" + prompt_arg;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
354
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
355 frame.add (&interpreter::set_PS1, &m_interpreter, m_interpreter.PS1 ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
356 m_interpreter.PS1 (tmp_prompt);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
357
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
358 if (! m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
359 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
360 void (interpreter::*interactive_fptr) (bool)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
361 = &interpreter::interactive;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
362 frame.add (interactive_fptr, &m_interpreter,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
363 m_interpreter.interactive ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
364
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
365 m_interpreter.interactive (true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
366
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
367 // FIXME: should debugging be possible in an embedded
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
368 // interpreter?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
369
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
370 application *app = application::app ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
371
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
372 if (app)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
373 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
374 void (application::*forced_interactive_fptr) (bool)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
375 = &application::forced_interactive;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
376 frame.add (forced_interactive_fptr, app,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
377 app->forced_interactive ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
378
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
379 app->forced_interactive (true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
380 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
381 }
27533
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
382
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
383 #if defined (OCTAVE_ENABLE_COMMAND_LINE_PUSH_PARSER)
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
384
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
385 input_reader reader (m_interpreter);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
386
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
387 push_parser debug_parser (m_interpreter);
27533
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
388
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
389 #else
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
390
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
391 parser debug_parser (m_interpreter);
27533
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
392
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
393 #endif
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
394
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
395 error_system& es = m_interpreter.get_error_system ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
396
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
397 while (m_in_debug_repl)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
398 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
399 if (m_execution_mode == EX_CONTINUE || tw.dbstep_flag ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
400 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
401
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
402 if (quitting_debugger ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
403 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
404
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
405 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
406 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
407 debug_parser.reset ();
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
408
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
409 #if defined (OCTAVE_ENABLE_COMMAND_LINE_PUSH_PARSER)
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
410
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
411 int retval = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
412
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
413 std::string prompt
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
414 = command_editor::decode_prompt_string (tmp_prompt);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
415
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
416 do
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
417 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
418 bool eof = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
419 std::string input_line = reader.get_input (prompt, eof);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
420
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
421 if (eof)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
422 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
423 retval = EOF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
424 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
425 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
426
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
427 retval = debug_parser.run (input_line, false);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
428
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
429 prompt = command_editor::decode_prompt_string (m_interpreter.PS2 ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
430 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
431 while (retval < 0);
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
432
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
433 #else
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
434
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
435 int retval = debug_parser.run ();
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
436
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
437 #endif
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
438 if (command_editor::interrupt (false))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
439 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
440 // Break regardless of m_execution_mode value.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
441
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
442 quitting_debugger ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
443
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
444 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
445 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
446 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
447 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
448 if (retval == 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
449 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
450 std::shared_ptr<tree_statement_list> stmt_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
451 = debug_parser.statement_list ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
452
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
453 if (stmt_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
454 stmt_list->accept (tw);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
455
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
456 if (octave_completion_matches_called)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
457 octave_completion_matches_called = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
458
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
459 // FIXME: the following statement is here because
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
460 // the last command may have been a dbup, dbdown, or
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
461 // dbstep command that changed the current debug
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
462 // frame. If so, we need to reset the current frame
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
463 // for the call stack. But is this right way to do
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
464 // this job? What if the statement list was
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
465 // something like "dbup; dbstack"? Will the call to
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
466 // dbstack use the right frame? If not, how can we
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
467 // fix this problem?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
468 tw.goto_frame (tw.debug_frame ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
469 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
470
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
471 octave_quit ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
472 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
473 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
474 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
475 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
476 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
477 es.display_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
478
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
479 // Ignore errors when in debugging mode;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
480 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
481 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
482 catch (const quit_debug_exception& qde)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
483 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
484 if (qde.all ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
485 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
486
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
487 // Continue in this debug level.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
488 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
489 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
490 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
491 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
492
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
493 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
494 debugger::quitting_debugger () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
495 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
496 if (m_execution_mode == EX_QUIT)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
497 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
498 // If there is no enclosing debug level or the top-level
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
499 // repl is not active, handle dbquit the same as dbcont.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
500
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
501 if (m_level > 0 || m_interpreter.server_mode ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
502 || m_interpreter.in_top_level_repl ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
503 throw quit_debug_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
504 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
505 return true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
506 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
507
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
508 if (m_execution_mode == EX_QUIT_ALL)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
509 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
510 // If the top-level repl is not active, handle "dbquit all"
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
511 // the same as dbcont.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
512
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
513 if (m_interpreter.server_mode () || m_interpreter.in_top_level_repl ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
514 throw quit_debug_exception (true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
515 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
516 return true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
517 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
518
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
519 return false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
520 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
521
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
522 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
523 tree_evaluator::at_top_level () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
524 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
525 return m_call_stack.at_top_level ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
526 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
527
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
528 std::string
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
529 tree_evaluator::mfilename (const std::string& opt) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
530 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
531 std::string fname;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
532
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
533 octave_user_code *fcn = m_call_stack.current_user_code ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
534
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
535 if (fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
536 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
537 fname = fcn->fcn_file_name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
538
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
539 if (fname.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
540 fname = fcn->name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
541 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
542
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
543 if (opt == "fullpathext")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
544 return fname;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
545
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
546 std::size_t dpos = fname.rfind (sys::file_ops::dir_sep_char ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
547 std::size_t epos = fname.rfind ('.');
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
548
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
549 if (epos <= dpos+1)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
550 epos = std::string::npos;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
551
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
552 if (epos != std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
553 fname = fname.substr (0, epos);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
554
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
555 if (opt == "fullpath")
27015
4d9e1a832a55 move core of mfilename function to evaluator
John W. Eaton <jwe@octave.org>
parents: 27014
diff changeset
556 return fname;
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
557
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
558 if (dpos != std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
559 fname = fname.substr (dpos+1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
560
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
561 return fname;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
562 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
563
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
564 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
565 tree_evaluator::parse_and_execute (const std::string& input,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
566 bool& incomplete_parse)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
567 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
568 incomplete_parse = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
569
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
570 unwind_protect_var<bool> upv (m_in_top_level_repl, true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
571
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
572 if (at_top_level ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
573 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
574 dbstep_flag (0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
575 reset_debug_state ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
576 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
577
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
578 // FIXME: OK to do this job here, or should it be in the functions
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
579 // that do the actual prompting?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
580
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
581 // Update the time stamp for the "prompt" so that automatically
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
582 // finding modified files based on file modification times will
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
583 // work. In the future, we may do something completely different to
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
584 // check for changes to files but for now, we rely on the prompt
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
585 // time stamp to limit the checks for file modification times.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
586
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
587 Vlast_prompt_time.stamp ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
588
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
589 bool eof = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
590
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
591 event_manager& evmgr = m_interpreter.get_event_manager ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
592
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
593 if (command_history::add (input))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
594 evmgr.append_history (input);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
595
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
596 m_exit_status = m_parser->run (input, eof);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
597
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
598 if (m_exit_status == 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
599 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
600 std::shared_ptr<tree_statement_list>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
601 stmt_list = m_parser->statement_list ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
602
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
603 if (stmt_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
604 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
605 command_editor::increment_current_command_number ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
606
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
607 eval (stmt_list, m_interpreter.interactive ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
608
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
609 evmgr.set_workspace ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
610 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
611 else if (m_parser->at_end_of_input ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
612 m_exit_status = EOF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
613 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
614 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
615 incomplete_parse = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
616
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
617 // FIXME: Should we be checking m_exit_status or incomplete_parse or
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
618 // both here? Could EOF have a value other than -1, and is there
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
619 // possible confusion between that state and the parser returning -1?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
620
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
621 if (m_exit_status == -1)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
622 m_exit_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
623 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
624 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
625
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
626 evmgr.pre_input_event ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
627 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
628
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
629 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
630 tree_evaluator::get_line_and_eval ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
631 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
632 std::mutex mtx;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
633 std::unique_lock<std::mutex> lock (mtx);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
634 std::condition_variable cv;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
635 bool incomplete_parse = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
636 bool evaluation_pending = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
637 bool exiting = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
638
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
639 event_manager& evmgr = m_interpreter.get_event_manager ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
640
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
641 while (true)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
642 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
643 // FIXME: Detect EOF? Use readline? If
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
644 // so, then we need to disable idle event loop hook function
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
645 // execution.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
646
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
647 std::string ps
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
648 = incomplete_parse ? m_interpreter.PS2 () : m_interpreter.PS1 ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
649
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
650 std::cout << command_editor::decode_prompt_string (ps);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
651
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
652 std::string input;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
653 std::getline (std::cin, input);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
654
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
655 if (input.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
656 continue;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
657
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
658 incomplete_parse = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
659 evaluation_pending = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
660 exiting = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
661
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
662 evmgr.post_event
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
663 ([&] (interpreter& interp)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
664 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
665 // INTERPRETER THREAD
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
666
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
667 std::lock_guard<std::mutex> local_lock (mtx);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
668
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
669 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
670 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
671 interp.parse_and_execute (input, incomplete_parse);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
672 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
673 catch (const exit_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
674 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
675 evaluation_pending = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
676 exiting = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
677 cv.notify_all ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
678 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
679 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
680 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
681 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
682 error_system& es = m_interpreter.get_error_system ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
683
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
684 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
685 es.display_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
686
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
687 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
688 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
689 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
690 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
691 evaluation_pending = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
692 cv.notify_all ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
693 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
694 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
695 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
696 evaluation_pending = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
697 cv.notify_all ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
698 throw exit_exception (1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
699 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
700 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
701 catch (...)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
702 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
703 evaluation_pending = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
704 cv.notify_all ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
705 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
706 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
707
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
708 evaluation_pending = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
709 cv.notify_all ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
710 });
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
711
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
712 // Wait until evaluation is finished before prompting for input
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
713 // again.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
714
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
715 cv.wait (lock, [&] { return ! evaluation_pending; });
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
716
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
717 if (exiting)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
718 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
719 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
720 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
721
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
722 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
723 tree_evaluator::repl ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
724 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
725 // The big loop. Read, Eval, Print, Loop. Normally user
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
726 // interaction at the command line in a terminal session, but we may
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
727 // also end up here when reading from a pipe or when stdin is
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
728 // connected to a file by the magic of input redirection.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
729
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
730 int exit_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
731
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
732 // FIXME: should this choice be a command-line option? Note that we
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
733 // intend that the push parser interface only be used for
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
734 // interactive sessions.
29846
78cb255c78a4 move top-level REPL from interpreter to evaluator
John W. Eaton <jwe@octave.org>
parents: 29832
diff changeset
735
78cb255c78a4 move top-level REPL from interpreter to evaluator
John W. Eaton <jwe@octave.org>
parents: 29832
diff changeset
736 #if defined (OCTAVE_ENABLE_COMMAND_LINE_PUSH_PARSER)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
737 static bool use_command_line_push_parser = true;
29846
78cb255c78a4 move top-level REPL from interpreter to evaluator
John W. Eaton <jwe@octave.org>
parents: 29832
diff changeset
738 #else
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
739 static bool use_command_line_push_parser = false;
29846
78cb255c78a4 move top-level REPL from interpreter to evaluator
John W. Eaton <jwe@octave.org>
parents: 29832
diff changeset
740 #endif
78cb255c78a4 move top-level REPL from interpreter to evaluator
John W. Eaton <jwe@octave.org>
parents: 29832
diff changeset
741
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
742 // The following logic is written as it is to allow easy transition
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
743 // to setting USE_COMMAND_LINE_PUSH_PARSER at run time and to
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
744 // simplify the logic of the main loop below by using the same
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
745 // base_parser::run interface for both push and pull parsers.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
746
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
747 std::shared_ptr<base_parser> repl_parser;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
748
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
749 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
750 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
751 if (use_command_line_push_parser)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
752 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
753 push_parser *pp
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
754 = new push_parser (m_interpreter,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
755 new input_reader (m_interpreter));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
756
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
757 repl_parser = std::shared_ptr<base_parser> (pp);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
758 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
759 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
760 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
761 parser *pp = new parser (new lexer (m_interpreter));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
762 repl_parser = std::shared_ptr<base_parser> (pp);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
763 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
764 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
765 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
766 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
767 parser *pp = new parser (new lexer (stdin, m_interpreter));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
768 repl_parser = std::shared_ptr<base_parser> (pp);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
769 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
770
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
771 do
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
772 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
773 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
774 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
775 unwind_protect_var<bool> upv (m_in_top_level_repl, true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
776
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
777 repl_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
778
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
779 if (at_top_level ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
780 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
781 dbstep_flag (0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
782 reset_debug_state ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
783 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
784
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
785 exit_status = repl_parser->run ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
786
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
787 if (exit_status == 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
788 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
789 std::shared_ptr<tree_statement_list>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
790 stmt_list = repl_parser->statement_list ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
791
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
792 if (stmt_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
793 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
794 command_editor::increment_current_command_number ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
795
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
796 eval (stmt_list, m_interpreter.interactive ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
797 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
798 else if (repl_parser->at_end_of_input ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
799 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
800 exit_status = EOF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
801 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
802 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
803 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
804 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
805 catch (const interrupt_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
806 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
807 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
808
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
809 // Required newline when the user does Ctrl+C at the prompt.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
810 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
811 octave_stdout << "\n";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
812 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
813 catch (const index_exception& ie)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
814 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
815 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
816
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
817 std::cerr << "error: unhandled index exception: "
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
818 << ie.message () << " -- trying to return to prompt"
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
819 << std::endl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
820 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
821 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
822 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
823 error_system& es = m_interpreter.get_error_system ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
824
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
825 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
826 es.display_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
827
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
828 if (m_interpreter.interactive ())
29281
6dd456257d81 move some eval-related functions from interpreter to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 29253
diff changeset
829 m_interpreter.recover_from_exception ();
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
830 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
831 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
832 // We should exit with a nonzero status.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
833 exit_status = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
834 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
835 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
836 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
837 catch (const quit_debug_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
838 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
839 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
840
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
841 // FIXME: Does anything else need to happen here?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
842 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
843 catch (const std::bad_alloc&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
844 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
845 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
846
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
847 std::cerr << "error: out of memory -- trying to return to prompt"
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
848 << std::endl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
849 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
850 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
851 while (exit_status == 0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
852
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
853 if (exit_status == EOF)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
854 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
855 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
856 octave_stdout << "\n";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
857
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
858 exit_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
859 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
860
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
861 return exit_status;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
862 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
863
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
864 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
865 tree_evaluator::server_loop ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
866 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
867 // Process events from the event queue.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
868
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
869 unwind_protect_var<bool> upv1 (m_server_mode, true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
870
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
871 m_exit_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
872
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
873 std::shared_ptr<push_parser> parser (new push_parser (m_interpreter));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
874 unwind_protect_var<std::shared_ptr<push_parser>> upv2 (m_parser, parser);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
875
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
876 // FIXME: We are currently resetting the parser after every call to
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
877 // recover_from_exception. This action should probably be handled
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
878 // in a more consistent way, but resetting the parser in every call
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
879 // to interpreter::recover_from_exception appears to cause
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
880 // segfaults in the test suite.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
881
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
882 do
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
883 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
884 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
885 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
886 // FIXME: Should we call octave_quit in the octave::sleep
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
887 // and/or command_editor::run_event_hooks functions?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
888
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
889 octave_quit ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
890
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
891 // FIXME: Running the event queue should be decoupled from
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
892 // the command_editor. We should also use a condition
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
893 // variable to manage the execution of entries in the queue
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
894 // and eliminate the need for the busy-wait loop.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
895
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
896 command_editor::run_event_hooks ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
897
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
898 release_unreferenced_dynamic_libraries ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
899
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
900 sleep (0.1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
901 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
902 catch (const interrupt_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
903 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
904 octave_interrupt_state = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
905 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
906 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
907
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
908 // Required newline when the user does Ctrl+C at the prompt.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
909 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
910 octave_stdout << "\n";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
911 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
912 catch (const index_exception& e)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
913 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
914 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
915 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
916
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
917 std::cerr << "error: unhandled index exception: "
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
918 << e.message () << " -- trying to return to prompt"
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
919 << std::endl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
920 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
921 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
922 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
923 error_system& es = m_interpreter.get_error_system ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
924
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
925 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
926 es.display_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
927
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
928 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
929 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
930 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
931 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
932 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
933 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
934 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
935 // We should exit with a nonzero status.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
936 m_exit_status = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
937 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
938 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
939 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
940 catch (const quit_debug_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
941 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
942 octave_interrupt_state = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
943 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
944 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
945 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
946 catch (const exit_exception& xe)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
947 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
948 m_exit_status = xe.exit_status ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
949 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
950 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
951 catch (const std::bad_alloc&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
952 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
953 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
954 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
955
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
956 std::cerr << "error: out of memory -- trying to return to prompt"
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
957 << std::endl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
958 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
959 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
960 while (m_exit_status == 0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
961
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
962 if (m_exit_status == EOF)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
963 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
964 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
965 octave_stdout << "\n";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
966
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
967 m_exit_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
968 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
969
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
970 return m_exit_status;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
971 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
972
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
973 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
974 tree_evaluator::eval (std::shared_ptr<tree_statement_list>& stmt_list,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
975 bool interactive)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
976 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
977 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
978 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
979 stmt_list->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
980
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
981 octave_quit ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
982
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
983 if (! interactive)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
984 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
985 bool quit = (m_returning || m_breaking);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
986
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
987 if (m_returning)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
988 m_returning = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
989
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
990 if (m_breaking)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
991 m_breaking--;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
992
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
993 if (quit)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
994 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
995 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
996
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
997 if (octave_completion_matches_called)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
998 octave_completion_matches_called = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
999 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1000 catch (const quit_debug_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1001 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1002 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1003 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1004 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1005
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1006 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1007 tree_evaluator::eval_string (const std::string& eval_str, bool silent,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1008 int& parse_status, int nargout)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1009 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1010 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1011
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1012 parser eval_parser (eval_str, m_interpreter);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1013
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1014 do
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1015 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1016 eval_parser.reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1017
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1018 // If we are looking at
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1019 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1020 // val = eval ("code");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1021 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1022 // then don't allow code to be parsed as a command.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1023
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1024 if (nargout > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1025 eval_parser.disallow_command_syntax ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1026
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1027 parse_status = eval_parser.run ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1028
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1029 if (parse_status == 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1030 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1031 std::shared_ptr<tree_statement_list> stmt_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1032 = eval_parser.statement_list ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1033
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1034 if (stmt_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1035 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1036 tree_statement *stmt = nullptr;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1037
32936
0b5f3219b650 eliminate all uses of base_list<T> template
John W. Eaton <jwe@octave.org>
parents: 32905
diff changeset
1038 if (stmt_list->size () == 1
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1039 && (stmt = stmt_list->front ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1040 && stmt->is_expression ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1041 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1042 tree_expression *expr = stmt->expression ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1043
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1044 if (silent)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1045 expr->set_print_flag (false);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1046
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1047 retval = expr->evaluate_n (*this, nargout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1048
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1049 bool do_bind_ans = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1050
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1051 if (expr->is_identifier ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1052 do_bind_ans = ! is_variable (expr);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1053 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1054 do_bind_ans = ! expr->is_assignment_expression ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1055
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1056 if (do_bind_ans && ! retval.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1057 bind_ans (retval(0), expr->print_result ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1058
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1059 if (nargout == 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1060 retval = octave_value_list ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1061 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1062 else if (nargout == 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1063 stmt_list->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1064 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1065 error ("eval: invalid use of statement list");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1066
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1067 if (returning () || breaking () || continuing ())
29281
6dd456257d81 move some eval-related functions from interpreter to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 29253
diff changeset
1068 break;
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1069 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1070 else if (eval_parser.at_end_of_input ())
31607
aac27ad79be6 maint: Re-indent code after switch to using namespace macros.
Rik <rik@octave.org>
parents: 31605
diff changeset
1071 break;
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1072 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1073 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1074 while (parse_status == 0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1075
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1076 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1077 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1078
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1079 octave_value
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1080 tree_evaluator::eval_string (const std::string& eval_str,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1081 bool silent, int& parse_status)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1082 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1083 octave_value retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1084
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1085 octave_value_list tmp = eval_string (eval_str, silent, parse_status, 1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1086
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1087 if (! tmp.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1088 retval = tmp(0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1089
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1090 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1091 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1092
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1093 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1094 tree_evaluator::eval_string (const octave_value& arg,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1095 bool silent, int& parse_status,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1096 int nargout)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1097 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1098 std::string s = arg.xstring_value ("eval: expecting string argument");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1099
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1100 return eval_string (s, silent, parse_status, nargout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1101 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1102
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1103 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1104 tree_evaluator::eval (const std::string& try_code,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1105 int nargout)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1106 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1107 int parse_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1108
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1109 return eval_string (try_code, nargout > 0, parse_status, nargout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1110 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1111
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1112 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1113 tree_evaluator::eval (const std::string& try_code,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1114 const std::string& catch_code,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1115 int nargout)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1116 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1117 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1118
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1119 error_system& es = m_interpreter.get_error_system ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1120
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1121 int parse_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1122
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1123 bool execution_error = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1124
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1125 octave_value_list tmp;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1126
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1127 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1128 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1129 tmp = eval_string (try_code, nargout > 0, parse_status, nargout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1130 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1131 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1132 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1133 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1134 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1135
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1136 execution_error = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1137 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1138
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1139 if (parse_status != 0 || execution_error)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1140 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1141 tmp = eval_string (catch_code, nargout > 0, parse_status, nargout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1142
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1143 retval = (nargout > 0) ? tmp : octave_value_list ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1144 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1145 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1146 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1147 if (nargout > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1148 retval = tmp;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1149
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1150 // FIXME: we should really be rethrowing whatever
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1151 // exception occurred, not just throwing an
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1152 // execution exception.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1153 if (execution_error)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1154 throw execution_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1155 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1156
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1157 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1158 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1159
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1160 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1161 tree_evaluator::evalin (const std::string& context,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1162 const std::string& try_code,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1163 int nargout)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1164 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1165 unwind_action act ([=] (std::size_t frm)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1166 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1167 m_call_stack.restore_frame (frm);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1168 }, m_call_stack.current_frame ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1169
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1170 if (context == "caller")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1171 m_call_stack.goto_caller_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1172 else if (context == "base")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1173 m_call_stack.goto_base_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1174 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1175 error (R"(evalin: CONTEXT must be "caller" or "base")");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1176
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1177 int parse_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1178
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1179 return eval_string (try_code, nargout > 0, parse_status, nargout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1180 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1181
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1182 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1183 tree_evaluator::evalin (const std::string& context,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1184 const std::string& try_code,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1185 const std::string& catch_code,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1186 int nargout)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1187 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1188 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1189
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1190 unwind_action act1 ([=] (std::size_t frm)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1191 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1192 m_call_stack.restore_frame (frm);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1193 }, m_call_stack.current_frame ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1194
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1195 if (context == "caller")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1196 m_call_stack.goto_caller_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1197 else if (context == "base")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1198 m_call_stack.goto_base_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1199 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1200 error (R"(evalin: CONTEXT must be "caller" or "base")");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1201
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1202 error_system& es = m_interpreter.get_error_system ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1203
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1204 int parse_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1205
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1206 bool execution_error = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1207
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1208 octave_value_list tmp;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1209
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1210 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1211 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1212 tmp = eval_string (try_code, nargout > 0, parse_status, nargout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1213 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1214 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1215 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1216 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1217 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1218
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1219 execution_error = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1220 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1221
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1222 if (parse_status != 0 || execution_error)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1223 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1224 tmp = eval_string (catch_code, nargout > 0, parse_status, nargout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1225
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1226 retval = (nargout > 0) ? tmp : octave_value_list ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1227 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1228 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1229 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1230 if (nargout > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1231 retval = tmp;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1232
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1233 // FIXME: we should really be rethrowing whatever
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1234 // exception occurred, not just throwing an
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1235 // execution exception.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1236 if (execution_error)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1237 throw execution_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1238 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1239
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1240 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1241 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1242
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1243 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1244 tree_evaluator::visit_anon_fcn_handle (tree_anon_fcn_handle&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1245 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1246 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1247 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1248
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1249 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1250 tree_evaluator::visit_argument_list (tree_argument_list&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1251 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1252 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1253 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1254
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1255 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1256 tree_evaluator::visit_arguments_block (tree_arguments_block&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1257 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1258 warning ("function arguments validation blocks are not supported; INCORRECT RESULTS ARE POSSIBLE");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1259 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1260
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1261 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1262 tree_evaluator::visit_args_block_attribute_list (tree_args_block_attribute_list&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1263 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1264 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1265 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1266
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1267 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1268 tree_evaluator::visit_args_block_validation_list (tree_args_block_validation_list&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1269 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1270 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1271 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1272
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1273 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1274 tree_evaluator::visit_arg_validation (tree_arg_validation&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1275 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1276 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1277 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1278
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1279 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1280 tree_evaluator::visit_arg_size_spec (tree_arg_size_spec&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1281 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1282 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1283 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1284
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1285 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1286 tree_evaluator::visit_arg_validation_fcns (tree_arg_validation_fcns&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1287 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1288 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1289 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1290
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1291 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1292 tree_evaluator::visit_binary_expression (tree_binary_expression&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1293 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1294 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1295 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1296
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1297 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1298 tree_evaluator::visit_boolean_expression (tree_boolean_expression&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1299 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1300 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1301 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1302
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1303 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1304 tree_evaluator::visit_compound_binary_expression (tree_compound_binary_expression&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1305 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1306 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1307 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1308
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1309 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1310 tree_evaluator::visit_break_command (tree_break_command& cmd)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1311 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1312 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1313 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1314 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1315 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1316 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1317 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1318 m_echo_file_pos = line + 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1319 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1320
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1321 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1322 do_breakpoint (cmd.is_active_breakpoint (*this));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1323
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1324 if (m_in_loop_command)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1325 m_breaking = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1326 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1327 error ("break must appear in a loop in the same file as loop command");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1328 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1329
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1330 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1331 tree_evaluator::visit_colon_expression (tree_colon_expression&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1332 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1333 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1334 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1335
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1336 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1337 tree_evaluator::visit_continue_command (tree_continue_command& cmd)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1338 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1339 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1340 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1341 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1342 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1343 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1344 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1345 m_echo_file_pos = line + 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1346 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1347
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1348 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1349 do_breakpoint (cmd.is_active_breakpoint (*this));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1350
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1351 if (m_in_loop_command)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1352 m_continuing = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1353 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1354
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1355 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1356 tree_evaluator::statement_printing_enabled ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1357 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1358 return ! (m_silent_functions && (m_statement_context == SC_FUNCTION
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1359 || m_statement_context == SC_SCRIPT));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1360 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1361
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1362 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1363 tree_evaluator::reset_debug_state ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1364 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1365 m_debug_mode = (m_bp_table.have_breakpoints ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1366 || m_dbstep_flag != 0
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1367 || m_break_on_next_stmt
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1368 || in_debug_repl ());
32593
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
1369
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
1370 #if defined (OCTAVE_ENABLE_BYTECODE_EVALUATOR)
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
1371 update_vm_dbgprofecho_flag ();
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
1372 #endif
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1373 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1374
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1375 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1376 tree_evaluator::reset_debug_state (bool mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1377 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1378 m_debug_mode = mode;
32593
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
1379 #if defined (OCTAVE_ENABLE_BYTECODE_EVALUATOR)
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
1380 update_vm_dbgprofecho_flag ();
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
1381 #endif
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1382 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1383
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1384 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1385 tree_evaluator::enter_debugger (const std::string& prompt)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1386 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1387 unwind_protect frame;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1388
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1389 frame.add (command_history::ignore_entries,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1390 command_history::ignoring_entries ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1391
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1392 command_history::ignore_entries (false);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1393
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1394 frame.add (&call_stack::restore_frame, &m_call_stack,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1395 m_call_stack.current_frame ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1396
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1397 // Don't allow errors or warnings at the debug prompt to push us
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1398 // into deeper levels of debugging.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1399
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1400 error_system& es = m_interpreter.get_error_system ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1401
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1402 frame.add (&error_system::set_debug_on_error, &es, es.debug_on_error ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1403
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1404 frame.add (&error_system::set_debug_on_warning, &es,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1405 es.debug_on_warning ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1406
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1407 es.debug_on_error (false);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1408 es.debug_on_warning (false);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1409
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1410 // Go up to the nearest user code frame.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1411
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1412 m_debug_frame = m_call_stack.dbupdown (0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1413
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1414 // FIXME: probably we just want to print one line, not the
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1415 // entire statement, which might span many lines...
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1416 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1417 // tree_print_code tpc (octave_stdout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1418 // stmt.accept (tpc);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1419
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1420 debugger *dbgr = new debugger (m_interpreter, m_debugger_stack.size ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1421
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1422 m_debugger_stack.push (dbgr);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1423
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1424 frame.add ([=] ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1425 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1426 delete m_debugger_stack.top ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1427 m_debugger_stack.pop ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1428 reset_debug_state ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1429 });
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1430
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1431 dbgr->repl (prompt);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1432 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1433
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1434 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1435 tree_evaluator::keyboard (const std::string& prompt)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1436 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1437 enter_debugger (prompt);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1438 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1439
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1440 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1441 tree_evaluator::dbupdown (int n, bool verbose)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1442 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1443 m_debug_frame = m_call_stack.dbupdown (n, verbose);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1444 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1445
32690
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
1446 std::string tree_evaluator::inputname (int n, bool ids_only) const
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
1447 {
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
1448 std::shared_ptr<stack_frame> frame = m_call_stack.current_user_frame ();
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
1449
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
1450 return frame->inputname (n, ids_only);
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
1451 }
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
1452
32793
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1453 Matrix
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1454 tree_evaluator::ignored_fcn_outputs () const
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1455 {
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1456 Matrix retval;
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1457
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1458 const std::list<octave_lvalue> *lvalues = m_lvalue_list;
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1459
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1460 if (! lvalues)
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1461 return retval;
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1462
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1463 octave_idx_type nbh = 0;
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1464
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1465 for (const auto& lval : *lvalues)
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1466 nbh += lval.is_black_hole ();
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1467
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1468 if (nbh > 0)
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1469 {
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1470 retval.resize (1, nbh);
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1471
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1472 octave_idx_type k = 0;
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1473 octave_idx_type l = 0;
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1474
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1475 for (const auto& lval : *lvalues)
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1476 {
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1477 if (lval.is_black_hole ())
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1478 retval(l++) = k+1;
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1479
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1480 k += lval.numel ();
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1481 }
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1482 }
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1483
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1484 return retval;
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1485 }
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1486
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1487 // If NAME is an operator (like "+", "-", ...), convert it to the
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1488 // corresponding function name ("plus", "minus", ...).
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1489
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1490 static std::string
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1491 get_operator_function_name (const std::string& name)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1492 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1493 // Bow to the god of compatibility.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1494
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1495 // FIXME: it seems ugly to put this here, but there is no single
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1496 // function in the parser that converts from the operator name to
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1497 // the corresponding function name. At least try to do it without N
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1498 // string compares.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1499
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1500 std::size_t len = name.length ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1501
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1502 if (len == 2)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1503 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1504 if (name[0] == '.')
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1505 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1506 switch (name[1])
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1507 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1508 case '\'':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1509 return "transpose";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1510
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1511 case '*':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1512 return "times";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1513
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1514 case '/':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1515 return "rdivide";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1516
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1517 case '^':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1518 return "power";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1519
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1520 case '\\':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1521 return "ldivide";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1522
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1523 default:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1524 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1525 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1526 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1527 else if (name[1] == '=')
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1528 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1529 switch (name[0])
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1530 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1531 case '<':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1532 return "le";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1533
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1534 case '=':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1535 return "eq";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1536
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1537 case '>':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1538 return "ge";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1539
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1540 case '~':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1541 case '!':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1542 return "ne";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1543
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1544 default:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1545 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1546 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1547 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1548 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1549 else if (len == 1)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1550 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1551 switch (name[0])
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1552 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1553 case '~':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1554 case '!':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1555 return "not";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1556
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1557 case '\'':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1558 return "ctranspose";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1559
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1560 case '+':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1561 return "plus";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1562
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1563 case '-':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1564 return "minus";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1565
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1566 case '*':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1567 return "mtimes";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1568
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1569 case '/':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1570 return "mrdivide";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1571
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1572 case '^':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1573 return "mpower";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1574
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1575 case '\\':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1576 return "mldivide";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1577
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1578 case '<':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1579 return "lt";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1580
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1581 case '>':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1582 return "gt";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1583
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1584 case '&':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1585 return "and";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1586
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1587 case '|':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1588 return "or";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1589
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1590 default:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1591 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1592 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1593 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1594
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1595 return name;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1596 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1597
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1598 // Creates a function handle that takes into account the context,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1599 // finding local, nested, private, or sub functions.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1600
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1601 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1602 tree_evaluator::make_fcn_handle (const std::string& name)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1603 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1604 octave_value retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1605
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1606 // The str2func function can create a function handle with the name
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1607 // of an operator (for example, "+"). If so, it is converted to the
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1608 // name of the corresponding function ("+" -> "plus") and we create
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1609 // a simple function handle using that name.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1610
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1611 std::string fcn_name = get_operator_function_name (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1612
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1613 // If FCN_NAME is different from NAME, then NAME is an operator. As
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1614 // of version 2020a, Matlab apparently uses the function name
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1615 // corresponding to the operator to search for private and local
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1616 // functions in the current scope but not(!) nested functions.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1617
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1618 bool name_is_operator = fcn_name != name;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1619
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1620 std::size_t pos = fcn_name.find ('.');
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1621
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1622 if (pos != std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1623 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1624 // Recognize (some of? which ones?) the following cases
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1625 // and create something other than a simple function handle?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1626 // Should we just be checking for the last two when the first
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1627 // element of the dot-separated list is an object? If so, then
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1628 // should this syntax be limited to a dot-separated list with
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1629 // exactly two elements?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1630 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1631 // object . method
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1632 // object . static-method
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1633 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1634 // Code to do that duplicates some of simple_fcn_handle::call.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1635
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1636 // Only accept expressions that contain one '.' separator.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1637
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1638 // FIXME: The logic here is a bit complicated. Is there a good
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1639 // way to simplify it?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1640
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1641 std::string meth_nm = fcn_name.substr (pos+1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1642
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1643 if (meth_nm.find ('.') == std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1644 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1645 std::string obj_nm = fcn_name.substr (0, pos);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1646
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1647 // If obj_nm is an object in the current scope with a
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1648 // method named meth_nm, create a classsimple handle.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1649
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1650 octave_value object = varval (obj_nm);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1651
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1652 if (object.is_defined () && object.is_classdef_object ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1653 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1654 octave_classdef *cdef = object.classdef_object_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1655
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1656 if (cdef)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1657 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1658 std::string class_nm = cdef->class_name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1659
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1660 cdef_object cdef_obj = cdef->get_object ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1661
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1662 cdef_class cls = cdef_obj.get_class ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1663
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1664 cdef_method meth = cls.find_method (meth_nm);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1665
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1666 if (meth.ok ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1667 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1668 // If the method we found is static, create a
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1669 // new function name from the class name and
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1670 // method name and create a simple function
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1671 // handle below. Otherwise, create a class
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1672 // simple function handle.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1673
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1674 if (meth.is_static ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1675 fcn_name = class_nm + '.' + meth_nm;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1676 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1677 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1678 octave_value meth_fcn = meth.get_function ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1679
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1680 octave_fcn_handle *fh
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1681 = new octave_fcn_handle (object, meth_fcn,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1682 class_nm, meth_nm);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1683
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1684 return octave_value (fh);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1685 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1686 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1687 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1688 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1689 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1690
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1691 // We didn't match anything above, so create handle to SIMPLE
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1692 // package function or static class method. Function resolution
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1693 // is performed when the handle is used.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1694
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1695 return octave_value (new octave_fcn_handle (fcn_name));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1696 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1697
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1698 // If the function name refers to a sub/local/private function or a
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1699 // class method/constructor, create scoped function handle that is
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1700 // bound to that function. Use the same precedence list as
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1701 // fcn_info::find but limit search to the following types of
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1702 // functions:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1703 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1704 // nested functions (and subfunctions)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1705 // local functions in the current file
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1706 // private function
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1707 // class method
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1708 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1709 // For anything else we create a simple function handle that will be
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1710 // resolved dynamically in the scope where it is evaluated.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1711
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1712 symbol_scope curr_scope = get_current_scope ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1713
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1714 symbol_table& symtab = m_interpreter.get_symbol_table ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1715
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1716 if (curr_scope)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1717 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1718 octave_value ov_fcn
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1719 = symtab.find_scoped_function (fcn_name, curr_scope);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1720
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1721 // If name is operator, we are in Fstr2func, so skip the stack
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1722 // frame for that function.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1723
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1724 bool skip_first = name_is_operator;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1725 octave_function *curr_fcn = current_function (skip_first);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1726
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1727 if (ov_fcn.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1728 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1729 octave_function *fcn = ov_fcn.function_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1730
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1731 if (fcn->is_nested_function ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1732 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1733 if (! name_is_operator)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1734 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1735 // Get current stack frame and return handle to nested
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1736 // function.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1737
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1738 std::shared_ptr<stack_frame> frame
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1739 = m_call_stack.get_current_stack_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1740
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1741 // If we are creating a handle to the current
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1742 // function or a handle to a sibling function (i.e.,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1743 // not a child of the current function), then use
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1744 // the calling stack frame as the context instead of
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1745 // the current stack frame.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1746
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1747 // FIXME: Do we need both checks here or is it
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1748 // sufficient to check that the parent of curr_fcn
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1749 // is the same as the parent of fcn? Is there any
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1750 // case where curr_fcn could be nullptr, or does
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1751 // that indicate an internal error of some kind?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1752
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1753 if (curr_fcn
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1754 && (fcn_name == curr_fcn->name ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1755 || fcn->parent_fcn_name () == curr_fcn->parent_fcn_name ()))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1756 frame = frame->access_link ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1757
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1758 octave_fcn_handle *fh
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1759 = new octave_fcn_handle (ov_fcn, fcn_name, frame);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1760
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1761 return octave_value (fh);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1762 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1763 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1764 else if (fcn->is_subfunction ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1765 /* || fcn->is_localfunction () */
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1766 || fcn->is_private_function ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1767 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1768 // Create handle to SCOPED function (sub/local function
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1769 // or private function).
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1770
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1771 std::list<std::string> parentage = fcn->parent_fcn_names ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1772
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1773 octave_fcn_handle *fh
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1774 = new octave_fcn_handle (ov_fcn, fcn_name, parentage);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1775
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1776 return octave_value (fh);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1777 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1778 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1779
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1780 if (curr_fcn && (curr_fcn->is_class_method ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1781 || curr_fcn->is_class_constructor ()))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1782 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1783 std::string dispatch_class = curr_fcn->dispatch_class ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1784
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1785 octave_value ov_meth
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1786 = symtab.find_method (fcn_name, dispatch_class);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1787
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1788 if (ov_meth.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1789 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1790 octave_function *fcn = ov_meth.function_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1791
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1792 // FIXME: do we need to check that it is a method of
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1793 // dispatch_class, or is it sufficient to just check
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1794 // that it is a method?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1795
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1796 if (fcn->is_class_method ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1797 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1798 // Create CLASSSIMPLE handle to method but don't
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1799 // bind to the method. Lookup will be done later.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1800
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1801 octave_fcn_handle *fh
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1802 = new octave_fcn_handle (dispatch_class, fcn_name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1803
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1804 return octave_value (fh);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1805 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1806 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1807 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1808 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1810 octave_value ov_fcn = symtab.find_user_function (fcn_name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1811
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1812 // Create handle to SIMPLE function. If the function is not found
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1813 // now, then we will look for it again when the handle is used.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1814
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1815 return octave_value (new octave_fcn_handle (ov_fcn, fcn_name));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1816 }
28433
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1817
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1818 /*
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1819 %!test
31464
344e1152ed88 remove operators deprecated in version 7
John W. Eaton <jwe@octave.org>
parents: 30919
diff changeset
1820 %! x = {".'", "transpose";
28433
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1821 %! ".*", "times";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1822 %! "./", "rdivide";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1823 %! ".^", "power";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1824 %! ".\\", "ldivide";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1825 %! "<=", "le";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1826 %! "==", "eq";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1827 %! ">=", "ge";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1828 %! "!=", "ne";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1829 %! "~=", "ne";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1830 %! "~", "not";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1831 %! "!", "not";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1832 %! "\'", "ctranspose";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1833 %! "+", "plus";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1834 %! "-", "minus";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1835 %! "*", "mtimes";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1836 %! "/", "mrdivide";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1837 %! "^", "mpower";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1838 %! "\\", "mldivide";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1839 %! "<", "lt";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1840 %! ">", "gt";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1841 %! "&", "and";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1842 %! "|", "or"};
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1843 %! for i = 1:rows (x)
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1844 %! assert (functions (str2func (x{i,1})).function, x{i,2});
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1845 %! endfor
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1846 */
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1847
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1848 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1849 tree_evaluator::evaluate (tree_decl_elt *elt)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1850 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1851 // Do not allow functions to return null values.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1852
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1853 tree_identifier *id = elt->ident ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1854
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1855 return id ? id->evaluate (*this).storable_value () : octave_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1856 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1857
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1858 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1859 tree_evaluator::is_variable (const std::string& name) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1860 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1861 std::shared_ptr<stack_frame> frame
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1862 = m_call_stack.get_current_stack_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1863
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1864 return frame->is_variable (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1865 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1866
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1867 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1868 tree_evaluator::is_local_variable (const std::string& name) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1869 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1870 std::shared_ptr<stack_frame> frame
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1871 = m_call_stack.get_current_stack_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1872
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1873 return frame->is_local_variable (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1874 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1875
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1876 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1877 tree_evaluator::is_variable (const tree_expression *expr) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1878 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1879 if (expr->is_identifier ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1880 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1881 const tree_identifier *id
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1882 = dynamic_cast<const tree_identifier *> (expr);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1883
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1884 if (id->is_black_hole ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1885 return false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1886
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1887 return is_variable (id->symbol ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1888 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1889
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1890 return false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1891 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1892
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1893 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1894 tree_evaluator::is_defined (const tree_expression *expr) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1895 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1896 if (expr->is_identifier ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1897 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1898 const tree_identifier *id
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1899 = dynamic_cast<const tree_identifier *> (expr);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1900
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1901 return is_defined (id->symbol ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1902 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1903
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1904 return false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1905 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1906
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1907 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1908 tree_evaluator::is_variable (const symbol_record& sym) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1909 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1910 std::shared_ptr<stack_frame> frame
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1911 = m_call_stack.get_current_stack_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1912
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1913 return frame->is_variable (sym);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1914 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1915
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1916 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1917 tree_evaluator::is_defined (const symbol_record& sym) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1918 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1919 std::shared_ptr<stack_frame> frame
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1920 = m_call_stack.get_current_stack_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1921
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1922 return frame->is_defined (sym);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1923 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1924
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1925 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1926 tree_evaluator::is_global (const std::string& name) const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1927 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1928 std::shared_ptr<stack_frame> frame
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1929 = m_call_stack.get_current_stack_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1930
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1931 return frame->is_global (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1932 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1933
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1934 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1935 tree_evaluator::varval (const symbol_record& sym) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1936 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1937 std::shared_ptr<stack_frame> frame
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1938 = m_call_stack.get_current_stack_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1939
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1940 return frame->varval (sym);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1941 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1942
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1943 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1944 tree_evaluator::varval (const std::string& name) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1945 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1946 std::shared_ptr<stack_frame> frame
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1947 = m_call_stack.get_current_stack_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1948
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1949 return frame->varval (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1950 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1951
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1952 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1953 tree_evaluator::install_variable (const std::string& name,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1954 const octave_value& value,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1955 bool global)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1956 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1957 std::shared_ptr<stack_frame> frame
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1958 = m_call_stack.get_current_stack_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1959
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1960 return frame->install_variable (name, value, global);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1961 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1962
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1963 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1964 tree_evaluator::global_varval (const std::string& name) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1965 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1966 return m_call_stack.global_varval (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1967 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1968
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1969 octave_value&
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1970 tree_evaluator::global_varref (const std::string& name)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1971 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1972 return m_call_stack.global_varref (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1973 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1974
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1975 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1976 tree_evaluator::global_assign (const std::string& name,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1977 const octave_value& val)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1978 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1979 m_call_stack.global_varref (name) = val;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1980 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1981
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1982 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1983 tree_evaluator::top_level_varval (const std::string& name) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1984 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1985 return m_call_stack.get_top_level_value (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1986 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1987
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1988 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1989 tree_evaluator::top_level_assign (const std::string& name,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1990 const octave_value& val)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1991 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1992 m_call_stack.set_top_level_value (name, val);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1993 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1994
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1995 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1996 tree_evaluator::assign (const std::string& name, const octave_value& val)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1997 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1998 std::shared_ptr<stack_frame> frame
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1999 = m_call_stack.get_current_stack_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2000
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2001 frame->assign (name, val);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2002 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2003
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2004 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2005 tree_evaluator::assignin (const std::string& context,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2006 const std::string& name, const octave_value& val)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2007 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2008 // FIXME: Can this be done without an unwind-protect frame, simply
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2009 // by getting a reference to the caller or base stack frame and
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2010 // calling assign on that?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2011
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2012 unwind_action act ([=] (std::size_t frm)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2013 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2014 m_call_stack.restore_frame (frm);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2015 }, m_call_stack.current_frame ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2016
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2017 if (context == "caller")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2018 m_call_stack.goto_caller_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2019 else if (context == "base")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2020 m_call_stack.goto_base_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2021 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2022 error (R"(assignin: CONTEXT must be "caller" or "base")");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2023
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2024 if (valid_identifier (name))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2025 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2026 // Put the check here so that we don't slow down assignments
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2027 // generally. Any that go through Octave's parser should have
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2028 // already been checked.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2029
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2030 if (iskeyword (name))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2031 error ("assignin: invalid assignment to keyword '%s'",
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2032 name.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2033
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2034 assign (name, val);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2035 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2036 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2037 error ("assignin: invalid variable name '%s'", name.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2038 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2039
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2040 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2041 tree_evaluator::source_file (const std::string& file_name,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2042 const std::string& context,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2043 bool verbose, bool require_file)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2044 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2045 // Map from absolute name of script file to recursion level. We
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2046 // use a map instead of simply placing a limit on recursion in the
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2047 // source_file function so that two mutually recursive scripts
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2048 // written as
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2049 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2050 // foo1.m:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2051 // ------
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2052 // foo2
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2053 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2054 // foo2.m:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2055 // ------
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2056 // foo1
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2057 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2058 // and called with
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2059 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2060 // foo1
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2061 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2062 // (for example) will behave the same if they are written as
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2063 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2064 // foo1.m:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2065 // ------
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2066 // source ("foo2.m")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2067 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2068 // foo2.m:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2069 // ------
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2070 // source ("foo1.m")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2071 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2072 // and called with
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2073 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2074 // source ("foo1.m")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2075 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2076 // (for example).
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2077
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2078 static std::map<std::string, int> source_call_depth;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2079
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2080 std::string file_full_name
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2081 = sys::file_ops::tilde_expand (file_name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2082
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2083 std::size_t pos
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2084 = file_full_name.find_last_of (sys::file_ops::dir_sep_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2085
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2086 std::string dir_name = file_full_name.substr (0, pos);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2087
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2088 file_full_name = sys::env::make_absolute (file_full_name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2089
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2090 unwind_protect frame;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2091
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2092 if (source_call_depth.find (file_full_name) == source_call_depth.end ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2093 source_call_depth[file_full_name] = -1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2094
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2095 frame.protect_var (source_call_depth[file_full_name]);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2096
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2097 source_call_depth[file_full_name]++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2098
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2099 if (source_call_depth[file_full_name] >= max_recursion_depth ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2100 error ("max_recursion_depth exceeded");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2101
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2102 if (! context.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2103 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2104 frame.add (&call_stack::restore_frame, &m_call_stack,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2105 m_call_stack.current_frame ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2106
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2107 if (context == "caller")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2108 m_call_stack.goto_caller_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2109 else if (context == "base")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2110 m_call_stack.goto_base_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2111 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2112 error (R"(source: CONTEXT must be "caller" or "base")");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2113 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2114
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2115 // Find symbol name that would be in symbol_table, if it were loaded.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2116 std::size_t dir_end
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2117 = file_name.find_last_of (sys::file_ops::dir_sep_chars ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2118 dir_end = (dir_end == std::string::npos) ? 0 : dir_end + 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2119
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2120 std::size_t extension = file_name.find_last_of ('.');
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2121 if (extension == std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2122 extension = file_name.length ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2123
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2124 std::string symbol = file_name.substr (dir_end, extension - dir_end);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2125 std::string full_name = sys::canonicalize_file_name (file_name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2126
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2127 // Check if this file is already loaded (or in the path)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2128 symbol_table& symtab = m_interpreter.get_symbol_table ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2129 octave_value ov_code = symtab.fcn_table_find (symbol);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2130
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2131 // For compatibility with Matlab, accept both scripts and
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2132 // functions.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2133
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2134 if (ov_code.is_user_code ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2135 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2136 octave_user_code *code = ov_code.user_code_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2137
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2138 if (! code
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2139 || (sys::canonicalize_file_name (code->fcn_file_name ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2140 != full_name))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2141 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2142 // Wrong file, so load it below.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2143 ov_code = octave_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2144 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2145 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2146 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2147 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2148 // Not a script, so load it below.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2149 ov_code = octave_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2150 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2151
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2152 // If no symbol of this name, or the symbol is for a different
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2153 // file, load.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2154
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2155 if (ov_code.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2156 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2157 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2158 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2159 ov_code = parse_fcn_file (m_interpreter, file_full_name,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2160 file_name, dir_name, "", "",
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2161 require_file, true, false, false);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2162 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2163 catch (execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2164 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2165 error (ee, "source: error sourcing file '%s'",
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2166 file_full_name.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2167 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2168 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2169
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2170 // Return or error if we don't have a valid script or function.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2171
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2172 if (ov_code.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2173 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2174
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2175 if (! ov_code.is_user_code ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2176 error ("source: %s is not a script", full_name.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2177
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2178 if (verbose)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2179 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2180 octave_stdout << "executing commands from " << full_name << " ... ";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2181 octave_stdout.flush ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2182 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2183
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2184 octave_user_code *code = ov_code.user_code_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2185
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2186 code->call (*this, 0, octave_value_list ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2187
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2188 if (verbose)
32687
c34d571b5855 Fix extra newline displayed with --init-trace startup option (bug #65107)
Rik <rik@octave.org>
parents: 32633
diff changeset
2189 {
c34d571b5855 Fix extra newline displayed with --init-trace startup option (bug #65107)
Rik <rik@octave.org>
parents: 32633
diff changeset
2190 octave_stdout << "done." << std::endl;
c34d571b5855 Fix extra newline displayed with --init-trace startup option (bug #65107)
Rik <rik@octave.org>
parents: 32633
diff changeset
2191 octave_stdout.flush ();
c34d571b5855 Fix extra newline displayed with --init-trace startup option (bug #65107)
Rik <rik@octave.org>
parents: 32633
diff changeset
2192 }
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2193 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2194
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2195 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2196 tree_evaluator::set_auto_fcn_var (stack_frame::auto_var_type avt,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2197 const octave_value& val)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2198 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2199 m_call_stack.set_auto_fcn_var (avt, val);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2200 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2201
32151
72dcb1cef2c9 maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents: 32148
diff changeset
2202 void
32125
fc5a9a9e5cea new set_nargin and set_nargout functions for evaluator
Petter T. <petter.vilhelm@gmail.com>
parents: 32095
diff changeset
2203 tree_evaluator::set_nargin (int nargin)
fc5a9a9e5cea new set_nargin and set_nargout functions for evaluator
Petter T. <petter.vilhelm@gmail.com>
parents: 32095
diff changeset
2204 {
fc5a9a9e5cea new set_nargin and set_nargout functions for evaluator
Petter T. <petter.vilhelm@gmail.com>
parents: 32095
diff changeset
2205 m_call_stack.set_nargin (nargin);
fc5a9a9e5cea new set_nargin and set_nargout functions for evaluator
Petter T. <petter.vilhelm@gmail.com>
parents: 32095
diff changeset
2206 }
fc5a9a9e5cea new set_nargin and set_nargout functions for evaluator
Petter T. <petter.vilhelm@gmail.com>
parents: 32095
diff changeset
2207
32151
72dcb1cef2c9 maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents: 32148
diff changeset
2208 void
32125
fc5a9a9e5cea new set_nargin and set_nargout functions for evaluator
Petter T. <petter.vilhelm@gmail.com>
parents: 32095
diff changeset
2209 tree_evaluator::set_nargout (int nargout)
fc5a9a9e5cea new set_nargin and set_nargout functions for evaluator
Petter T. <petter.vilhelm@gmail.com>
parents: 32095
diff changeset
2210 {
fc5a9a9e5cea new set_nargin and set_nargout functions for evaluator
Petter T. <petter.vilhelm@gmail.com>
parents: 32095
diff changeset
2211 m_call_stack.set_nargout (nargout);
fc5a9a9e5cea new set_nargin and set_nargout functions for evaluator
Petter T. <petter.vilhelm@gmail.com>
parents: 32095
diff changeset
2212 }
fc5a9a9e5cea new set_nargin and set_nargout functions for evaluator
Petter T. <petter.vilhelm@gmail.com>
parents: 32095
diff changeset
2213
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2214 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2215 tree_evaluator::get_auto_fcn_var (stack_frame::auto_var_type avt) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2216 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2217 return m_call_stack.get_auto_fcn_var (avt);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2218 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2219
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2220 void
32593
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2221 tree_evaluator::set_active_bytecode_ip (int ip)
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2222 {
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2223 m_call_stack.set_active_bytecode_ip (ip);
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2224 }
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2225
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2226 void
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2227 tree_evaluator::define_parameter_list_from_arg_vector
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2228 (tree_parameter_list *param_list, const octave_value_list& args)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2229 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2230 if (! param_list || param_list->varargs_only ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2231 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2232
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2233 int i = -1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2234
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2235 for (tree_decl_elt *elt : *param_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2236 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2237 i++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2238
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2239 octave_lvalue ref = elt->lvalue (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2240
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2241 if (i < args.length ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2242 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2243 if (args(i).is_defined () && args(i).is_magic_colon ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2244 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2245 if (! eval_decl_elt (elt))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2246 error ("no default value for argument %d", i+1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2247 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2248 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2249 ref.define (args(i));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2250 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2251 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2252 eval_decl_elt (elt);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2253 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2254 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2255
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2256 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2257 tree_evaluator::undefine_parameter_list (tree_parameter_list *param_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2258 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2259 for (tree_decl_elt *elt : *param_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2260 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2261 octave_lvalue ref = elt->lvalue (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2262
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2263 ref.assign (octave_value::op_asn_eq, octave_value ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2264 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2265 }
25382
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2266
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2267 // END is documented in op-kw-docs.
29968
7aa4d8c049e5 eliminate obsolete DEFCONSTFUN and DEFCONSTMETHOD macros
John W. Eaton <jwe@octave.org>
parents: 29961
diff changeset
2268 DEFMETHOD (end, interp, args, ,
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2269 doc: /* -*- texinfo -*-
25382
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2270 @deftypefn {} {} end
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2271 Last element of an array or the end of any @code{for}, @code{parfor},
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2272 @code{if}, @code{do}, @code{while}, @code{function}, @code{switch},
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2273 @code{try}, or @code{unwind_protect} block.
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2274
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2275 As an index of an array, the magic index @qcode{"end"} refers to the
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2276 last valid entry in an indexing operation.
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2277
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2278 Example:
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2279
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2280 @example
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2281 @group
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2282 @var{x} = [ 1 2 3; 4 5 6 ];
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2283 @var{x}(1,end)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2284 @result{} 3
25382
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2285 @var{x}(end,1)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2286 @result{} 4
25382
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2287 @var{x}(end,end)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2288 @result{} 6
25382
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2289 @end group
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2290 @end example
32904
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2291
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2292 Programming notes:
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2293 @enumerate
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2294 @item
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2295 The @code{end} keyword cannot be used within @code{subsref},
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2296 @code{subsasgn}, or @code{substruct} for manual indexing operations.
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2297
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2298 @item
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2299 For custom classes, to enable use of @code{end} in indexing expressions it
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2300 must be overloaded with a function definition such as:
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2301    @example
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2302    @group
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2303    function last_index = end (obj, end_dim, ndim_obj)
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2304      if (end_dim == ndim_obj)
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2305        last_index = prod (size (obj)(end_dim:ndim_obj));
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2306      else
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2307        last_index = size (obj, end_dim);
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2308      endif
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2309    endfunction
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2310    @end group
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2311    @end example
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2312 For more information see
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2313 @ref{Object Oriented Programming, , Object Oriented Programming}.
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2314 @end enumerate
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2315
25382
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2316 @seealso{for, parfor, if, do, while, function, switch, try, unwind_protect}
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2317 @end deftypefn */)
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2318 {
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2319 tree_evaluator& tw = interp.get_evaluator ();
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2320
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2321 return tw.evaluate_end_expression (args);
25382
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2322 }
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2323
27100
b453b586da16 improve error message when indexing undefined object with "end" (bug #33637)
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
2324 /*
28617
0bac488f17fa throw error if 'end' is applied to undefined symbol (bug #58830)
John W. Eaton <jwe@octave.org>
parents: 28560
diff changeset
2325 %!test <*58830>
0bac488f17fa throw error if 'end' is applied to undefined symbol (bug #58830)
John W. Eaton <jwe@octave.org>
parents: 28560
diff changeset
2326 %! fail ("__undef_sym__ (end)",
0bac488f17fa throw error if 'end' is applied to undefined symbol (bug #58830)
John W. Eaton <jwe@octave.org>
parents: 28560
diff changeset
2327 %! "invalid use of 'end': may only be used to index existing value");
28696
2a47fa406ed8 allow 'end' indexing to work for nested function calls (bug #58953)
John W. Eaton <jwe@octave.org>
parents: 28617
diff changeset
2328
30322
552239d43c18 update bug status
John W. Eaton <jwe@octave.org>
parents: 29847
diff changeset
2329 %!test <*58953>
28696
2a47fa406ed8 allow 'end' indexing to work for nested function calls (bug #58953)
John W. Eaton <jwe@octave.org>
parents: 28617
diff changeset
2330 %! x = 1:10;
2a47fa406ed8 allow 'end' indexing to work for nested function calls (bug #58953)
John W. Eaton <jwe@octave.org>
parents: 28617
diff changeset
2331 %! assert (x(end), 10);
2a47fa406ed8 allow 'end' indexing to work for nested function calls (bug #58953)
John W. Eaton <jwe@octave.org>
parents: 28617
diff changeset
2332 %! assert (x(minus (end, 1)), 9);
2a47fa406ed8 allow 'end' indexing to work for nested function calls (bug #58953)
John W. Eaton <jwe@octave.org>
parents: 28617
diff changeset
2333 %! assert (x(minus (minus (end, 1), 1)), 8);
27100
b453b586da16 improve error message when indexing undefined object with "end" (bug #33637)
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
2334 */
b453b586da16 improve error message when indexing undefined object with "end" (bug #33637)
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
2335
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2336 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2337 tree_evaluator::convert_to_const_vector (tree_argument_list *args)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2338 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2339 std::list<octave_value> arg_vals;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2340
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2341 for (auto elt : *args)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2342 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2343 // FIXME: is it possible for elt to be invalid?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2344
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2345 if (! elt)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2346 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2347
32410
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
2348 // Evaluate with unknown number of output arguments
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
2349 octave_value tmp = elt->evaluate (*this, -1);
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2350
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2351 if (tmp.is_cs_list ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2352 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2353 octave_value_list tmp_ovl = tmp.list_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2354
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2355 for (octave_idx_type i = 0; i < tmp_ovl.length (); i++)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2356 arg_vals.push_back (tmp_ovl(i));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2357 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2358 else if (tmp.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2359 arg_vals.push_back (tmp);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2360 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2361
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2362 return octave_value_list (arg_vals);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2363 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2364
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2365 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2366 tree_evaluator::convert_return_list_to_const_vector
32780
e96e2f9f9f37 avoid error with ignored values returned from function calls (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32632
diff changeset
2367 (tree_parameter_list *ret_list, int nargout, const Cell& varargout)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2368 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2369 octave_idx_type vlen = varargout.numel ();
32936
0b5f3219b650 eliminate all uses of base_list<T> template
John W. Eaton <jwe@octave.org>
parents: 32905
diff changeset
2370 int len = ret_list->size ();
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2371
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2372 // Special case. Will do a shallow copy.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2373 if (len == 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2374 return varargout;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2375 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2376 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2377 int i = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2378
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2379 if (nargout <= len)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2380 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2381 int nout = nargout > 0 ? nargout : 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2382 octave_value_list retval (nout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2383
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2384 for (tree_decl_elt *elt : *ret_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2385 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2386 if (nargout == 0 && ! is_defined (elt->ident ()))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2387 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2388
32780
e96e2f9f9f37 avoid error with ignored values returned from function calls (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32632
diff changeset
2389 if (is_defined (elt->ident ()))
e96e2f9f9f37 avoid error with ignored values returned from function calls (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32632
diff changeset
2390 retval(i) = evaluate (elt);
e96e2f9f9f37 avoid error with ignored values returned from function calls (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32632
diff changeset
2391
e96e2f9f9f37 avoid error with ignored values returned from function calls (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32632
diff changeset
2392 i++;
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2393
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2394 if (i == nout)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2395 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2396 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2397
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2398 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2399 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2400 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2401 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2402 octave_value_list retval (len + vlen);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2403
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2404 for (tree_decl_elt *elt : *ret_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2405 {
32780
e96e2f9f9f37 avoid error with ignored values returned from function calls (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32632
diff changeset
2406 if (is_defined (elt->ident ()))
e96e2f9f9f37 avoid error with ignored values returned from function calls (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32632
diff changeset
2407 retval(i) = evaluate (elt);
e96e2f9f9f37 avoid error with ignored values returned from function calls (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32632
diff changeset
2408
e96e2f9f9f37 avoid error with ignored values returned from function calls (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32632
diff changeset
2409 i++;
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2410 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2411
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2412 for (octave_idx_type j = 0; j < vlen; j++)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2413 retval(i++) = varargout(j);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2414
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2415 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2416 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2417 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2418 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2419
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2420 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2421 tree_evaluator::eval_decl_elt (tree_decl_elt *elt)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2422 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2423 bool retval = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2424
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2425 tree_identifier *id = elt->ident ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2426 tree_expression *expr = elt->expression ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2427
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2428 if (id && expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2429 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2430 octave_lvalue ult = id->lvalue (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2431
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2432 octave_value init_val = expr->evaluate (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2433
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2434 ult.assign (octave_value::op_asn_eq, init_val);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2435
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2436 retval = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2437 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2438
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2439 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2440 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2441
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2442 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2443 tree_evaluator::switch_case_label_matches (tree_switch_case *expr,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2444 const octave_value& val)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2445 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2446 tree_expression *label = expr->case_label ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2447
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2448 octave_value label_value = label->evaluate (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2449
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2450 if (label_value.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2451 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2452 if (label_value.iscell ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2453 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2454 Cell cell (label_value.cell_value ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2455
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2456 for (octave_idx_type i = 0; i < cell.rows (); i++)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2457 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2458 for (octave_idx_type j = 0; j < cell.columns (); j++)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2459 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2460 bool match = val.is_equal (cell(i,j));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2461
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2462 if (match)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2463 return true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2464 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2465 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2466 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2467 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2468 return val.is_equal (label_value);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2469 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2470
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2471 return false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2472 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2473
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2474 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2475 tree_evaluator::push_stack_frame (const symbol_scope& scope)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2476 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2477 m_call_stack.push (scope);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2478 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2479
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2480 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2481 tree_evaluator::push_stack_frame (octave_user_function *fcn,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2482 const std::shared_ptr<stack_frame>& closure_frames)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2483 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2484 m_call_stack.push (fcn, closure_frames);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2485 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2486
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2487 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2488 tree_evaluator::push_stack_frame (octave_user_function *fcn,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2489 const stack_frame::local_vars_map& local_vars,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2490 const std::shared_ptr<stack_frame>& closure_frames)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2491 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2492 m_call_stack.push (fcn, local_vars, closure_frames);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2493 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2494
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2495 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2496 tree_evaluator::push_stack_frame (octave_user_script *script)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2497 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2498 m_call_stack.push (script);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2499 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2500
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2501 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2502 tree_evaluator::push_stack_frame (octave_function *fcn)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2503 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2504 m_call_stack.push (fcn);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2505 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2506
32593
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2507 #if defined (OCTAVE_ENABLE_BYTECODE_EVALUATOR)
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2508
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2509 void tree_evaluator::push_stack_frame (vm &vm, octave_user_function *fcn, int nargout, int nargin)
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2510 {
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2511 m_call_stack.push (vm, fcn, nargout, nargin);
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2512 }
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2513
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2514 void tree_evaluator::push_stack_frame (vm &vm, octave_user_script *fcn, int nargout, int nargin)
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2515 {
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2516 m_call_stack.push (vm, fcn, nargout, nargin);
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2517 }
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2518
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2519 void tree_evaluator::push_stack_frame (vm &vm, octave_user_code *fcn, int nargout, int nargin)
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2520 {
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2521 if (fcn->is_user_function ())
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2522 m_call_stack.push (vm, static_cast<octave_user_function*> (fcn), nargout, nargin);
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2523 else
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2524 m_call_stack.push (vm, static_cast<octave_user_script*> (fcn), nargout, nargin);
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2525 }
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2526
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2527 void tree_evaluator::push_stack_frame (vm &vm, octave_user_code *fcn, int nargout, int nargin,
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2528 const std::shared_ptr<stack_frame>& closure_frames)
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2529 {
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2530
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2531 CHECK_PANIC (fcn->is_user_function ());
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2532 m_call_stack.push (vm, static_cast<octave_user_function*> (fcn), nargout, nargin, closure_frames);
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2533 }
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2534
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2535 #endif
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2536
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2537 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2538 tree_evaluator::pop_stack_frame ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2539 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2540 m_call_stack.pop ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2541 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2542
32146
18c6b6997055 new function to pop and return top of call stack
Petter T. <petter.vilhelm@gmail.com>
parents: 32131
diff changeset
2543 std::shared_ptr<stack_frame>
18c6b6997055 new function to pop and return top of call stack
Petter T. <petter.vilhelm@gmail.com>
parents: 32131
diff changeset
2544 tree_evaluator::pop_return_stack_frame ()
18c6b6997055 new function to pop and return top of call stack
Petter T. <petter.vilhelm@gmail.com>
parents: 32131
diff changeset
2545 {
18c6b6997055 new function to pop and return top of call stack
Petter T. <petter.vilhelm@gmail.com>
parents: 32131
diff changeset
2546 return m_call_stack.pop_return ();
18c6b6997055 new function to pop and return top of call stack
Petter T. <petter.vilhelm@gmail.com>
parents: 32131
diff changeset
2547 }
18c6b6997055 new function to pop and return top of call stack
Petter T. <petter.vilhelm@gmail.com>
parents: 32131
diff changeset
2548
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2549 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2550 tree_evaluator::current_line () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2551 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2552 return m_call_stack.current_line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2553 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2554
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2555 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2556 tree_evaluator::current_column () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2557 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2558 return m_call_stack.current_column ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2559 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2560
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2561 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2562 tree_evaluator::debug_user_code_line () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2563 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2564 return m_call_stack.debug_user_code_line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2565 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2566
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2567 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2568 tree_evaluator::debug_user_code_column () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2569 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2570 return m_call_stack.debug_user_code_column ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2571 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2572
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2573 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2574 tree_evaluator::debug_where (std::ostream& os) const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2575 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2576 std::shared_ptr<stack_frame> frm = m_call_stack.current_user_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2577
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2578 frm->display_stopped_in_message (os);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2579 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2580
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2581 octave_user_code *
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2582 tree_evaluator::current_user_code () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2583 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2584 return m_call_stack.current_user_code ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2585 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2586
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2587 unwind_protect *
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2588 tree_evaluator::curr_fcn_unwind_protect_frame ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2589 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2590 return m_call_stack.curr_fcn_unwind_protect_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2591 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2592
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2593 octave_user_code *
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2594 tree_evaluator::debug_user_code () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2595 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2596 return m_call_stack.debug_user_code ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2597 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2598
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2599 octave_function *
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2600 tree_evaluator::current_function (bool skip_first) const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2601 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2602 return m_call_stack.current_function (skip_first);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2603 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2604
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2605 octave_function *
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2606 tree_evaluator::caller_function () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2607 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2608 return m_call_stack.current_function (true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2609 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2610
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2611 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2612 tree_evaluator::goto_frame (std::size_t n, bool verbose)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2613 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2614 return m_call_stack.goto_frame (n, verbose);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2615 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2616
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2617 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2618 tree_evaluator::goto_caller_frame ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2619 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2620 m_call_stack.goto_caller_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2621 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2622
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2623 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2624 tree_evaluator::goto_base_frame ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2625 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2626 m_call_stack.goto_base_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2627 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2628
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2629 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2630 tree_evaluator::restore_frame (std::size_t n)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2631 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2632 return m_call_stack.restore_frame (n);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2633 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2634
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2635 std::string
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2636 tree_evaluator::get_dispatch_class () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2637 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2638 return m_call_stack.get_dispatch_class ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2639 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2640
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2641 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2642 tree_evaluator::set_dispatch_class (const std::string& class_name)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2643 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2644 m_call_stack.set_dispatch_class (class_name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2645 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2646
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2647 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2648 tree_evaluator::is_class_method_executing (std::string& dclass) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2649 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2650 return m_call_stack.is_class_method_executing (dclass);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2651 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2652
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2653 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2654 tree_evaluator::is_class_constructor_executing (std::string& dclass) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2655 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2656 return m_call_stack.is_class_constructor_executing (dclass);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2657 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2658
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2659 std::list<std::shared_ptr<stack_frame>>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2660 tree_evaluator::backtrace_frames (octave_idx_type& curr_user_frame) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2661 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2662 return m_call_stack.backtrace_frames (curr_user_frame);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2663 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2664
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2665 std::list<std::shared_ptr<stack_frame>>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2666 tree_evaluator::backtrace_frames () const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2667 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2668 return m_call_stack.backtrace_frames ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2669 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2670
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2671 std::list<frame_info>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2672 tree_evaluator::backtrace_info (octave_idx_type& curr_user_frame,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2673 bool print_subfn) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2674 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2675 return m_call_stack.backtrace_info (curr_user_frame, print_subfn);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2676 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2677
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2678 std::list<frame_info>
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2679 tree_evaluator::backtrace_info () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2680 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2681 return m_call_stack.backtrace_info ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2682 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2683
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2684 octave_map
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2685 tree_evaluator::backtrace (octave_idx_type& curr_user_frame,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2686 bool print_subfn) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2687 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2688 return m_call_stack.backtrace (curr_user_frame, print_subfn);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2689 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2690
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2691 octave_map
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2692 tree_evaluator::backtrace () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2693 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2694 return m_call_stack.backtrace ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2695 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2696
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2697 octave_map
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2698 tree_evaluator::empty_backtrace () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2699 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2700 return m_call_stack.empty_backtrace ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2701 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2702
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2703 std::string
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2704 tree_evaluator::backtrace_message () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2705 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2706 std::list<frame_info> frames = backtrace_info ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2707
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2708 std::ostringstream buf;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2709
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2710 for (const auto& frm : frames)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2711 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2712 buf << " " << frm.fcn_name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2713
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2714 int line = frm.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2715
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2716 if (line > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2717 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2718 buf << " at line " << line;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2719
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2720 int column = frm.column ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2721
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2722 if (column > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2723 buf << " column " << column;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2724
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2725 buf << "\n";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2726 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2727 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2728
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2729 return buf.str ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2730 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2731
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2732 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2733 tree_evaluator::push_dummy_scope (const std::string& name)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2734 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2735 symbol_scope dummy_scope (name + "$dummy");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2736
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2737 m_call_stack.push (dummy_scope);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2738 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2739
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2740 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2741 tree_evaluator::pop_scope ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2742 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2743 m_call_stack.pop ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2744 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2745
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2746 symbol_scope
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2747 tree_evaluator::get_top_scope () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2748 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2749 return m_call_stack.top_scope ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2750 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2751
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2752 symbol_scope
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2753 tree_evaluator::get_current_scope () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2754 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2755 return m_call_stack.current_scope ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2756 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2757
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2758 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2759 tree_evaluator::mlock (bool skip_first) const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2760 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2761 octave_function *fcn = m_call_stack.current_function (skip_first);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2762
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2763 if (! fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2764 error ("mlock: invalid use outside a function");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2765
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2766 if (fcn->is_builtin_function ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2767 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2768 warning ("mlock: locking built-in function has no effect");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2769 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2770 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2771
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2772 fcn->lock ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2773 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2774
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2775 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2776 tree_evaluator::munlock (bool skip_first) const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2777 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2778 octave_function *fcn = m_call_stack.current_function (skip_first);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2779
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2780 if (! fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2781 error ("munlock: invalid use outside a function");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2782
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2783 if (fcn->is_builtin_function ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2784 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2785 warning ("munlock: unlocking built-in function has no effect");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2786 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2787 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2788
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2789 fcn->unlock ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2790 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2791
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2792 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2793 tree_evaluator::mislocked (bool skip_first) const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2794 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2795 octave_function *fcn = m_call_stack.current_function (skip_first);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2796
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2797 if (! fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2798 error ("mislocked: invalid use outside a function");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2799
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2800 return fcn->islocked ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2801 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2802
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2803 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2804 tree_evaluator::max_stack_depth (const octave_value_list& args, int nargout)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2805 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2806 return m_call_stack.max_stack_depth (args, nargout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2807 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2808
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2809 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2810 tree_evaluator::display_call_stack () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2811 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2812 m_call_stack.display ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2813 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2814
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2815 octave_value
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2816 tree_evaluator::find (const std::string& name)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2817 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2818 std::shared_ptr<stack_frame> frame
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2819 = m_call_stack.get_current_stack_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2820
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2821 octave_value val = frame->varval (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2822
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2823 if (val.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2824 return val;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2825
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2826 // Subfunction. I think it only makes sense to check for
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2827 // subfunctions if we are currently executing a function defined
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2828 // from a .m file.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2829
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2830 octave_value fcn = frame->find_subfunction (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2831
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2832 if (fcn.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2833 return fcn;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2834
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2835 symbol_table& symtab = m_interpreter.get_symbol_table ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2836
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2837 return symtab.fcn_table_find (name, ovl ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2838 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2839
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2840 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2841 tree_evaluator::clear_objects ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2842 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2843 std::shared_ptr<stack_frame> frame
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2844 = m_call_stack.get_current_stack_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2845
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2846 frame->clear_objects ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2847 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2848
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2849 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2850 tree_evaluator::clear_variable (const std::string& name)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2851 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2852 std::shared_ptr<stack_frame> frame
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2853 = m_call_stack.get_current_stack_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2854
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2855 frame->clear_variable (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2856 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2857
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2858 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2859 tree_evaluator::clear_variable_pattern (const std::string& pattern)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2860 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2861 std::shared_ptr<stack_frame> frame
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2862 = m_call_stack.get_current_stack_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2863
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2864 frame->clear_variable_pattern (pattern);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2865 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2866
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2867 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2868 tree_evaluator::clear_variable_regexp (const std::string& pattern)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2869 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2870 std::shared_ptr<stack_frame> frame
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2871 = m_call_stack.get_current_stack_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2872
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2873 frame->clear_variable_regexp (pattern);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2874 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2875
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2876 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2877 tree_evaluator::clear_variables ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2878 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2879 std::shared_ptr<stack_frame> frame
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2880 = m_call_stack.get_current_stack_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2881
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2882 frame->clear_variables ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2883 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2884
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2885 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2886 tree_evaluator::clear_global_variable (const std::string& name)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2887 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2888 m_call_stack.clear_global_variable (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2889 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2890
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2891 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2892 tree_evaluator::clear_global_variable_pattern (const std::string& pattern)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2893 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2894 m_call_stack.clear_global_variable_pattern (pattern);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2895 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2896
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2897 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2898 tree_evaluator::clear_global_variable_regexp(const std::string& pattern)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2899 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2900 m_call_stack.clear_global_variable_regexp (pattern);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2901 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2902
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2903 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2904 tree_evaluator::clear_global_variables ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2905 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2906 m_call_stack.clear_global_variables ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2907 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2908
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2909 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2910 tree_evaluator::clear_all (bool force)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2911 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2912 // FIXME: should this also clear objects?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2913
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2914 clear_variables ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2915 clear_global_variables ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2916
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2917 symbol_table& symtab = m_interpreter.get_symbol_table ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2918
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2919 symtab.clear_functions (force);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2920 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2921
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2922 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2923 tree_evaluator::clear_symbol (const std::string& name)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2924 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2925 // FIXME: are we supposed to do both here?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2926
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2927 clear_variable (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2928
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2929 symbol_table& symtab = m_interpreter.get_symbol_table ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2930
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2931 symtab.clear_function (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2932 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2933
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2934 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2935 tree_evaluator::clear_symbol_pattern (const std::string& pattern)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2936 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2937 // FIXME: are we supposed to do both here?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2938
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2939 clear_variable_pattern (pattern);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2940
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2941 symbol_table& symtab = m_interpreter.get_symbol_table ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2942
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2943 symtab.clear_function_pattern (pattern);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2944 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2945
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2946 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2947 tree_evaluator::clear_symbol_regexp (const std::string& pattern)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2948 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2949 // FIXME: are we supposed to do both here?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2950
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2951 clear_variable_regexp (pattern);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2952
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2953 symbol_table& symtab = m_interpreter.get_symbol_table ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2954
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2955 symtab.clear_function_regexp (pattern);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2956 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2957
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2958 std::list<std::string>
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2959 tree_evaluator::global_variable_names () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2960 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2961 return m_call_stack.global_variable_names ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2962 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2963
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2964 std::list<std::string>
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2965 tree_evaluator::top_level_variable_names () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2966 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2967 return m_call_stack.top_level_variable_names ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2968 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2969
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2970 std::list<std::string>
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2971 tree_evaluator::variable_names () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2972 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2973 return m_call_stack.variable_names ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2974 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2975
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2976 // Return a pointer to the user-defined function FNAME. If FNAME is empty,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2977 // search backward for the first user-defined function in the
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2978 // current call stack.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2979
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2980 octave_user_code *
32434
9296e2b74d0b Overhaul handling of breakpoints in classdef methods (bug #46451).
Markus Mützel <markus.muetzel@gmx.de>
parents: 32427
diff changeset
2981 tree_evaluator::get_user_code (const std::string& fname)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2982 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2983 octave_user_code *user_code = nullptr;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2984
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2985 if (fname.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2986 user_code = m_call_stack.debug_user_code ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2987 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2988 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2989 std::string name = fname;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2990
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2991 if (sys::file_ops::dir_sep_char () != '/' && name[0] == '@')
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2992 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2993 auto beg = name.begin () + 2; // never have @/method
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2994 auto end = name.end () - 1; // never have trailing '/'
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2995 std::replace (beg, end, '/', sys::file_ops::dir_sep_char ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2996 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2997
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2998 std::size_t name_len = name.length ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2999
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3000 if (name_len > 2 && name.substr (name_len-2) == ".m")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3001 name = name.substr (0, name_len-2);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3002
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3003 if (name.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3004 return nullptr;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3005
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3006 symbol_table& symtab = m_interpreter.get_symbol_table ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3007
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3008 octave_value fcn;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3009 std::size_t p2 = std::string::npos;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3010
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3011 if (name[0] == '@')
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3012 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3013 std::size_t p1 = name.find (sys::file_ops::dir_sep_char (), 1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3014
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3015 if (p1 == std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3016 return nullptr;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3017
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3018 std::string dispatch_type = name.substr (1, p1-1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3019
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3020 p2 = name.find ('>', p1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3021
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3022 std::string method = name.substr (p1+1, p2-1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3023
32434
9296e2b74d0b Overhaul handling of breakpoints in classdef methods (bug #46451).
Markus Mützel <markus.muetzel@gmx.de>
parents: 32427
diff changeset
3024 // first check for classdef method
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3025 cdef_manager& cdm = m_interpreter.get_cdef_manager ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3026
32434
9296e2b74d0b Overhaul handling of breakpoints in classdef methods (bug #46451).
Markus Mützel <markus.muetzel@gmx.de>
parents: 32427
diff changeset
3027 // fcn = cdm.find_method_symbol (method, dispatch_type);
9296e2b74d0b Overhaul handling of breakpoints in classdef methods (bug #46451).
Markus Mützel <markus.muetzel@gmx.de>
parents: 32427
diff changeset
3028
9296e2b74d0b Overhaul handling of breakpoints in classdef methods (bug #46451).
Markus Mützel <markus.muetzel@gmx.de>
parents: 32427
diff changeset
3029 cdef_class cls = cdm.find_class (dispatch_type, false);
9296e2b74d0b Overhaul handling of breakpoints in classdef methods (bug #46451).
Markus Mützel <markus.muetzel@gmx.de>
parents: 32427
diff changeset
3030 if (cls.ok () && cls.get_name () == dispatch_type)
9296e2b74d0b Overhaul handling of breakpoints in classdef methods (bug #46451).
Markus Mützel <markus.muetzel@gmx.de>
parents: 32427
diff changeset
3031 fcn = cls.find_method (method).get_function ();
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3032
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3033 // If there is no classdef method, then try legacy classes.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3034 if (fcn.is_undefined ())
32434
9296e2b74d0b Overhaul handling of breakpoints in classdef methods (bug #46451).
Markus Mützel <markus.muetzel@gmx.de>
parents: 32427
diff changeset
3035 fcn = symtab.find_method (method, dispatch_type);
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3036 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3037 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3038 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3039 p2 = name.find ('>');
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3040
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3041 std::string main_fcn = name.substr (0, p2);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3042
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3043 fcn = symtab.find_function (main_fcn);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3044 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3045
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3046 // List of function names sub1>sub2>...
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3047 std::string subfuns;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3048
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3049 if (p2 != std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3050 subfuns = name.substr (p2+1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3051
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3052 if (fcn.is_defined () && fcn.is_user_code ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3053 user_code = fcn.user_code_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3054
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3055 if (! user_code || subfuns.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3056 return user_code;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3057
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3058 fcn = user_code->find_subfunction (subfuns);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3059
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3060 if (fcn.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3061 return nullptr;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3062
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3063 user_code = fcn.user_code_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3064 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3065
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3066 return user_code;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3067 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3068
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3069 std::string
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3070 tree_evaluator::current_function_name (bool skip_first) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3071 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3072 octave_function *curfcn = m_call_stack.current_function (skip_first);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3073
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3074 if (curfcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3075 return curfcn->name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3076
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3077 return "";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3078 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3079
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3080 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3081 tree_evaluator::in_user_code () const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3082 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3083 return m_call_stack.current_user_code () != nullptr;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3084 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3085
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3086 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3087 tree_evaluator::visit_decl_command (tree_decl_command& cmd)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3088 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3089 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3090 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3091 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3092 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3093 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3094 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3095 m_echo_file_pos = line + 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3096 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3097
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3098 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3099 do_breakpoint (cmd.is_active_breakpoint (*this));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3100
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3101 // FIXME: tree_decl_init_list is not derived from tree, so should it
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3102 // really have an accept method?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3103
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3104 tree_decl_init_list *init_list = cmd.initializer_list ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3105
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3106 if (init_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3107 init_list->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3108 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3109
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3110 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3111 tree_evaluator::visit_decl_elt (tree_decl_elt& elt)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3112 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3113 tree_identifier *id = elt.ident ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3114
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3115 if (id)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3116 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3117 if (elt.is_global ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3118 m_call_stack.make_global (id->symbol ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3119 else if (elt.is_persistent ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3120 m_call_stack.make_persistent (id->symbol ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3121 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3122 error ("declaration list element not global or persistent");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3123
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3124 octave_lvalue ult = id->lvalue (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3125
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3126 if (ult.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3127 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3128 tree_expression *expr = elt.expression ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3129
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3130 octave_value init_val;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3131
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3132 if (expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3133 init_val = expr->evaluate (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3134 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3135 init_val = Matrix ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3136
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3137 ult.assign (octave_value::op_asn_eq, init_val);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3138 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3139 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3140 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3141
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3142 template <typename T>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3143 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3144 tree_evaluator::execute_range_loop (const range<T>& rng, int line,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3145 octave_lvalue& ult,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3146 tree_statement_list *loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3147 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3148 octave_idx_type steps = rng.numel ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3149
32095
28ef2991fb5a Emit warning about infinite loop if for loop range starts with infinite value.
Rik <rik@octave.org>
parents: 31827
diff changeset
3150 if (math::isinf (rng.limit ()) || math::isinf (rng.base ()))
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3151 warning_with_id ("Octave:infinite-loop",
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3152 "FOR loop limit is infinite, will stop after %"
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3153 OCTAVE_IDX_TYPE_FORMAT " steps", steps);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3154
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3155 for (octave_idx_type i = 0; i < steps; i++)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3156 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3157 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3158 m_echo_file_pos = line;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3159
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3160 octave_value val (rng.elem (i));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3161
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3162 ult.assign (octave_value::op_asn_eq, val);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3163
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3164 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3165 loop_body->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3166
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3167 if (quit_loop_now ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3168 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3169 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3170 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3171
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3172 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3173 tree_evaluator::visit_simple_for_command (tree_simple_for_command& cmd)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3174 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3175 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3176 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3177 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3178
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3179 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3180 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3181 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3182 line++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3183 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3184
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3185 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3186 do_breakpoint (cmd.is_active_breakpoint (*this));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3187
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3188 // FIXME: need to handle PARFOR loops here using cmd.in_parallel ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3189 // and cmd.maxproc_expr ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3190
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3191 unwind_protect_var<bool> upv (m_in_loop_command, true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3192
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3193 tree_expression *expr = cmd.control_expr ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3194
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3195 octave_value rhs = expr->evaluate (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3196
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3197 if (rhs.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3198 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3199
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3200 tree_expression *lhs = cmd.left_hand_side ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3201
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3202 octave_lvalue ult = lhs->lvalue (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3203
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3204 tree_statement_list *loop_body = cmd.body ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3205
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3206 if (rhs.is_range ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3207 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3208 // FIXME: is there a better way to dispatch here?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3209
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3210 if (rhs.is_double_type ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3211 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3212 execute_range_loop (rhs.range_value (), line, ult, loop_body);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3213 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3214 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3215
31827
c8dd3da44e83 maint: Remove `#if 0` commented-out code from the codebase.
Arun Giridhar <arungiridhar@gmail.com>
parents: 31809
diff changeset
3216 // For now, enable only range<double>.
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3217 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3218
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3219 if (rhs.is_scalar_type ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3220 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3221 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3222 m_echo_file_pos = line;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3223
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3224 ult.assign (octave_value::op_asn_eq, rhs);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3225
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3226 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3227 loop_body->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3228
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3229 // Maybe decrement break and continue states.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3230 quit_loop_now ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3231
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3232 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3233 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3234
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3235 // Also handle any range types not explicitly handled above, though
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3236 // not as efficiently as the specialized code above.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3237
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3238 if (rhs.is_range () || rhs.is_matrix_type () || rhs.iscell ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3239 || rhs.is_string () || rhs.isstruct ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3240 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3241 // A matrix or cell is reshaped to 2 dimensions and iterated by
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3242 // columns.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3243
32598
2f3b54f81947 avoid dim_vector copies in more places where possible (bug #64962)
John W. Eaton <jwe@octave.org>
parents: 32589
diff changeset
3244 const dim_vector& dv = rhs.dims ().redim (2);
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3245
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3246 octave_idx_type nrows = dv(0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3247 octave_idx_type steps = dv(1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3248
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3249 octave_value arg = rhs;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3250 if (rhs.ndims () > 2)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3251 arg = arg.reshape (dv);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3252
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3253 if (nrows > 0 && steps > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3254 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3255 octave_value_list idx;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3256 octave_idx_type iidx;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3257
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3258 // for row vectors, use single index to speed things up.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3259 if (nrows == 1)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3260 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3261 idx.resize (1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3262 iidx = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3263 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3264 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3265 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3266 idx.resize (2);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3267 idx(0) = octave_value::magic_colon_t;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3268 iidx = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3269 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3270
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3271 for (octave_idx_type i = 1; i <= steps; i++)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3272 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3273 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3274 m_echo_file_pos = line;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3275
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3276 // index_op expects one-based indices.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3277 idx(iidx) = i;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3278 octave_value val = arg.index_op (idx);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3279
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3280 ult.assign (octave_value::op_asn_eq, val);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3281
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3282 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3283 loop_body->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3284
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3285 if (quit_loop_now ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3286 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3287 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3288 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3289 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3290 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3291 // Handle empty cases, while still assigning to loop var.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3292 ult.assign (octave_value::op_asn_eq, arg);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3293 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3294
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3295 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3296 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3297
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3298 error ("invalid type in for loop expression near line %d, column %d",
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3299 cmd.line (), cmd.column ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3300 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3301
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3302 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3303 tree_evaluator::visit_complex_for_command (tree_complex_for_command& cmd)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3304 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3305 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3306 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3307 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3308
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3309 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3310 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3311 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3312 line++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3313 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3314
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3315 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3316 do_breakpoint (cmd.is_active_breakpoint (*this));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3317
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3318 unwind_protect_var<bool> upv (m_in_loop_command, true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3319
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3320 tree_expression *expr = cmd.control_expr ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3321
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3322 octave_value rhs = expr->evaluate (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3323
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3324 if (rhs.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3325 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3326
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3327 if (! rhs.isstruct ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3328 error ("in statement 'for [X, Y] = VAL', VAL must be a structure");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3329
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3330 // Cycle through structure elements. First element of id_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3331 // is set to value and the second is set to the name of the
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3332 // structure element.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3333
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3334 tree_argument_list *lhs = cmd.left_hand_side ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3335
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3336 auto p = lhs->begin ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3337
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3338 tree_expression *elt = *p++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3339
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3340 octave_lvalue val_ref = elt->lvalue (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3341
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3342 elt = *p;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3343
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3344 octave_lvalue key_ref = elt->lvalue (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3345
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3346 const octave_map tmp_val = rhs.map_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3347
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3348 tree_statement_list *loop_body = cmd.body ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3349
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3350 string_vector keys = tmp_val.keys ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3351
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3352 octave_idx_type nel = keys.numel ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3353
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3354 for (octave_idx_type i = 0; i < nel; i++)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3355 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3356 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3357 m_echo_file_pos = line;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3358
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3359 std::string key = keys[i];
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3360
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3361 const Cell val_lst = tmp_val.contents (key);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3362
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3363 octave_idx_type n = val_lst.numel ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3364
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3365 octave_value val = (n == 1) ? val_lst(0) : octave_value (val_lst);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3366
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3367 val_ref.assign (octave_value::op_asn_eq, val);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3368 key_ref.assign (octave_value::op_asn_eq, key);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3369
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3370 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3371 loop_body->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3372
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3373 if (quit_loop_now ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3374 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3375 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3376 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3377
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
3378 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
3379 tree_evaluator::visit_spmd_command (tree_spmd_command& cmd)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3380 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3381 // For now, we just execute the commands serially.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3382
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3383 tree_statement_list *body = cmd.body ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3384
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3385 if (body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3386 body->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3387 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3388
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3389 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3390 tree_evaluator::evaluate_anon_fcn_handle (tree_anon_fcn_handle& afh)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3391 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3392 // FIXME: should CMD_LIST be limited to a single expression?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3393 // I think that is what Matlab does.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3394
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3395 symbol_scope scope = afh.scope ();
32847
cb3163ba60c1 be more explicit about creation of invalid vs anonymous symbol_scope objects
John W. Eaton <jwe@octave.org>
parents: 32794
diff changeset
3396 symbol_scope new_scope = scope ? scope.dup () : symbol_scope::invalid ();
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3397
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3398 tree_parameter_list *param_list = afh.parameter_list ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3399 tree_parameter_list *param_list_dup
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3400 = param_list ? param_list->dup (new_scope) : nullptr;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3401
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3402 tree_parameter_list *ret_list = nullptr;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3403
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3404 tree_statement_list *stmt_list = nullptr;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3405
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3406 symbol_scope parent_scope = get_current_scope ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3407
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3408 new_scope.set_parent (parent_scope);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3409 new_scope.set_primary_parent (parent_scope);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3410
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3411 tree_expression *expr = afh.expression ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3412 if (expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3413 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3414 tree_expression *expr_dup = expr->dup (new_scope);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3415 tree_statement *stmt = new tree_statement (expr_dup, nullptr);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3416 stmt_list = new tree_statement_list (stmt);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3417 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3418
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3419 tree_anon_scopes anon_fcn_ctx (afh);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3420
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3421 std::set<std::string> free_vars = anon_fcn_ctx.free_variables ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3422
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3423 stack_frame::local_vars_map local_vars;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3424
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3425 std::shared_ptr<stack_frame> frame
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3426 = m_call_stack.get_current_stack_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3427
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3428 for (auto& name : free_vars)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3429 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3430 octave_value val = frame->varval (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3431
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3432 if (val.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3433 local_vars[name] = val;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3434 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3435
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3436 octave_user_function *af
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3437 = new octave_user_function (new_scope, param_list_dup, ret_list,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3438 stmt_list);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3439
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3440 octave_function *curr_fcn = m_call_stack.current_function ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3441
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3442 bool is_nested = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3443
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3444 if (curr_fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3445 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3446 // FIXME: maybe it would be better to just stash curr_fcn
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3447 // instead of individual bits of info about it?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3448
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3449 // An anonymous function defined inside another nested function
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3450 // or parent of a nested function also behaves like a nested
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3451 // function.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3452
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3453 if (curr_fcn->is_parent_function () || curr_fcn->is_nested_function ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3454 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3455 is_nested = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3456 af->mark_as_nested_function ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3457 new_scope.set_nesting_depth (parent_scope.nesting_depth () + 1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3458 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3459
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3460 af->stash_dir_name (curr_fcn->dir_name ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3461
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3462 new_scope.cache_fcn_file_name (curr_fcn->fcn_file_name ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3463 new_scope.cache_dir_name (curr_fcn->dir_name ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3464
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3465 // The following is needed so that class method dispatch works
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3466 // properly for anonymous functions that wrap class methods.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3467
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3468 if (curr_fcn->is_class_method () || curr_fcn->is_class_constructor ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3469 af->stash_dispatch_class (curr_fcn->dispatch_class ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3470
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3471 af->stash_fcn_file_name (curr_fcn->fcn_file_name ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3472 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3473
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3474 af->mark_as_anonymous_function ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3475
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3476 octave_value ov_fcn (af);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3477
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3478 return (is_nested
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3479 ? octave_value (new octave_fcn_handle (ov_fcn, local_vars, frame))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3480 : octave_value (new octave_fcn_handle (ov_fcn, local_vars)));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3481 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3482
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3483 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3484 tree_evaluator::execute_builtin_function (octave_builtin& builtin_function,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3485 int nargout,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3486 const octave_value_list& args)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3487 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3488 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3489
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3490 if (args.has_magic_colon ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3491 error ("invalid use of colon in function argument list");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3492
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3493 profiler::enter<octave_builtin> block (m_profiler, builtin_function);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3494
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3495 octave_builtin::fcn fcn = builtin_function.function ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3496
32410
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3497 // If number of outputs unknown (and this is not a complete statement),
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3498 // pass nargout=1 to the function being called
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3499 if (nargout < 0)
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3500 nargout = 1;
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3501
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3502 if (fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3503 retval = (*fcn) (args, nargout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3504 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3505 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3506 octave_builtin::meth meth = builtin_function.method ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3507
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3508 retval = (*meth) (m_interpreter, args, nargout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3509 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3510
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3511 // Do not allow null values to be returned from functions.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3512 // FIXME: perhaps true builtins should be allowed?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3513
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3514 retval.make_storable_values ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3515
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3516 // Fix the case of a single undefined value.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3517 // This happens when a compiled function uses
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3518 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3519 // octave_value retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3520 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3521 // instead of
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3522 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3523 // octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3524 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3525 // the idiom is very common, so we solve that here.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3526
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3527 if (retval.length () == 1 && retval.xelem (0).is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3528 retval.clear ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3529
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3530 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3531 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3532
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3533 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3534 tree_evaluator::execute_mex_function (octave_mex_function& mex_function,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3535 int nargout,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3536 const octave_value_list& args)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3537 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3538 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3539
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3540 if (args.has_magic_colon ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3541 error ("invalid use of colon in function argument list");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3542
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3543 profiler::enter<octave_mex_function> block (m_profiler, mex_function);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3544
32410
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3545 // If number of outputs unknown (and this is not a complete statement),
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3546 // pass nargout=1 to the function being called
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3547 if (nargout < 0)
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3548 nargout = 1;
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3549
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3550 retval = call_mex (mex_function, args, nargout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3551
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3552 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3553 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3554
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3555 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3556 tree_evaluator::execute_user_script (octave_user_script& user_script,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3557 int nargout,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3558 const octave_value_list& args)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3559 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3560 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3561
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3562 std::string file_name = user_script.fcn_file_name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3563
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3564 if (args.length () != 0 || nargout != 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3565 error ("invalid call to script %s", file_name.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3566
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3567 tree_statement_list *cmd_list = user_script.body ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3568
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3569 if (! cmd_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3570 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3571
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3572 // FIXME: Maybe this check belongs in the places where we push a new
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3573 // stack frame? Or in the call_stack push method itself?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3574
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3575 if (m_call_stack.size () >= static_cast<std::size_t> (m_max_recursion_depth))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3576 error ("max_recursion_depth exceeded");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3577
32309
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3578 unwind_protect_var<stmt_list_type> upv (m_statement_context, SC_SCRIPT);
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3579
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3580 profiler::enter<octave_user_script> block (m_profiler, user_script);
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3581
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3582 if (echo ())
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3583 push_echo_state (tree_evaluator::ECHO_SCRIPTS, file_name);
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3584
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3585 // FIXME: Should we be using tree_evaluator::eval here?
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3586
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3587 cmd_list->accept (*this);
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3588
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3589 if (m_returning)
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3590 m_returning = 0;
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3591
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3592 if (m_breaking)
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3593 m_breaking--;
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3594
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3595 return retval;
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3596 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3597
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3598 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3599 tree_evaluator::visit_octave_user_script (octave_user_script&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3600 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3601 // ??
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3602 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3603 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3604
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3605 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3606 tree_evaluator::execute_user_function (octave_user_function& user_function,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3607 int nargout,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3608 const octave_value_list& xargs)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3609 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3610 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3611
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3612 // If this function is a classdef constructor, extract the first input
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3613 // argument, which must be the partially constructed object instance.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3614
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3615 octave_value_list args (xargs);
32148
dea87a95ad18 experimental stack-based virtual machine
Petter T. <petter.vilhelm@gmail.com>
parents: 32147
diff changeset
3616
32793
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
3617 // FIXME: this probably shouldn't be a double-precision matrix.
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
3618 Matrix ignored_outputs = ignored_fcn_outputs ();
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
3619
32794
512e07384ae9 atttempt to make isargout work properly in more cases (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32793
diff changeset
3620 unwind_protect frame;
512e07384ae9 atttempt to make isargout work properly in more cases (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32793
diff changeset
3621
512e07384ae9 atttempt to make isargout work properly in more cases (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32793
diff changeset
3622 if (! user_function.is_anonymous_function ())
512e07384ae9 atttempt to make isargout work properly in more cases (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32793
diff changeset
3623 {
512e07384ae9 atttempt to make isargout work properly in more cases (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32793
diff changeset
3624 frame.protect_var (m_lvalue_list);
512e07384ae9 atttempt to make isargout work properly in more cases (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32793
diff changeset
3625 m_lvalue_list = nullptr;
512e07384ae9 atttempt to make isargout work properly in more cases (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32793
diff changeset
3626 }
512e07384ae9 atttempt to make isargout work properly in more cases (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32793
diff changeset
3627
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3628 octave_value_list ret_args;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3629
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3630 int nargin = args.length ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3631
32410
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3632 // If number of outputs unknown (and this is not a complete statement),
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3633 // pass nargout=1 to the function being called
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3634 if (nargout < 0)
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3635 nargout = 1;
32427
8a8f16e7c462 maint: strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 32410
diff changeset
3636
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3637 if (user_function.is_classdef_constructor ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3638 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3639 if (nargin > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3640 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3641 ret_args = args.slice (0, 1, true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3642 --nargin;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3643 args = args.slice (1, nargin, true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3644 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3645 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3646 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3647 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3648
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3649 tree_parameter_list *param_list = user_function.parameter_list ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3650
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3651 bool takes_varargs = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3652 int max_inputs = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3653
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3654 if (param_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3655 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3656 takes_varargs = param_list->takes_varargs ();
32936
0b5f3219b650 eliminate all uses of base_list<T> template
John W. Eaton <jwe@octave.org>
parents: 32905
diff changeset
3657 max_inputs = param_list->size ();
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3658 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3659
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3660 if (! takes_varargs && nargin > max_inputs)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3661 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3662 std::string name = user_function.name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3663
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3664 if (name.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3665 name = "@<anonymous>";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3666
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3667 error_with_id ("Octave:invalid-fun-call",
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3668 "%s: function called with too many inputs",
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3669 name.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3670 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3671
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3672 define_parameter_list_from_arg_vector (param_list, args);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3673
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3674 tree_parameter_list *ret_list = user_function.return_list ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3675
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3676 if (ret_list && ! ret_list->takes_varargs ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3677 {
32936
0b5f3219b650 eliminate all uses of base_list<T> template
John W. Eaton <jwe@octave.org>
parents: 32905
diff changeset
3678 int max_outputs = ret_list->size ();
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3679
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3680 if (nargout > max_outputs)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3681 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3682 std::string name = user_function.name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3683
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3684 error_with_id ("Octave:invalid-fun-call",
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3685 "%s: function called with too many outputs",
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3686 name.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3687 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3688 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3689
32793
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
3690 bind_auto_fcn_vars (xargs.name_tags (), ignored_outputs, nargin,
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
3691 nargout, user_function.takes_varargs (),
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3692 user_function.all_va_args (args));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3693
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3694 // For classdef constructor, pre-populate the output arguments
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3695 // with the pre-initialized object instance, extracted above.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3696
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3697 if (user_function.is_classdef_constructor ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3698 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3699 if (! ret_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3700 error ("%s: invalid classdef constructor, no output argument defined",
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3701 user_function.dispatch_class ().c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3702
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3703 define_parameter_list_from_arg_vector (ret_list, ret_args);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3704 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3705
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3706 // FIXME: Maybe this check belongs in the places where we push a
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3707 // new stack frame? Or in the call_stack push method itself?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3708
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3709 if (m_call_stack.size () >= static_cast<std::size_t> (m_max_recursion_depth))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3710 error ("max_recursion_depth exceeded");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3711
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3712 unwind_action act2 ([&user_function] () {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3713 user_function.restore_warning_states ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3714 });
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3715
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3716 // Evaluate the commands that make up the function.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3717
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3718 unwind_protect_var<stmt_list_type> upv (m_statement_context, SC_FUNCTION);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3719
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3720 tree_statement_list *cmd_list = user_function.body ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3721
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3722 if (cmd_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3723 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3724 profiler::enter<octave_user_function>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3725 block (m_profiler, user_function);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3726
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3727 if (echo ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3728 push_echo_state (tree_evaluator::ECHO_FUNCTIONS,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3729 user_function.fcn_file_name ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3730
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3731 if (user_function.is_special_expr ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3732 {
32936
0b5f3219b650 eliminate all uses of base_list<T> template
John W. Eaton <jwe@octave.org>
parents: 32905
diff changeset
3733 panic_if (cmd_list->size () != 1);
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3734
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3735 tree_statement *stmt = cmd_list->front ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3736
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3737 tree_expression *expr = stmt->expression ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3738
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3739 if (expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3740 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3741 m_call_stack.set_location (stmt->line (), stmt->column ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3742
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3743 retval = expr->evaluate_n (*this, nargout);
32891
ff1d5873f805 don't allow anon fcn eval to return comma-separated list (bug #64783)
John W. Eaton <jwe@octave.org>
parents: 32847
diff changeset
3744
ff1d5873f805 don't allow anon fcn eval to return comma-separated list (bug #64783)
John W. Eaton <jwe@octave.org>
parents: 32847
diff changeset
3745 // Don't allow a comma-separated list to escape (see bug #64783).
ff1d5873f805 don't allow anon fcn eval to return comma-separated list (bug #64783)
John W. Eaton <jwe@octave.org>
parents: 32847
diff changeset
3746
ff1d5873f805 don't allow anon fcn eval to return comma-separated list (bug #64783)
John W. Eaton <jwe@octave.org>
parents: 32847
diff changeset
3747 if (nargout <= 1 && retval.length () == 1 && retval(0).is_cs_list ())
ff1d5873f805 don't allow anon fcn eval to return comma-separated list (bug #64783)
John W. Eaton <jwe@octave.org>
parents: 32847
diff changeset
3748 retval = retval(0).list_value ();
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3749 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3750 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3751 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3752 cmd_list->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3753
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3754 if (m_returning)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3755 m_returning = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3756
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3757 if (m_breaking)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3758 m_breaking--;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3759 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3760
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3761 // Copy return values out.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3762
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3763 if (ret_list && ! user_function.is_special_expr ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3764 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3765 Cell varargout;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3766
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3767 if (ret_list->takes_varargs ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3768 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3769 octave_value varargout_varval = varval ("varargout");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3770
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3771 if (varargout_varval.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3772 varargout = varargout_varval.xcell_value ("varargout must be a cell array object");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3773 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3774
32780
e96e2f9f9f37 avoid error with ignored values returned from function calls (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32632
diff changeset
3775 retval = convert_return_list_to_const_vector (ret_list, nargout, varargout);
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3776 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3777
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3778 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3779 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3780
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3781 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3782 tree_evaluator::visit_octave_user_function (octave_user_function&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3783 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3784 // ??
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3785 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3786 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3787
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3788 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3789 tree_evaluator::visit_octave_user_function_header (octave_user_function&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3790 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3791 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3792 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3793
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3794 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3795 tree_evaluator::visit_octave_user_function_trailer (octave_user_function&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3796 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3797 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3798 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3799
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3800 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3801 tree_evaluator::visit_function_def (tree_function_def& cmd)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3802 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3803 octave_value fcn = cmd.function ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3804
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3805 octave_function *f = fcn.function_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3806
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3807 if (f)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3808 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3809 std::string nm = f->name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3810
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3811 symbol_table& symtab = m_interpreter.get_symbol_table ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3812
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3813 symtab.install_cmdline_function (nm, fcn);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3814
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3815 // Make sure that any variable with the same name as the new
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3816 // function is cleared.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3817
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3818 assign (nm);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3819 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3820 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3821
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3822 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3823 tree_evaluator::visit_identifier (tree_identifier&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3824 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3825 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3826 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3827
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3828 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3829 tree_evaluator::visit_if_clause (tree_if_clause&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3830 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3831 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3832 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3833
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3834 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3835 tree_evaluator::visit_if_command (tree_if_command& cmd)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3836 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3837 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3838 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3839 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3840 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3841 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3842 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3843 m_echo_file_pos = line + 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3844 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3845
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3846 // FIXME: tree_if_command_list is not derived from tree, so should it
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3847 // really have an accept method?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3848
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3849 tree_if_command_list *lst = cmd.cmd_list ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3850
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3851 if (lst)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3852 lst->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3853 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3854
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3855 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3856 tree_evaluator::visit_if_command_list (tree_if_command_list& lst)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3857 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3858 for (tree_if_clause *tic : lst)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3859 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3860 tree_expression *expr = tic->condition ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3861
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3862 if (! (in_debug_repl ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3863 && m_call_stack.current_frame () == m_debug_frame))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3864 m_call_stack.set_location (tic->line (), tic->column ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3865
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3866 if (m_debug_mode && ! tic->is_else_clause ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3867 do_breakpoint (tic->is_active_breakpoint (*this));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3868
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3869 if (tic->is_else_clause () || is_logically_true (expr, "if"))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3870 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3871 tree_statement_list *stmt_lst = tic->commands ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3872
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3873 if (stmt_lst)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3874 stmt_lst->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3875
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3876 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3877 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3878 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3879 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3880
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3881 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3882 tree_evaluator::visit_index_expression (tree_index_expression&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3883 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3884 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3885 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3886
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3887 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3888 tree_evaluator::visit_matrix (tree_matrix&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3889 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3890 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3891 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3892
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3893 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3894 tree_evaluator::visit_cell (tree_cell&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3895 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3896 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3897 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3898
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3899 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3900 tree_evaluator::visit_multi_assignment (tree_multi_assignment&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3901 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3902 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3903 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3904
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3905 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3906 tree_evaluator::visit_no_op_command (tree_no_op_command& cmd)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3907 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3908 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3909 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3910 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3911 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3912 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3913 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3914 m_echo_file_pos = line + 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3915 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3916
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3917 if (m_debug_mode && cmd.is_end_of_fcn_or_script ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3918 do_breakpoint (cmd.is_active_breakpoint (*this), true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3919 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3920
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3921 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3922 tree_evaluator::visit_constant (tree_constant&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3923 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3924 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3925 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3926
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3927 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3928 tree_evaluator::visit_fcn_handle (tree_fcn_handle&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3929 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3930 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3931 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3932
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3933 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3934 tree_evaluator::visit_parameter_list (tree_parameter_list&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3935 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3936 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3937 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3938
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3939 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3940 tree_evaluator::visit_postfix_expression (tree_postfix_expression&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3941 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3942 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3943 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3944
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3945 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3946 tree_evaluator::visit_prefix_expression (tree_prefix_expression&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3947 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3948 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3949 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3950
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3951 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3952 tree_evaluator::visit_return_command (tree_return_command& cmd)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3953 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3954 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3955 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3956 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3957 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3958 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3959 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3960 m_echo_file_pos = line + 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3961 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3962
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3963 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3964 do_breakpoint (cmd.is_active_breakpoint (*this));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3965
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3966 // Act like dbcont.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3967
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3968 if (in_debug_repl () && m_call_stack.current_frame () == m_debug_frame)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3969 dbcont ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3970 else if (m_statement_context == SC_FUNCTION
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3971 || m_statement_context == SC_SCRIPT
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3972 || m_in_loop_command)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3973 m_returning = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3974 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3975
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3976 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3977 tree_evaluator::visit_simple_assignment (tree_simple_assignment&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3978 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3979 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3980 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3981
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3982 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3983 tree_evaluator::visit_statement (tree_statement& stmt)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3984 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3985 tree_command *cmd = stmt.command ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3986 tree_expression *expr = stmt.expression ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3987
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3988 if (cmd || expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3989 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3990 if (! (in_debug_repl ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3991 && m_call_stack.current_frame () == m_debug_frame))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3992 m_call_stack.set_location (stmt.line (), stmt.column ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3993
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3994 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3995 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3996 if (cmd)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3997 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3998 unwind_protect_var<const std::list<octave_lvalue> *>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3999 upv (m_lvalue_list, nullptr);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4000
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4001 cmd->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4002 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4003 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4004 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4005 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4006 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4007 int line = stmt.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4008 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4009 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4010 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4011 m_echo_file_pos = line + 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4012 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4013
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4014 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4015 do_breakpoint (expr->is_active_breakpoint (*this));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4016
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4017 // FIXME: maybe all of this should be packaged in
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4018 // one virtual function that returns a flag saying whether
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4019 // or not the expression will take care of binding ans and
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4020 // printing the result.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4021
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4022 // FIXME: it seems that we should just have to
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4023 // evaluate the expression and that should take care of
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4024 // everything, binding ans as necessary?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4025
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4026 octave_value tmp_result = expr->evaluate (*this, 0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4027
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4028 if (tmp_result.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4029 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4030 bool do_bind_ans = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4031
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4032 if (expr->is_identifier ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4033 do_bind_ans = ! is_variable (expr);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4034 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4035 do_bind_ans = ! expr->is_assignment_expression ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4036
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4037 if (do_bind_ans)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4038 bind_ans (tmp_result, expr->print_result ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4039 && statement_printing_enabled ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4040 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4041 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4042 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4043 catch (const std::bad_alloc&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4044 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4045 // FIXME: We want to use error_with_id here so that give users
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4046 // control over this error message but error_with_id will
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4047 // require some memory allocations. Is there anything we can
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4048 // do to make those more likely to succeed?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4049
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4050 error_with_id ("Octave:bad-alloc",
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4051 "out of memory or dimension too large for Octave's index type");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4052 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4053 catch (const interrupt_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4054 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4055 // If we are debugging, then continue with next statement.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4056 // Otherwise, jump out of here.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4057
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4058 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4059 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4060 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4061 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4062 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4063 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4064 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4065 error_system& es = m_interpreter.get_error_system ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4066
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4067 if ((m_interpreter.interactive ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4068 || application::forced_interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4069 && ((es.debug_on_error ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4070 && m_bp_table.debug_on_err (es.last_error_id ()))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4071 || (es.debug_on_caught ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4072 && m_bp_table.debug_on_caught (es.last_error_id ())))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4073 && in_user_code ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4074 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4075 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4076 es.display_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4077
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4078 enter_debugger ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4079
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4080 // It doesn't make sense to continue execution after an
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4081 // error occurs so force the debugger to quit all debug
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4082 // levels and return the the top prompt.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4083
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4084 throw quit_debug_exception (true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4085 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4086 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4087 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4088 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4089 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4090 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4091
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4092 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4093 tree_evaluator::visit_statement_list (tree_statement_list& lst)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4094 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4095 // FIXME: commented out along with else clause below.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4096 // static octave_value_list empty_list;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4097
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4098 auto p = lst.begin ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4099
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4100 if (p != lst.end ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4101 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4102 while (true)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4103 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4104 tree_statement *elt = *p++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4105
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4106 if (! elt)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4107 error ("invalid statement found in statement list!");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4108
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4109 octave_quit ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4110
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4111 elt->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4112
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4113 if (m_breaking || m_continuing)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4114 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4115
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4116 if (m_returning)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4117 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4118
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4119 if (p == lst.end ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4120 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4121 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4122 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4123 // Clear previous values before next statement is
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4124 // evaluated so that we aren't holding an extra
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4125 // reference to a value that may be used next. For
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4126 // example, in code like this:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4127 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4128 // X = rand (N); # refcount for X should be 1
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4129 // # after this statement
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4130 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4131 // X(idx) = val; # no extra copy of X should be
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4132 // # needed, but we will be faked
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4133 // # out if retval is not cleared
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4134 // # between statements here
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4135
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4136 // result_values = empty_list;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4137 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4138 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4139 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4140 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4141
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4142 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4143 tree_evaluator::visit_switch_case (tree_switch_case&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4144 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4145 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4146 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4147
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4148 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4149 tree_evaluator::visit_switch_case_list (tree_switch_case_list&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4150 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4151 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4152 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4153
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4154 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4155 tree_evaluator::visit_switch_command (tree_switch_command& cmd)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4156 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4157 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4158 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4159 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4160 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4161 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4162 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4163 m_echo_file_pos = line + 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4164 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4165
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4166 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4167 do_breakpoint (cmd.is_active_breakpoint (*this));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4168
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4169 tree_expression *expr = cmd.switch_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4170
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4171 if (! expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4172 error ("missing value in switch command near line %d, column %d",
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4173 cmd.line (), cmd.column ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4174
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4175 octave_value val = expr->evaluate (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4176
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4177 tree_switch_case_list *lst = cmd.case_list ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4178
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4179 if (lst)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4180 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4181 for (tree_switch_case *t : *lst)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4182 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4183 if (t->is_default_case () || switch_case_label_matches (t, val))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4184 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4185 tree_statement_list *stmt_lst = t->commands ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4186
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4187 if (stmt_lst)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4188 stmt_lst->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4189
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4190 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4191 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4192 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4193 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4194 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4195
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4196 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4197 tree_evaluator::visit_try_catch_command (tree_try_catch_command& cmd)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4198 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4199 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4200 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4201 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4202 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4203 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4204 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4205 m_echo_file_pos = line + 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4206 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4207
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4208 bool execution_error = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4209 octave_scalar_map err_map;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4210
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4211 tree_statement_list *try_code = cmd.body ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4212
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4213 if (try_code)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4214 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4215 // unwind frame before catch block
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4216
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4217 unwind_protect frame;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4218
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4219 interpreter_try (frame);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4220
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4221 // The catch code is *not* added to unwind_protect stack; it
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4222 // doesn't need to be run on interrupts.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4223
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4224 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4225 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4226 try_code->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4227 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4228 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4229 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4230 execution_error = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4231
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4232 error_system& es = m_interpreter.get_error_system ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4233
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4234 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4235
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4236 err_map.assign ("message", es.last_error_message ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4237 err_map.assign ("identifier", es.last_error_id ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4238 err_map.assign ("stack", es.last_error_stack ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4239
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4240 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4241 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4242
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4243 // Actions attached to unwind_protect frame will run here, prior
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4244 // to executing the catch block.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4245 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4246
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4247 if (execution_error)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4248 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4249 tree_statement_list *catch_code = cmd.cleanup ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4250
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4251 if (catch_code)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4252 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4253 tree_identifier *expr_id = cmd.identifier ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4254
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4255 if (expr_id)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4256 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4257 octave_lvalue ult = expr_id->lvalue (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4258
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4259 ult.assign (octave_value::op_asn_eq, err_map);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4260 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4261
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4262 // perform actual "catch" block
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4263 catch_code->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4264 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4265 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4266 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4267
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4268 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4269 tree_evaluator::do_unwind_protect_cleanup_code (tree_statement_list *list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4270 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4271 unwind_protect frame;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4272
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4273 frame.protect_var (octave_interrupt_state);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4274 octave_interrupt_state = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4275
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4276 // We want to preserve the last location info for possible
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4277 // backtracking.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4278
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4279 frame.add (&call_stack::set_line, &m_call_stack,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4280 m_call_stack.current_line ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4281
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4282 frame.add (&call_stack::set_column, &m_call_stack,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4283 m_call_stack.current_column ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4284
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4285 // Similarly, if we have seen a return or break statement, allow all
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4286 // the cleanup code to run before returning or handling the break.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4287 // We don't have to worry about continue statements because they can
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4288 // only occur in loops.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4289
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4290 frame.protect_var (m_returning);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4291 m_returning = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4292
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4293 frame.protect_var (m_breaking);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4294 m_breaking = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4295
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4296 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4297 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4298 if (list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4299 list->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4300 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4301 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4302 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4303 error_system& es = m_interpreter.get_error_system ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4304
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4305 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4306 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4307
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4308 if (m_breaking || m_returning)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4309 frame.discard (2);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4310 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4311 frame.run (2);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4312
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4313 frame.discard (2);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4314
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4315 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4316 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4317
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4318 // The unwind_protects are popped off the stack in the reverse of
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4319 // the order they are pushed on.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4320
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4321 // FIXME: these statements say that if we see a break or
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4322 // return statement in the cleanup block, that we want to use the
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4323 // new value of the breaking or returning flag instead of restoring
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4324 // the previous value. Is that the right thing to do? I think so.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4325 // Consider the case of
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4326 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4327 // function foo ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4328 // unwind_protect
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4329 // fprintf (stderr, "1: this should always be executed\n");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4330 // break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4331 // fprintf (stderr, "1: this should never be executed\n");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4332 // unwind_protect_cleanup
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4333 // fprintf (stderr, "2: this should always be executed\n");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4334 // return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4335 // fprintf (stderr, "2: this should never be executed\n");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4336 // end_unwind_protect
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4337 // endfunction
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4338 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4339 // If we reset the value of the breaking flag, both the returning
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4340 // flag and the breaking flag will be set, and we shouldn't have
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4341 // both. So, use the most recent one. If there is no return or
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4342 // break in the cleanup block, the values should be reset to
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4343 // whatever they were when the cleanup block was entered.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4344
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4345 if (m_breaking || m_returning)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4346 frame.discard (2);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4347 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4348 frame.run (2);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4349 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4350
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4351 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4352 tree_evaluator::visit_unwind_protect_command (tree_unwind_protect_command& cmd)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4353 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4354 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4355 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4356 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4357 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4358 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4359 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4360 m_echo_file_pos = line + 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4361 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4362
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4363 tree_statement_list *cleanup_code = cmd.cleanup ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4364
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4365 tree_statement_list *unwind_protect_code = cmd.body ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4366
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4367 if (unwind_protect_code)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4368 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4369 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4370 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4371 unwind_protect_code->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4372 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4373 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4374 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4375 error_system& es = m_interpreter.get_error_system ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4376
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4377 // FIXME: Maybe we should be able to temporarily set the
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4378 // interpreter's exception handling state to something "safe"
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4379 // while the cleanup block runs instead of just resetting it
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4380 // here?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4381 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4382 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4383
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4384 // Run the cleanup code on exceptions, so that it is run even
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4385 // in case of interrupt or out-of-memory.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4386 do_unwind_protect_cleanup_code (cleanup_code);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4387
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4388 // If an error occurs inside the cleanup code, a new
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4389 // exception will be thrown instead of the original.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4390 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4391 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4392 catch (const interrupt_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4393 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4394 // The comments above apply here as well.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4395 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4396 do_unwind_protect_cleanup_code (cleanup_code);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4397 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4398 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4399
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4400 // Also execute the unwind_protect_cleanump code if the
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4401 // unwind_protect block runs without error.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4402 do_unwind_protect_cleanup_code (cleanup_code);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4403 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4404 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4405
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4406 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4407 tree_evaluator::visit_while_command (tree_while_command& cmd)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4408 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4409 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4410 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4411 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4412
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4413 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4414 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4415 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4416 line++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4417 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4418
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4419 unwind_protect_var<bool> upv (m_in_loop_command, true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4420
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4421 tree_expression *expr = cmd.condition ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4422
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4423 if (! expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4424 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4425
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4426 for (;;)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4427 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4428 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4429 m_echo_file_pos = line;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4430
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4431 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4432 do_breakpoint (cmd.is_active_breakpoint (*this));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4433
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4434 if (is_logically_true (expr, "while"))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4435 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4436 tree_statement_list *loop_body = cmd.body ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4437
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4438 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4439 loop_body->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4440
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4441 if (quit_loop_now ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4442 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4443 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4444 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4445 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4446 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4447 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4448
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4449 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4450 tree_evaluator::visit_do_until_command (tree_do_until_command& cmd)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4451 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4452 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4453 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4454 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4455
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4456 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4457 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4458 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4459 line++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4460 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4461
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4462 unwind_protect_var<bool> upv (m_in_loop_command, true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4463
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4464 tree_expression *expr = cmd.condition ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4465
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4466 if (! expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4467 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4468
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4469 for (;;)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4470 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4471 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4472 m_echo_file_pos = line;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4473
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4474 tree_statement_list *loop_body = cmd.body ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4475
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4476 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4477 loop_body->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4478
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4479 if (quit_loop_now ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4480 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4481
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4482 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4483 do_breakpoint (cmd.is_active_breakpoint (*this));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4484
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4485 if (is_logically_true (expr, "do-until"))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4486 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4487 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4488 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4489
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4490 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4491 tree_evaluator::visit_superclass_ref (tree_superclass_ref&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4492 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4493 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4494 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4495
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4496 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4497 tree_evaluator::visit_metaclass_query (tree_metaclass_query&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4498 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4499 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4500 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4501
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4502 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4503 tree_evaluator::bind_ans (const octave_value& val, bool print)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4504 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4505 static std::string ans = "ans";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4506
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4507 if (val.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4508 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4509 if (val.is_cs_list ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4510 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4511 octave_value_list lst = val.list_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4512
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4513 for (octave_idx_type i = 0; i < lst.length (); i++)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4514 bind_ans (lst(i), print);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4515 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4516 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4517 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4518 // FIXME: Maybe assign could also return the assigned value,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4519 // just for convenience?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4520
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4521 assign (ans, val);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4522
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4523 if (print)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4524 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4525 // Use varval instead of displaying VAL directly so that
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4526 // we get the right type and value for things like
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4527 // magic_int values that may mutate when stored.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4528
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4529 octave_value_list args = ovl (varval (ans));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4530 args.stash_name_tags (string_vector (ans));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4531 m_interpreter.feval ("display", args);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4532 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4533 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4534 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4535 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4536
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4537 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4538 tree_evaluator::do_breakpoint (tree_statement& stmt)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4539 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4540 do_breakpoint (stmt.is_active_breakpoint (*this),
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4541 stmt.is_end_of_fcn_or_script ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4542 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4543
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4544 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4545 tree_evaluator::do_breakpoint (bool is_breakpoint,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4546 bool is_end_of_fcn_or_script)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4547 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4548 bool break_on_this_statement = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4549
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4550 if (is_breakpoint)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4551 break_on_this_statement = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4552 else if (m_dbstep_flag > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4553 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4554 if (m_call_stack.current_frame () == m_debug_frame)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4555 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4556 if (m_dbstep_flag == 1 || is_end_of_fcn_or_script)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4557 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4558 // We get here if we are doing a "dbstep" or a "dbstep N" and
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4559 // the count has reached 1 so that we must stop and return to
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4560 // debug prompt. Alternatively, "dbstep N" has been used but
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4561 // the end of the frame has been reached so we stop at the last
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4562 // line and return to prompt.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4563
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4564 break_on_this_statement = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4565 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4566 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4567 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4568 // Executing "dbstep N". Decrease N by one and continue.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4569
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4570 m_dbstep_flag--;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4571 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4572
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4573 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4574 else if (m_dbstep_flag == 1
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4575 && m_call_stack.current_frame () < m_debug_frame)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4576 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4577 // We stepped out from the end of a function.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4578
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4579 m_debug_frame = m_call_stack.current_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4580
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4581 break_on_this_statement = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4582 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4583 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4584 else if (m_dbstep_flag == -1)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4585 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4586 // We get here if we are doing a "dbstep in".
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4587
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4588 break_on_this_statement = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4589
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4590 m_debug_frame = m_call_stack.current_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4591 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4592 else if (m_dbstep_flag == -2)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4593 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4594 // We get here if we are doing a "dbstep out". Check for end of
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4595 // function and whether the current frame is the same as the
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4596 // cached value because we want to step out from the frame where
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4597 // "dbstep out" was evaluated, not from any functions called from
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4598 // that frame.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4599
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4600 if (is_end_of_fcn_or_script
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4601 && m_call_stack.current_frame () == m_debug_frame)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4602 m_dbstep_flag = -1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4603 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4604
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4605 if (! break_on_this_statement)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4606 break_on_this_statement = m_break_on_next_stmt;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4607
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4608 m_break_on_next_stmt = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4609
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4610 if (break_on_this_statement)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4611 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4612 m_dbstep_flag = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4613
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4614 enter_debugger ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4615 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4616 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4617
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4618 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4619 tree_evaluator::is_logically_true (tree_expression *expr,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4620 const char *warn_for)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4621 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4622 bool expr_value = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4623
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4624 m_call_stack.set_location (expr->line (), expr->column ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4625
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4626 octave_value t1 = expr->evaluate (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4627
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4628 if (t1.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4629 return t1.is_true ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4630 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4631 error ("%s: undefined value used in conditional expression", warn_for);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4632
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4633 return expr_value;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4634 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4635
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4636 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4637 tree_evaluator::max_recursion_depth (const octave_value_list& args,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4638 int nargout)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4639 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4640 return set_internal_variable (m_max_recursion_depth, args, nargout,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4641 "max_recursion_depth", 0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4642 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4643
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4644 symbol_info_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4645 tree_evaluator::glob_symbol_info (const std::string& pattern) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4646 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4647 return m_call_stack.glob_symbol_info (pattern);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4648 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4649
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4650 symbol_info_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4651 tree_evaluator::regexp_symbol_info (const std::string& pattern) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4652 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4653 return m_call_stack.regexp_symbol_info (pattern);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4654 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4655
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4656 symbol_info_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4657 tree_evaluator::get_symbol_info ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4658 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4659 return m_call_stack.get_symbol_info ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4660 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4661
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4662 symbol_info_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4663 tree_evaluator::top_scope_symbol_info () const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4664 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4665 return m_call_stack.top_scope_symbol_info ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4666 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4667
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4668 octave_map
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4669 tree_evaluator::get_autoload_map () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4670 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4671 Cell fcn_names (dim_vector (m_autoload_map.size (), 1));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4672 Cell file_names (dim_vector (m_autoload_map.size (), 1));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4673
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4674 octave_idx_type i = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4675 for (const auto& fcn_fname : m_autoload_map)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4676 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4677 fcn_names(i) = fcn_fname.first;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4678 file_names(i) = fcn_fname.second;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4679
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4680 i++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4681 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4682
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4683 octave_map m;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4684
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4685 m.assign ("function", fcn_names);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4686 m.assign ("file", file_names);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4687
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4688 return m;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4689 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4690
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4691 std::string
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4692 tree_evaluator::lookup_autoload (const std::string& nm) const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4693 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4694 std::string retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4695
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4696 auto p = m_autoload_map.find (nm);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4697
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4698 if (p != m_autoload_map.end ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4699 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4700 load_path& lp = m_interpreter.get_load_path ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4701
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4702 retval = lp.find_file (p->second);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4703 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4704
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4705 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4706 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4707
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4708 std::list<std::string>
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4709 tree_evaluator::autoloaded_functions () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4710 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4711 std::list<std::string> names;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4712
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4713 for (const auto& fcn_fname : m_autoload_map)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4714 names.push_back (fcn_fname.first);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4715
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4716 return names;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4717 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4718
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4719 std::list<std::string>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4720 tree_evaluator::reverse_lookup_autoload (const std::string& nm) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4721 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4722 std::list<std::string> names;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4723
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4724 for (const auto& fcn_fname : m_autoload_map)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4725 if (nm == fcn_fname.second)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4726 names.push_back (fcn_fname.first);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4727
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4728 return names;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4729 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4730
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4731 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4732 tree_evaluator::add_autoload (const std::string& fcn,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4733 const std::string& nm)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4734 {
32593
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
4735 std::string file_name = check_autoload_file (nm);
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
4736
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
4737 // Signal to load path that the function cache is invalid
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
4738 octave::load_path::signal_clear_fcn_cache ();
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
4739
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
4740 m_autoload_map[fcn] = file_name;
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4741 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4742
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4743 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4744 tree_evaluator::remove_autoload (const std::string& fcn,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4745 const std::string& nm)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4746 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4747 check_autoload_file (nm);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4748
32593
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
4749 // Signal to load path that the function cache is invalid
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
4750 octave::load_path::signal_clear_fcn_cache ();
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
4751
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4752 // Remove function from symbol table and autoload map.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4753 symbol_table& symtab = m_interpreter.get_symbol_table ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4754
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4755 symtab.clear_dld_function (fcn);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4756
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4757 m_autoload_map.erase (fcn);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4758 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4759
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4760 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4761 tree_evaluator::whos_line_format (const octave_value_list& args, int nargout)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4762 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4763 return set_internal_variable (m_whos_line_format, args, nargout,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4764 "whos_line_format");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4765 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4766
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4767 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4768 tree_evaluator::silent_functions (const octave_value_list& args, int nargout)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4769 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4770 return set_internal_variable (m_silent_functions, args, nargout,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4771 "silent_functions");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4772 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4773
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4774 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4775 tree_evaluator::string_fill_char (const octave_value_list& args, int nargout)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4776 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4777 return set_internal_variable (m_string_fill_char, args, nargout,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4778 "string_fill_char");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4779 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4780
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4781 // Final step of processing an indexing error. Add the name of the
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4782 // variable being indexed, if any, then issue an error. (Will this also
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4783 // be needed by pt-lvalue, which calls subsref?)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4784
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4785 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4786 tree_evaluator::final_index_error (index_exception& ie,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4787 const tree_expression *expr)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4788 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4789 std::string extra_message;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4790
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4791 if (is_variable (expr))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4792 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4793 std::string var = expr->name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4794
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4795 ie.set_var (var);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4796
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4797 symbol_table& symtab = m_interpreter.get_symbol_table ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4798
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4799 octave_value fcn = symtab.find_function (var);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4800
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4801 if (fcn.is_function ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4802 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4803 octave_function *fp = fcn.function_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4804
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4805 if (fp && fp->name () == var)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4806 extra_message
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4807 = " (note: variable '" + var + "' shadows function)";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4808 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4809 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4810
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4811 std::string msg = ie.message () + extra_message;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4812
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4813 error_with_id (ie.err_id (), "%s", msg.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4814 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4815
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4816 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4817 tree_evaluator::do_who (int argc, const string_vector& argv,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4818 bool return_list, bool verbose)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4819 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4820 return m_call_stack.do_who (argc, argv, return_list, verbose);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4821 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4822
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4823 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4824 tree_evaluator::make_value_list (tree_argument_list *args,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4825 const string_vector& arg_nm)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4826 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4827 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4828
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4829 if (args)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4830 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4831 unwind_protect_var<const std::list<octave_lvalue> *>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4832 upv (m_lvalue_list, nullptr);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4833
32936
0b5f3219b650 eliminate all uses of base_list<T> template
John W. Eaton <jwe@octave.org>
parents: 32905
diff changeset
4834 int len = args->size ();
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4835
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4836 unwind_protect_var<int> upv2 (m_index_position);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4837 unwind_protect_var<int> upv3 (m_num_indices);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4838
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4839 m_num_indices = len;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4840
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4841 std::list<octave_value> arg_vals;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4842
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4843 int k = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4844
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4845 for (auto elt : *args)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4846 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4847 // FIXME: is it possible for elt to be invalid?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4848
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4849 if (! elt)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4850 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4851
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4852 m_index_position = k++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4853
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4854 octave_value tmp = elt->evaluate (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4855
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4856 if (tmp.is_cs_list ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4857 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4858 octave_value_list tmp_ovl = tmp.list_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4859
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4860 for (octave_idx_type i = 0; i < tmp_ovl.length (); i++)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4861 arg_vals.push_back (tmp_ovl(i));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4862 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4863 else if (tmp.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4864 arg_vals.push_back (tmp);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4865 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4866
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4867 retval = octave_value_list (arg_vals);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4868 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4869
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4870 octave_idx_type n = retval.length ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4871
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4872 if (n > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4873 retval.stash_name_tags (arg_nm);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4874
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4875 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4876 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4877
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4878 std::list<octave_lvalue>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4879 tree_evaluator::make_lvalue_list (tree_argument_list *lhs)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4880 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4881 std::list<octave_lvalue> retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4882
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4883 for (tree_expression *elt : *lhs)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4884 retval.push_back (elt->lvalue (*this));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4885
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4886 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4887 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4888
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4889 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4890 tree_evaluator::push_echo_state (int type, const std::string& file_name,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4891 int pos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4892 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4893 unwind_protect *frame = m_call_stack.curr_fcn_unwind_protect_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4894
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4895 if (frame)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4896 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4897 push_echo_state_cleanup (*frame);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4898
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4899 set_echo_state (type, file_name, pos);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4900 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4901 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4902
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4903 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4904 tree_evaluator::set_echo_state (int type, const std::string& file_name,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4905 int pos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4906 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4907 m_echo_state = echo_this_file (file_name, type);
32307
02faaad763d4 VM Add support for echo
Petter T.
parents: 32306
diff changeset
4908
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4909 m_echo_file_name = file_name;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4910 m_echo_file_pos = pos;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4911 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4912
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4913 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4914 tree_evaluator::uwp_set_echo_state (bool state, const std::string& file_name,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4915 int pos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4916 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4917 m_echo_state = state;
32307
02faaad763d4 VM Add support for echo
Petter T.
parents: 32306
diff changeset
4918
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4919 m_echo_file_name = file_name;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4920 m_echo_file_pos = pos;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4921 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4922
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4923 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4924 tree_evaluator::maybe_set_echo_state ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4925 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4926 octave_function *caller = caller_function ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4927
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4928 if (caller && caller->is_user_code ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4929 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4930 octave_user_code *fcn = dynamic_cast<octave_user_code *> (caller);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4931
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4932 int type = fcn->is_user_function () ? ECHO_FUNCTIONS : ECHO_SCRIPTS;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4933
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4934 std::string file_name = fcn->fcn_file_name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4935
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4936 // We want the line where "echo" was called, not the line number
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4937 // stored in the stack frame that was created for the echo
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4938 // function (that will always be -1).
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4939
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4940 int pos = m_call_stack.current_user_code_line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4941
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4942 if (pos < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4943 pos = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4944
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4945 set_echo_state (type, file_name, pos);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4946 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4947 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4948
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4949 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4950 tree_evaluator::push_echo_state_cleanup (unwind_protect& frame)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4951 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4952 frame.add (&tree_evaluator::uwp_set_echo_state, this,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4953 m_echo_state, m_echo_file_name, m_echo_file_pos);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4954 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4955
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4956 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4957 tree_evaluator::maybe_push_echo_state_cleanup ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4958 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4959 // This function is expected to be called from ECHO, which would be
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4960 // the top of the call stack. If the caller of ECHO is a
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4961 // user-defined function or script, then set up unwind-protect
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4962 // elements to restore echo state.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4963
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4964 unwind_protect *frame = m_call_stack.curr_fcn_unwind_protect_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4965
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4966 if (frame)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4967 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4968 push_echo_state_cleanup (*frame);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4969 return true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4970 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4971
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4972 return false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4973 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4974
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4975
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4976 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4977 tree_evaluator::echo (const octave_value_list& args, int)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4978 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4979 bool cleanup_pushed = maybe_push_echo_state_cleanup ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4980
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4981 string_vector argv = args.make_argv ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4982
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4983 switch (args.length ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4984 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4985 case 0:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4986 if ((m_echo & ECHO_SCRIPTS) || (m_echo & ECHO_FUNCTIONS))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4987 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4988 m_echo = ECHO_OFF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4989 m_echo_files.clear ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4990 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4991 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4992 m_echo = ECHO_SCRIPTS;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4993 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4994
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4995 case 1:
25382
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
4996 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4997 std::string arg0 = argv[0];
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4998
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4999 if (arg0 == "on")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5000 m_echo = ECHO_SCRIPTS;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5001 else if (arg0 == "off")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5002 m_echo = ECHO_OFF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5003 else
25382
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
5004 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5005 std::string file = fcn_file_in_path (arg0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5006 file = sys::env::make_absolute (file);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5007
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5008 if (file.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5009 error ("echo: no such file %s", arg0.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5010
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5011 if (m_echo & ECHO_ALL)
28540
ea5a632b2553 improve error checking for undefined function outputs (bug #58686, #58695)
John W. Eaton <jwe@octave.org>
parents: 28532
diff changeset
5012 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5013 // Echo is enabled for all functions, so turn it off
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5014 // for this one.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5015
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5016 m_echo_files[file] = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5017 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5018 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5019 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5020 // Echo may be enabled for specific functions.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5021
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5022 auto p = m_echo_files.find (file);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5023
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5024 if (p == m_echo_files.end ())
28540
ea5a632b2553 improve error checking for undefined function outputs (bug #58686, #58695)
John W. Eaton <jwe@octave.org>
parents: 28532
diff changeset
5025 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5026 // Not this one, so enable it.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5027
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5028 m_echo |= ECHO_FUNCTIONS;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5029 m_echo_files[file] = true;
28540
ea5a632b2553 improve error checking for undefined function outputs (bug #58686, #58695)
John W. Eaton <jwe@octave.org>
parents: 28532
diff changeset
5030 }
ea5a632b2553 improve error checking for undefined function outputs (bug #58686, #58695)
John W. Eaton <jwe@octave.org>
parents: 28532
diff changeset
5031 else
ea5a632b2553 improve error checking for undefined function outputs (bug #58686, #58695)
John W. Eaton <jwe@octave.org>
parents: 28532
diff changeset
5032 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5033 // This one is already in the list. Flip the
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5034 // status for it.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5035
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5036 p->second = ! p->second;
23435
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
5037 }
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
5038 }
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
5039 }
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
5040 }
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5041 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5042
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5043 case 2:
27873
020d0e8f7ac6 reafactor mlock, munlock, and mislocked functions
John W. Eaton <jwe@octave.org>
parents: 27844
diff changeset
5044 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5045 std::string arg0 = argv[0];
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5046 std::string arg1 = argv[1];
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5047
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5048 if (arg1 == "on" || arg1 == "off")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5049 std::swap (arg0, arg1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5050
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5051 if (arg0 == "on")
26065
2eb71b83d3e2 partially refactor function lookup in symbol table
John W. Eaton <jwe@octave.org>
parents: 26039
diff changeset
5052 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5053 if (arg1 == "all")
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22164
diff changeset
5054 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5055 m_echo = (ECHO_SCRIPTS | ECHO_FUNCTIONS | ECHO_ALL);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5056 m_echo_files.clear ();
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22164
diff changeset
5057 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22164
diff changeset
5058 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22164
diff changeset
5059 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5060 std::string file = fcn_file_in_path (arg1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5061 file = sys::env::make_absolute (file);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5062
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5063 if (file.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5064 error ("echo: no such file %s", arg1.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5065
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5066 m_echo |= ECHO_FUNCTIONS;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5067 m_echo_files[file] = true;
22196
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22164
diff changeset
5068 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22164
diff changeset
5069 }
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5070 else if (arg0 == "off")
30919
4ed7dfe28584 move eval of anon fcn handles and built-in and mex functions to pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 30896
diff changeset
5071 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5072 if (arg1 == "all")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5073 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5074 m_echo = ECHO_OFF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5075 m_echo_files.clear ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5076 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5077 else
28562
b0b80efecea1 error for functions called with too many inputs or outputs
John W. Eaton <jwe@octave.org>
parents: 28561
diff changeset
5078 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5079 std::string file = fcn_file_in_path (arg1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5080 file = sys::env::make_absolute (file);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5081
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5082 if (file.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5083 error ("echo: no such file %s", arg1.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5084
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5085 m_echo_files[file] = false;
28562
b0b80efecea1 error for functions called with too many inputs or outputs
John W. Eaton <jwe@octave.org>
parents: 28561
diff changeset
5086 }
b0b80efecea1 error for functions called with too many inputs or outputs
John W. Eaton <jwe@octave.org>
parents: 28561
diff changeset
5087 }
b0b80efecea1 error for functions called with too many inputs or outputs
John W. Eaton <jwe@octave.org>
parents: 28561
diff changeset
5088 else
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5089 print_usage ();
23723
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5090 }
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5091 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5092
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5093 default:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5094 print_usage ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5095 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5096 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5097
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5098 if (cleanup_pushed)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5099 maybe_set_echo_state ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5100
32593
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
5101 #if defined (OCTAVE_ENABLE_BYTECODE_EVALUATOR)
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
5102 // Since m_echo might have changed value we need to call this
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
5103 update_vm_dbgprofecho_flag ();
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
5104 #endif
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
5105
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5106 return octave_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5107 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5108
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5109 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5110 tree_evaluator::in_debug_repl () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5111 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5112 return (m_debugger_stack.empty ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5113 ? false : m_debugger_stack.top()->in_debug_repl ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5114 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5115
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5116 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5117 tree_evaluator::dbcont ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5118 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5119 if (! m_debugger_stack.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5120 m_debugger_stack.top()->dbcont ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5121 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5122
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5123 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5124 tree_evaluator::dbquit (bool all)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5125 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5126 if (! m_debugger_stack.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5127 m_debugger_stack.top()->dbquit (all);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5128 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5129
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5130 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5131 tree_evaluator::evaluate_end_expression (const octave_value_list& args)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5132 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5133 int nargin = args.length ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5134
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5135 if (nargin != 0 && nargin != 3)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5136 print_usage ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5137
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5138 if (nargin == 3)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5139 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5140 octave_idx_type index_position
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5141 = args(1).xidx_type_value ("end: K must be integer value");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5142
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5143 if (index_position < 1)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5144 error ("end: K must be greater than zero");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5145
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5146 octave_idx_type num_indices
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5147 = args(2).xidx_type_value ("end: N must be integer value");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5148
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5149 if (num_indices < 1)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5150 error ("end: N must be greater than zero");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5151
32147
8763a313ab91 new octave_value member function to compute end index for object
Petter T. <petter.vilhelm@gmail.com>
parents: 32146
diff changeset
5152 return octave_value (args(0).end_index (index_position-1, num_indices));
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5153 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5154
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5155 // If m_indexed_object is undefined, then this use of 'end' is
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5156 // either appearing in a function call argument list or in an
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5157 // attempt to index an undefined symbol. There seems to be no
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5158 // reasonable way to provide a better error message. So just fail
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5159 // with an invalid use message. See bug #58830.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5160
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5161 if (m_indexed_object.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5162 error ("invalid use of 'end': may only be used to index existing value");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5163
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5164 octave_value expr_result;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5165
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5166 if (m_index_list.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5167 expr_result = m_indexed_object;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5168 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5169 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5170 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5171 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5172 // When evaluating "end" with no arguments, we should have
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5173 // been called from the built-in Fend function that appears
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5174 // in the context of an argument list. Fend will be
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5175 // evaluated in its own stack frame. But we need to
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5176 // evaluate the partial expression that the special "end"
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5177 // token applies to in the calling stack frame.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5178
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5179 unwind_action act ([=] (std::size_t frm)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5180 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5181 m_call_stack.restore_frame (frm);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5182 }, m_call_stack.current_frame ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5183
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5184 std::size_t n = m_call_stack.find_current_user_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5185 m_call_stack.goto_frame (n);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5186
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5187 // End is only valid inside argument lists used for
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5188 // indexing. The dispatch class is set by the function that
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5189 // evaluates the argument list.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5190
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5191 // Silently ignore extra output values.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5192
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5193 octave_value_list tmp
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5194 = m_indexed_object.subsref (m_index_type, m_index_list, 1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5195
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5196 expr_result = tmp.length () ? tmp(0) : octave_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5197
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5198 if (expr_result.is_cs_list ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5199 err_indexed_cs_list ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5200 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5201 catch (const index_exception&)
31607
aac27ad79be6 maint: Re-indent code after switch to using namespace macros.
Rik <rik@octave.org>
parents: 31605
diff changeset
5202 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5203 error ("error evaluating partial expression for END");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5204 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5205 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5206
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5207 if (expr_result.isobject ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5208 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5209 // FIXME: is there a better way to lookup and execute a method
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5210 // that handles all the details like setting the dispatch class
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5211 // appropriately?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5212
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5213 std::string dispatch_class = expr_result.class_name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5214
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5215 symbol_table& symtab = m_interpreter.get_symbol_table ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5216
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5217 octave_value meth = symtab.find_method ("end", dispatch_class);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5218
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5219 if (meth.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5220 return m_interpreter.feval
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5221 (meth, ovl (expr_result, m_index_position+1, m_num_indices), 1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5222 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5223
32147
8763a313ab91 new octave_value member function to compute end index for object
Petter T. <petter.vilhelm@gmail.com>
parents: 32146
diff changeset
5224 return octave_value (expr_result.end_index (m_index_position, m_num_indices));
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5225 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5226
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5227 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5228 tree_evaluator::PS4 (const octave_value_list& args, int nargout)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5229 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5230 return set_internal_variable (m_PS4, args, nargout, "PS4");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5231 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5232
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5233 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5234 tree_evaluator::echo_this_file (const std::string& file, int type) const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5235 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5236 if ((type & m_echo) == ECHO_SCRIPTS)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5237 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5238 // Asking about scripts and echo is enabled for them.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5239 return true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5240 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5241
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5242 if ((type & m_echo) == ECHO_FUNCTIONS)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5243 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5244 // Asking about functions and echo is enabled for functions.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5245 // Now, which ones?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5246
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5247 auto p = m_echo_files.find (file);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5248
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5249 if (m_echo & ECHO_ALL)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5250 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5251 // Return true ulness echo was turned off for a specific
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5252 // file.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5253
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5254 return (p == m_echo_files.end () || p->second);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5255 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5256 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5257 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5258 // Return true if echo is specifically enabled for this file.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5259
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5260 return p != m_echo_files.end () && p->second;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5261 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5262 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5263
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5264 return false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5265 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5266
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5267 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5268 tree_evaluator::echo_code (int line)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5269 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5270 std::string prefix = command_editor::decode_prompt_string (m_PS4);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5271
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5272 octave_function *curr_fcn = m_call_stack.current_function ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5273
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5274 if (curr_fcn && curr_fcn->is_user_code ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5275 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5276 octave_user_code *code = dynamic_cast<octave_user_code *> (curr_fcn);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5277
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5278 int num_lines = line - m_echo_file_pos + 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5279
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5280 std::deque<std::string> lines
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5281 = code->get_code_lines (m_echo_file_pos, num_lines);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5282
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5283 for (auto& elt : lines)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5284 octave_stdout << prefix << elt << std::endl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5285 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5286 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5287
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5288 // Decide if it's time to quit a for or while loop.
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5289 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5290 tree_evaluator::quit_loop_now ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5291 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5292 octave_quit ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5293
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5294 // Maybe handle 'continue N' someday...
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5295
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5296 if (m_continuing)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5297 m_continuing--;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5298
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5299 bool quit = (m_returning || m_breaking || m_continuing);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5300
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5301 if (m_breaking)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5302 m_breaking--;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5303
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5304 return quit;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5305 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5306
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5307 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5308 tree_evaluator::bind_auto_fcn_vars (const string_vector& arg_names,
32793
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
5309 const Matrix& ignored_outputs,
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5310 int nargin, int nargout,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5311 bool takes_varargs,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5312 const octave_value_list& va_args)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5313 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5314 set_auto_fcn_var (stack_frame::ARG_NAMES, Cell (arg_names));
32793
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
5315 set_auto_fcn_var (stack_frame::IGNORED, ignored_outputs);
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5316 set_auto_fcn_var (stack_frame::NARGIN, nargin);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5317 set_auto_fcn_var (stack_frame::NARGOUT, nargout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5318 set_auto_fcn_var (stack_frame::SAVED_WARNING_STATES, octave_value ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5319
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5320 if (takes_varargs)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5321 assign ("varargin", va_args.cell_value ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5322 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5323
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5324 std::string
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5325 tree_evaluator::check_autoload_file (const std::string& nm) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5326 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5327 if (sys::env::absolute_pathname (nm))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5328 return nm;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5329
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5330 std::string full_name = nm;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5331
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5332 octave_user_code *fcn = m_call_stack.current_user_code ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5333
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5334 bool found = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5335
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5336 if (fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5337 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5338 std::string fname = fcn->fcn_file_name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5339
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5340 if (! fname.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5341 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5342 fname = sys::env::make_absolute (fname);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5343 fname = fname.substr (0, fname.find_last_of (sys::file_ops::dir_sep_str ()) + 1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5344
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5345 sys::file_stat fs (fname + nm);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5346
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5347 if (fs.exists ())
31607
aac27ad79be6 maint: Re-indent code after switch to using namespace macros.
Rik <rik@octave.org>
parents: 31605
diff changeset
5348 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5349 full_name = fname + nm;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5350 found = true;
31607
aac27ad79be6 maint: Re-indent code after switch to using namespace macros.
Rik <rik@octave.org>
parents: 31605
diff changeset
5351 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros.
Rik <rik@octave.org>
parents: 31605
diff changeset
5352 }
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5353 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5354
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5355 if (! found)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5356 warning_with_id ("Octave:autoload-relative-file-name",
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5357 "autoload: '%s' is not an absolute filename",
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5358 nm.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5359
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5360 return full_name;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5361 }
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5362
23705
4c597585ff52 move Vmax_recursion_depth and Vsilent_functions to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23702
diff changeset
5363 DEFMETHOD (max_recursion_depth, interp, args, nargout,
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5364 doc: /* -*- texinfo -*-
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5365 @deftypefn {} {@var{val} =} max_recursion_depth ()
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5366 @deftypefnx {} {@var{old_val} =} max_recursion_depth (@var{new_val})
30588
ed17822e7662 doc: Always have a return value for functions which set internal variables (bug #61681)
Rik <rik@octave.org>
parents: 30565
diff changeset
5367 @deftypefnx {} {@var{old_val} =} max_recursion_depth (@var{new_val}, "local")
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5368 Query or set the internal limit on the number of times a function may
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5369 be called recursively.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5370
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5371 If the limit is exceeded, an error message is printed and control returns to
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5372 the top level.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5373
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5374 When called from inside a function with the @qcode{"local"} option, the
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5375 variable is changed locally for the function and any subroutines it calls.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5376 The original variable value is restored when exiting the function.
24855
41f80b9af274 prevent stack overflow crash on deeply nested function calls (bug #47620)
John W. Eaton <jwe@octave.org>
parents: 24738
diff changeset
5377
41f80b9af274 prevent stack overflow crash on deeply nested function calls (bug #47620)
John W. Eaton <jwe@octave.org>
parents: 24738
diff changeset
5378 @seealso{max_stack_depth}
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5379 @end deftypefn */)
10578
cb0883127251 limit on recursion via calls to source function
John W. Eaton <jwe@octave.org>
parents: 10315
diff changeset
5380 {
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5381 tree_evaluator& tw = interp.get_evaluator ();
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5382
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5383 return tw.max_recursion_depth (args, nargout);
10578
cb0883127251 limit on recursion via calls to source function
John W. Eaton <jwe@octave.org>
parents: 10315
diff changeset
5384 }
cb0883127251 limit on recursion via calls to source function
John W. Eaton <jwe@octave.org>
parents: 10315
diff changeset
5385
12833
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5386 /*
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5387 %!test
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5388 %! orig_val = max_recursion_depth ();
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5389 %! old_val = max_recursion_depth (2*orig_val);
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5390 %! assert (orig_val, old_val);
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5391 %! assert (max_recursion_depth (), 2*orig_val);
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5392 %! max_recursion_depth (orig_val);
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5393 %! assert (max_recursion_depth (), orig_val);
14429
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions.
Rik <octave@nomad.inbox5.com>
parents: 14294
diff changeset
5394
28930
2883b3d08b7e maint: Remove unnecessary parentheses bracketing %!error BIST tests.
Rik <rik@octave.org>
parents: 28857
diff changeset
5395 %!error max_recursion_depth (1, 2)
12833
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5396 */
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5397
26087
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5398 DEFMETHOD (whos_line_format, interp, args, nargout,
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5399 doc: /* -*- texinfo -*-
26087
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5400 @deftypefn {} {@var{val} =} whos_line_format ()
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5401 @deftypefnx {} {@var{old_val} =} whos_line_format (@var{new_val})
30588
ed17822e7662 doc: Always have a return value for functions which set internal variables (bug #61681)
Rik <rik@octave.org>
parents: 30565
diff changeset
5402 @deftypefnx {} {@var{old_val} =} whos_line_format (@var{new_val}, "local")
26087
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5403 Query or set the format string used by the command @code{whos}.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5404
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5405 A full format string is:
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5406 @c Set example in small font to prevent overfull line
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5407
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5408 @smallexample
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5409 %[modifier]<command>[:width[:left-min[:balance]]];
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5410 @end smallexample
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5411
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5412 The following command sequences are available:
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5413
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5414 @table @code
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5415 @item %a
29856
56b3e2af0298 Add 's'=sparse attribute for whos function (bug #60687)
Rik <rik@octave.org>
parents: 29848
diff changeset
5416 Prints attributes of variables (c=complex, s=sparse, f=formal parameter,
56b3e2af0298 Add 's'=sparse attribute for whos function (bug #60687)
Rik <rik@octave.org>
parents: 29848
diff changeset
5417 g=global, p=persistent).
26087
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5418
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5419 @item %b
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5420 Prints number of bytes occupied by variables.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5421
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5422 @item %c
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5423 Prints class names of variables.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5424
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5425 @item %e
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5426 Prints elements held by variables.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5427
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5428 @item %n
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5429 Prints variable names.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5430
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5431 @item %s
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5432 Prints dimensions of variables.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5433
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5434 @item %t
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5435 Prints type names of variables.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5436 @end table
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5437
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5438 Every command may also have an alignment modifier:
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5439
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5440 @table @code
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5441 @item l
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5442 Left alignment.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5443
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5444 @item r
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5445 Right alignment (default).
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5446
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5447 @item c
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5448 Column-aligned (only applicable to command %s).
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5449 @end table
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5450
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5451 The @code{width} parameter is a positive integer specifying the minimum
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5452 number of columns used for printing. No maximum is needed as the field will
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5453 auto-expand as required.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5454
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5455 The parameters @code{left-min} and @code{balance} are only available when
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5456 the column-aligned modifier is used with the command @samp{%s}.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5457 @code{balance} specifies the column number within the field width which
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5458 will be aligned between entries. Numbering starts from 0 which indicates
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5459 the leftmost column. @code{left-min} specifies the minimum field width to
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5460 the left of the specified balance column.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5461
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5462 The default format is:
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5463
29856
56b3e2af0298 Add 's'=sparse attribute for whos function (bug #60687)
Rik <rik@octave.org>
parents: 29848
diff changeset
5464 @example
56b3e2af0298 Add 's'=sparse attribute for whos function (bug #60687)
Rik <rik@octave.org>
parents: 29848
diff changeset
5465 " %la:5; %ln:6; %cs:16:6:1; %rb:12; %lc:-1;@backslashchar{}n"
56b3e2af0298 Add 's'=sparse attribute for whos function (bug #60687)
Rik <rik@octave.org>
parents: 29848
diff changeset
5466 @end example
26087
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5467
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5468 When called from inside a function with the @qcode{"local"} option, the
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5469 variable is changed locally for the function and any subroutines it calls.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5470 The original variable value is restored when exiting the function.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5471 @seealso{whos}
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5472 @end deftypefn */)
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5473 {
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5474 tree_evaluator& tw = interp.get_evaluator ();
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5475
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5476 return tw.whos_line_format (args, nargout);
26087
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5477 }
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5478
23705
4c597585ff52 move Vmax_recursion_depth and Vsilent_functions to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23702
diff changeset
5479 DEFMETHOD (silent_functions, interp, args, nargout,
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5480 doc: /* -*- texinfo -*-
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5481 @deftypefn {} {@var{val} =} silent_functions ()
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5482 @deftypefnx {} {@var{old_val} =} silent_functions (@var{new_val})
30588
ed17822e7662 doc: Always have a return value for functions which set internal variables (bug #61681)
Rik <rik@octave.org>
parents: 30565
diff changeset
5483 @deftypefnx {} {@var{old_val} =} silent_functions (@var{new_val}, "local")
21966
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5484 Query or set the internal variable that controls whether internal
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5485 output from a function is suppressed.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5486
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5487 If this option is disabled, Octave will display the results produced by
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5488 evaluating expressions within a function body that are not terminated with
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5489 a semicolon.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5490
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5491 When called from inside a function with the @qcode{"local"} option, the
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5492 variable is changed locally for the function and any subroutines it calls.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5493 The original variable value is restored when exiting the function.
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5494 @end deftypefn */)
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5495 {
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5496 tree_evaluator& tw = interp.get_evaluator ();
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5497
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5498 return tw.silent_functions (args, nargout);
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5499 }
12833
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5500
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5501 /*
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5502 %!test
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5503 %! orig_val = silent_functions ();
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5504 %! old_val = silent_functions (! orig_val);
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5505 %! assert (orig_val, old_val);
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5506 %! assert (silent_functions (), ! orig_val);
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5507 %! silent_functions (orig_val);
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5508 %! assert (silent_functions (), orig_val);
14429
eff4a5933e28 Update %!tests in src/ directory with Octave coding conventions.
Rik <octave@nomad.inbox5.com>
parents: 14294
diff changeset
5509
28930
2883b3d08b7e maint: Remove unnecessary parentheses bracketing %!error BIST tests.
Rik <rik@octave.org>
parents: 28857
diff changeset
5510 %!error silent_functions (1, 2)
12833
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5511 */
23706
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5512
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5513 DEFMETHOD (string_fill_char, interp, args, nargout,
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5514 doc: /* -*- texinfo -*-
23706
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5515 @deftypefn {} {@var{val} =} string_fill_char ()
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5516 @deftypefnx {} {@var{old_val} =} string_fill_char (@var{new_val})
30588
ed17822e7662 doc: Always have a return value for functions which set internal variables (bug #61681)
Rik <rik@octave.org>
parents: 30565
diff changeset
5517 @deftypefnx {} {@var{old_val} =} string_fill_char (@var{new_val}, "local")
23706
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5518 Query or set the internal variable used to pad all rows of a character
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5519 matrix to the same length.
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5520
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5521 The value must be a single character and the default is @qcode{" "} (a
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5522 single space). For example:
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5523
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5524 @example
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5525 @group
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5526 string_fill_char ("X");
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5527 [ "these"; "are"; "strings" ]
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5528 @result{} "theseXX"
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5529 "areXXXX"
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5530 "strings"
23706
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5531 @end group
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5532 @end example
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5533
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5534 When called from inside a function with the @qcode{"local"} option, the
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5535 variable is changed locally for the function and any subroutines it calls.
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5536 The original variable value is restored when exiting the function.
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5537 @end deftypefn */)
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5538 {
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5539 tree_evaluator& tw = interp.get_evaluator ();
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5540
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5541 return tw.string_fill_char (args, nargout);
23706
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5542 }
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5543
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5544 /*
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5545 ## string_fill_char() function call must be outside of %!test block
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5546 ## due to the way a %!test block is wrapped inside a function
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5547 %!shared orig_val, old_val
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5548 %! orig_val = string_fill_char ();
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5549 %! old_val = string_fill_char ("X");
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5550 %!test
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5551 %! assert (orig_val, old_val);
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5552 %! assert (string_fill_char (), "X");
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5553 %! assert (["these"; "are"; "strings"], ["theseXX"; "areXXXX"; "strings"]);
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5554 %! string_fill_char (orig_val);
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5555 %! assert (string_fill_char (), orig_val);
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5556
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5557 %!assert ( [ [], {1} ], {1} )
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5558
28930
2883b3d08b7e maint: Remove unnecessary parentheses bracketing %!error BIST tests.
Rik <rik@octave.org>
parents: 28857
diff changeset
5559 %!error string_fill_char (1, 2)
23706
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5560 */
23723
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5561
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5562 DEFMETHOD (PS4, interp, args, nargout,
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5563 doc: /* -*- texinfo -*-
23723
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5564 @deftypefn {} {@var{val} =} PS4 ()
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5565 @deftypefnx {} {@var{old_val} =} PS4 (@var{new_val})
30588
ed17822e7662 doc: Always have a return value for functions which set internal variables (bug #61681)
Rik <rik@octave.org>
parents: 30565
diff changeset
5566 @deftypefnx {} {@var{old_val} =} PS4 (@var{new_val}, "local")
23723
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5567 Query or set the character string used to prefix output produced
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5568 when echoing commands is enabled.
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5569
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5570 The default value is @qcode{"+ "}.
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5571 @xref{Diary and Echo Commands}, for a description of echoing commands.
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5572
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5573 When called from inside a function with the @qcode{"local"} option, the
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5574 variable is changed locally for the function and any subroutines it calls.
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5575 The original variable value is restored when exiting the function.
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5576 @seealso{echo, PS1, PS2}
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5577 @end deftypefn */)
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5578 {
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5579 return interp.PS4 (args, nargout);
23723
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5580 }
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5581
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5582 DEFMETHOD (echo, interp, args, nargout,
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5583 doc: /* -*- texinfo -*-
23723
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5584 @deftypefn {} {} echo
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5585 @deftypefnx {} {} echo on
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5586 @deftypefnx {} {} echo off
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5587 @deftypefnx {} {} echo on all
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5588 @deftypefnx {} {} echo off all
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5589 @deftypefnx {} {} echo @var{function} on
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5590 @deftypefnx {} {} echo @var{function} off
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5591 Control whether commands are displayed as they are executed.
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5592
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5593 Valid options are:
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5594
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5595 @table @code
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5596 @item on
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5597 Enable echoing of commands as they are executed in script files.
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5598
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5599 @item off
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5600 Disable echoing of commands as they are executed in script files.
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5601
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5602 @item on all
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5603 Enable echoing of commands as they are executed in script files and
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5604 functions.
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5605
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5606 @item off all
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5607 Disable echoing of commands as they are executed in script files and
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5608 functions.
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5609
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5610 @item @var{function} on
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5611 Enable echoing of commands as they are executed in the named function.
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5612
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5613 @item @var{function} off
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5614 Disable echoing of commands as they are executed in the named function.
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5615 @end table
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5616
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5617 @noindent
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5618 With no arguments, @code{echo} toggles the current echo state.
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5619
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5620 @seealso{PS4}
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5621 @end deftypefn */)
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5622 {
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5623 tree_evaluator& tw = interp.get_evaluator ();
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5624
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5625 return tw.echo (args, nargout);
23723
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5626 }
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5627
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5628 /*
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5629 %!error echo ([])
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5630 %!error echo (0)
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5631 %!error echo ("")
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5632 %!error echo ("Octave")
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5633 %!error echo ("off", "invalid")
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5634 %!error echo ("on", "invalid")
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5635 %!error echo ("on", "all", "all")
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5636 */
29958
32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29956
diff changeset
5637
32690
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5638 /*
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5639 FIXME: Actually, it probably *isn't* worth fixing, but there is one small
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5640 difference between Octave and Matlab.
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5641
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5642 If inputname is not called from a function, Matlab walks up the stack until it
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5643 finds some valid code and then works from there. This could be relevant for
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5644 mex files or anonymous functions.
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5645
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5646 fcn = @(x) inputname (x);
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5647 a = 1:4;
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5648 arrayfun (fcn, a, 'uniformoutput', false)
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5649 % output is {'fcn', 'a', '', ''}
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5650 */
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5651 DEFMETHOD (inputname, interp, args, ,
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5652 doc: /* -*- texinfo -*-
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5653 @deftypefn {} {@var{namestr} =} inputname (@var{n})
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5654 @deftypefnx {} {@var{namestr} =} inputname (@var{n}, @var{ids_only})
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5655 Return the name of the @var{n}-th argument to the calling function.
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5656
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5657 If the argument is not a simple variable name, return an empty string.
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5658 Examples which will return @qcode{""} are numbers (@code{5.1}), expressions
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5659 (@code{@var{y}/2}), and cell or structure indexing (@code{@var{c}@{1@}} or
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5660 @code{@var{s}.@var{field}}).
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5661
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5662 @code{inputname} is only useful within a function. When used at the command
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5663 line or within a script it always returns an empty string.
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5664
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5665 By default, return an empty string if the @var{n}-th argument is not a valid
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5666 variable name. If the optional argument @var{ids_only} is false, return the
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5667 text of the argument even if it is not a valid variable name. This is an
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5668 Octave extension that allows the programmer to view exactly how the function
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5669 was invoked even when the inputs are complex expressions.
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5670 @seealso{nargin, narginchk}
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5671 @end deftypefn */)
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5672 {
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5673 int nargin = args.length ();
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5674
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5675 if (nargin < 1)
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5676 print_usage ();
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5677
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5678 dim_vector dims = args(0).dims ();
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5679 if (! dims.all_ones ())
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5680 error ("inputname: N must be a scalar index");
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5681
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5682 int n = args(0).xint_value ("inputname: N must be a scalar index");
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5683
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5684 if (n < 1)
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5685 error ("inputname: N must be a scalar index");
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5686
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5687 bool ids_only = true;
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5688
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5689 if (nargin == 2)
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5690 ids_only = args(1).xbool_value ("inputname: IDS_ONLY must be a logical value");
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5691
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5692 // Use zero-based indexing internally.
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5693 return ovl (interp.inputname (n-1, ids_only));
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5694 }
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5695
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5696 /*
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5697 %!function name = __iname1__ (arg1, arg2, arg3)
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5698 %! name = inputname (1);
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5699 %!endfunction
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5700
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5701 %!function name = __iname1_ID__ (arg1, arg2, arg3)
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5702 %! name = inputname (1, false);
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5703 %!endfunction
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5704
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5705 %!function name = __iname2__ (arg1, arg2, arg3)
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5706 %! name = inputname (2);
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5707 %!endfunction
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5708
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5709 %!function names = __iname3__ (arg1, arg2, arg3)
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5710 %! names = cell (1, 3);
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5711 %! for i = 1:3
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5712 %! names{i} = inputname (i);
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5713 %! endfor
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5714 %!endfunction
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5715
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5716 %!test
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5717 %! assert (__iname1__ ('xvar'), "");
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5718 %! xvar = 1;
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5719 %! assert (__iname1__ (xvar), "xvar");
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5720
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5721 %!test
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5722 %! xvar = 1; yvar = 2;
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5723 %! assert (__iname2__ (xvar), "");
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5724 %! assert (__iname2__ (xvar, yvar), "yvar");
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5725
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5726 %!test
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5727 %! xvar = 1; yvar = 2;
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5728 %! assert (__iname3__ (xvar), {"xvar", "", ""});
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5729 %! assert (__iname3__ (xvar, yvar), {"xvar", "yvar", ""});
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5730 %! assert (__iname3__ (xvar, 3, yvar), {"xvar", "", "yvar"});
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5731
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5732 ## Test numbers, expressions, indexing operations
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5733 %!test
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5734 %! assert (__iname1__ (1.0), "");
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5735 %! x = 1;
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5736 %! assert (__iname1__ (x / 2), "");
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5737 %! assert (__iname1__ (Inf), "");
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5738
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5739 %!test
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5740 %! assert (__iname1_ID__ (1.0), "1.0");
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5741 %! x = 1;
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5742 %! assert (__iname1_ID__ (x / 2), "x / 2");
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5743 %! assert (__iname1_ID__ (Inf), "Inf");
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5744
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5745 %!error <Invalid call> inputname ()
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5746 %!error <N must be a scalar> inputname (ones (2,2))
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5747 %!error <N must be a scalar index> inputname (-1)
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5748 */
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5749
31605
e88a07dec498 maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents: 30919
diff changeset
5750 OCTAVE_END_NAMESPACE(octave)