Mercurial > octave

annotate libinterp/parse-tree/pt-eval.cc @ 33634:4a70f390c85e default tip @

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge stable to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 28 May 2024 15:25:54 +0200
parents 742d8fc77688
children 1cfa8b20a07d
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"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
75
31605
e88a07dec498 maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents: 30919
diff changeset
76 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
77
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
78 OCTAVE_NORETURN static void
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
79 error_unexpected (const char *name)
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
80 {
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
81 error ("unexpected call to %s - please report this bug", name);
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
82 }
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
83
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
84 // Normal evaluator.
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 class quit_debug_exception
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 public:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
89
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
90 quit_debug_exception (bool all = false) : m_all (all) { }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
91
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
92 quit_debug_exception (const quit_debug_exception&) = default;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
93
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
94 quit_debug_exception& operator = (const quit_debug_exception&) = default;
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 ~quit_debug_exception () = default;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
97
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
98 bool all () const { return m_all; }
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 private:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
101
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
102 bool m_all;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
103 };
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 class debugger
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 public:
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 enum execution_mode
31607
aac27ad79be6 maint: Re-indent code after switch to using namespace macros.
Rik <rik@octave.org>
parents: 31605
diff changeset
110 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
111 EX_NORMAL = 0,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
112 EX_CONTINUE = 1,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
113 EX_QUIT = 2,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
114 EX_QUIT_ALL = 3
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
115 };
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
116
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
117 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
118 : 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
119 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
120 { }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
121
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
122 int server_loop ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
123
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
124 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
125
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
126 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
127
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
128 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
129
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
130 void dbquit (bool all = false)
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
131 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
132 if (all)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
133 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
134 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
135 m_execution_mode = EX_QUIT;
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
136 }
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
137
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
138 bool quitting_debugger () const;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
139
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
140 private:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
141
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
142 interpreter& m_interpreter;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
143
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
144 std::size_t m_level;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
145 execution_mode m_execution_mode;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
146 bool m_in_debug_repl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
147 };
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
148
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
149 // 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
150 // 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
151 // 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
152
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
153 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
154 debugger::server_loop ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
155 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
156 // 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
157
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
158 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
159
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
160 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
161 = &tree_evaluator::server_mode;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
162 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
163
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
164 int exit_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
165
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
166 do
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
167 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
168 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
169 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
170
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
171 if (quitting_debugger ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
172 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
173
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
174 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
175 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
176 // 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
177 // 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
178
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
179 octave_quit ();
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 // 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
182 // the command_editor.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
183
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
184 // 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
185 // 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
186 // 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
187 // 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
188 // 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
189 // 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
190 // 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
191 // 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
192 // is met?
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 // 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
195 // 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
196 // 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
197
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
198 command_editor::run_event_hooks ();
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 release_unreferenced_dynamic_libraries ();
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 sleep (0.1);
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 catch (const interrupt_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
205 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
206 octave_interrupt_state = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
207 m_interpreter.recover_from_exception ();
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 // 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
210 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
211 octave_stdout << "\n";
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 catch (const index_exception& e)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
214 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
215 m_interpreter.recover_from_exception ();
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 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
218 << 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
219 << std::endl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
220 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
221 catch (const execution_exception& ee)
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 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
224
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
225 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
226 es.display_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
227
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
228 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
229 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
230 m_interpreter.recover_from_exception ();
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 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
233 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
234 // 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
235 exit_status = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
236 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
237 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
238 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
239 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
240 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
241 if (qde.all ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
242 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
243
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
244 // Continue in this debug level.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
245 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
246 catch (const std::bad_alloc&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
247 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
248 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
249
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
250 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
251 << std::endl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
252 }
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 while (exit_status == 0);
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 if (exit_status == EOF)
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 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
259 octave_stdout << "\n";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
260
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
261 exit_status = 0;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
264 return exit_status;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
265 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
266
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
267 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
268 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
269 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
270 unwind_protect frame;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
271
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
272 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
273 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
274
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
275 m_in_debug_repl = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
276
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
277 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
278
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
279 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
280
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
281 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
282 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
283
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
284 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
285
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
286 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
287 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
288
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
289 if (caller)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
290 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
291 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
292 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
293 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
294
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
295 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
296
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
297 std::ostringstream buf;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
298
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
299 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
300
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
301 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
302
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
303 if (! fcn_nm.empty ())
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 if (input_sys.gud_mode ())
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 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
308
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
309 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
310 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
311 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
312 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
313 // 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
314 // 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
315 // 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
316
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
317 if (! silent)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
318 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
319 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
320
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
321 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
322 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
323
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
324 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
325
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
326 evmgr.set_workspace ();
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 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
329 fcn_nm, curr_debug_line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
330
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
331 if (! silent)
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 std::string line_buf;
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 if (caller)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
336 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
337
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
338 if (! line_buf.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
339 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
340 }
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 }
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 if (silent)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
345 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
346
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
347 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
348
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
349 if (m_interpreter.server_mode ())
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 if (! stopped_in_msg.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
352 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
353
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
354 evmgr.push_event_queue ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
355
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
356 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
357
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
358 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
359
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
360 std::shared_ptr<push_parser>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
361 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
362
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
363 tw.set_parser (debug_parser);
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 server_loop ();
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 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
368 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
369 if (! stopped_in_msg.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
370 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
371
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
372 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
373 if (m_level > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
374 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
375
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
376 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
377 m_interpreter.PS1 (tmp_prompt);
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 if (! m_interpreter.interactive ())
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 void (interpreter::*interactive_fptr) (bool)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
382 = &interpreter::interactive;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
383 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
384 m_interpreter.interactive ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
385
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
386 m_interpreter.interactive (true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
387
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
388 // 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
389 // interpreter?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
390
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
391 application *app = application::app ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
392
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
393 if (app)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
394 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
395 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
396 = &application::forced_interactive;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
397 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
398 app->forced_interactive ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
399
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
400 app->forced_interactive (true);
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 }
27533
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
403
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
404 #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
405
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
406 input_reader reader (m_interpreter);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
407
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
408 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
409
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
410 #else
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
411
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
412 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
413
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
414 #endif
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
415
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
416 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
417
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
418 while (m_in_debug_repl)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
419 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
420 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
421 break;
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 if (quitting_debugger ())
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 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
427 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
428 debug_parser.reset ();
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
429
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
430 #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
431
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
432 int retval = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
433
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
434 std::string prompt
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
435 = 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
436
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
437 do
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
438 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
439 bool eof = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
440 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
441
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
442 if (eof)
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 retval = EOF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
445 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
446 }
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 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
449
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
450 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
451 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
452 while (retval < 0);
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
453
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
454 #else
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
455
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
456 int retval = debug_parser.run ();
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
457
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
458 #endif
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
459 if (command_editor::interrupt (false))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
460 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
461 // 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
462
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
463 quitting_debugger ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
464
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
465 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
466 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
467 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
468 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
469 if (retval == 0)
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 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
472 = debug_parser.statement_list ();
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 if (stmt_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
475 stmt_list->accept (tw);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
476
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
477 if (octave_completion_matches_called)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
478 octave_completion_matches_called = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
479
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
480 // 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
481 // 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
482 // 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
483 // 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
484 // 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
485 // 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
486 // 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
487 // 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
488 // fix this problem?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
489 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
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 octave_quit ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
493 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
494 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
495 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
496 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
497 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
498 es.display_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
499
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
500 // 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
501 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
502 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
503 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
504 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
505 if (qde.all ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
506 throw;
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 // Continue in this debug level.
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
511 }
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
514 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
515 debugger::quitting_debugger () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
516 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
517 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
518 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
519 // 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
520 // 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
521
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
522 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
523 || 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
524 throw quit_debug_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
525 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
526 return true;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
529 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
530 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
531 // 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
532 // the same as dbcont.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
533
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
534 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
535 throw quit_debug_exception (true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
536 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
537 return true;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
540 return false;
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
543 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
544 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
545 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
546 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
547 }
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 std::string
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
550 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
551 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
552 std::string fname;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
553
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
554 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
555
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
556 if (fcn)
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 fname = fcn->fcn_file_name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
559
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
560 if (fname.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
561 fname = fcn->name ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
564 if (opt == "fullpathext")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
565 return fname;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
566
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
567 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
568 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
569
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
570 if (epos <= dpos+1)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
571 epos = std::string::npos;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
572
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
573 if (epos != std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
574 fname = fname.substr (0, epos);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
575
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
576 if (opt == "fullpath")
27015
4d9e1a832a55 move core of mfilename function to evaluator
John W. Eaton <jwe@octave.org>
parents: 27014
diff changeset
577 return fname;
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
578
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
579 if (dpos != std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
580 fname = fname.substr (dpos+1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
581
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
582 return fname;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
583 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
584
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
585 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
586 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
587 bool& incomplete_parse)
31809
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 incomplete_parse = 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 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
592
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
593 if (at_top_level ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
594 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
595 dbstep_flag (0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
596 reset_debug_state ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
599 // 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
600 // that do the actual prompting?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
601
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
602 // 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
603 // 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
604 // 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
605 // 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
606 // 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
607
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
608 Vlast_prompt_time.stamp ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
609
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
610 bool eof = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
611
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
612 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
613
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
614 if (command_history::add (input))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
615 evmgr.append_history (input);
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 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
618
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
619 if (m_exit_status == 0)
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 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
622 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
623
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
624 if (stmt_list)
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 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
627
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
628 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
629
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
630 evmgr.set_workspace ();
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 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
633 m_exit_status = EOF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
634 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
635 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
636 incomplete_parse = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
637
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
638 // 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
639 // 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
640 // 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
641
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
642 if (m_exit_status == -1)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
643 m_exit_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
644 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
645 m_parser->reset ();
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 evmgr.pre_input_event ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
648 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
649
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
650 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
651 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
652 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
653 std::mutex mtx;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
654 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
655 std::condition_variable cv;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
656 bool incomplete_parse = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
657 bool evaluation_pending = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
658 bool exiting = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
659
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
660 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
661
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
662 while (true)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
663 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
664 // 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
665 // 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
666 // execution.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
667
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
668 std::string ps
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
669 = 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
670
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
671 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
672
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
673 std::string input;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
674 std::getline (std::cin, input);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
675
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
676 if (input.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
677 continue;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
678
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
679 incomplete_parse = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
680 evaluation_pending = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
681 exiting = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
682
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
683 evmgr.post_event
33034
49128bdb9eb2 use explicit lambda-expression captures (bug #65318)
John W. Eaton <jwe@octave.org>
parents: 33033
diff changeset
684 ([this, input, &mtx, &incomplete_parse, &evaluation_pending, &cv, &exiting] (interpreter& interp)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
685 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
686 // INTERPRETER THREAD
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
687
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
688 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
689
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
690 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
691 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
692 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
693 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
694 catch (const exit_exception&)
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 exiting = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
698 cv.notify_all ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
699 throw;
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 (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
702 {
33034
49128bdb9eb2 use explicit lambda-expression captures (bug #65318)
John W. Eaton <jwe@octave.org>
parents: 33033
diff changeset
703 error_system& es = interp.get_error_system ();
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
704
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
705 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
706 es.display_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
707
33034
49128bdb9eb2 use explicit lambda-expression captures (bug #65318)
John W. Eaton <jwe@octave.org>
parents: 33033
diff changeset
708 if (interp.interactive ())
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
709 {
33034
49128bdb9eb2 use explicit lambda-expression captures (bug #65318)
John W. Eaton <jwe@octave.org>
parents: 33033
diff changeset
710 interp.recover_from_exception ();
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
711 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
712 evaluation_pending = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
713 cv.notify_all ();
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 else
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 evaluation_pending = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
718 cv.notify_all ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
719 throw exit_exception (1);
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
722 catch (...)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
723 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
724 evaluation_pending = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
725 cv.notify_all ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
726 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
727 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
728
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
729 evaluation_pending = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
730 cv.notify_all ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
733 // 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
734 // again.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
735
33034
49128bdb9eb2 use explicit lambda-expression captures (bug #65318)
John W. Eaton <jwe@octave.org>
parents: 33033
diff changeset
736 cv.wait (lock, [&evaluation_pending] { return ! evaluation_pending; });
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
737
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
738 if (exiting)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
739 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
740 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
741 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
742
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
743 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
744 tree_evaluator::repl ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
745 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
746 // 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
747 // 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
748 // 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
749 // 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
750
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
751 int exit_status = 0;
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 // 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
754 // 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
755 // interactive sessions.
29846
78cb255c78a4 move top-level REPL from interpreter to evaluator
John W. Eaton <jwe@octave.org>
parents: 29832
diff changeset
756
78cb255c78a4 move top-level REPL from interpreter to evaluator
John W. Eaton <jwe@octave.org>
parents: 29832
diff changeset
757 #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
758 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
759 #else
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
760 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
761 #endif
78cb255c78a4 move top-level REPL from interpreter to evaluator
John W. Eaton <jwe@octave.org>
parents: 29832
diff changeset
762
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
763 // 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
764 // 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
765 // 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
766 // 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
767
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
768 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
769
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
770 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
771 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
772 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
773 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
774 push_parser *pp
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
775 = new push_parser (m_interpreter,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
776 new input_reader (m_interpreter));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
777
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
778 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
779 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
780 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
781 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
782 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
783 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
784 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
785 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
786 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
787 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
788 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
789 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
790 }
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 do
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 try
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 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
797
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
798 repl_parser->reset ();
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 if (at_top_level ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
801 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
802 dbstep_flag (0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
803 reset_debug_state ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
806 exit_status = repl_parser->run ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
807
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
808 if (exit_status == 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
809 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
810 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
811 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
812
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
813 if (stmt_list)
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 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
816
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
817 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
818 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
819 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
820 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
821 exit_status = EOF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
822 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
823 }
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
826 catch (const interrupt_exception&)
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 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
829
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
830 // 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
831 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
832 octave_stdout << "\n";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
833 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
834 catch (const index_exception& ie)
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 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
837
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
838 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
839 << 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
840 << std::endl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
841 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
842 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
843 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
844 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
845
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
846 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
847 es.display_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
848
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
849 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
850 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
851 else
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 // 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
854 exit_status = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
855 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
856 }
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 catch (const quit_debug_exception&)
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 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
861
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
862 // 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
863 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
864 catch (const std::bad_alloc&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
865 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
866 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
867
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
868 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
869 << std::endl;
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
872 while (exit_status == 0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
873
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
874 if (exit_status == EOF)
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 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
877 octave_stdout << "\n";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
878
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
879 exit_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
880 }
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 return exit_status;
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
885 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
886 tree_evaluator::server_loop ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
887 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
888 // 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
889
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
890 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
891
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
892 m_exit_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
893
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
894 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
895 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
896
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
897 // 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
898 // 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
899 // 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
900 // 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
901 // segfaults in the test suite.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
902
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
903 do
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
904 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
905 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
906 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
907 // 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
908 // 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
909
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
910 octave_quit ();
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 // 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
913 // 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
914 // 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
915 // 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
916
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
917 command_editor::run_event_hooks ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
918
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
919 release_unreferenced_dynamic_libraries ();
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 sleep (0.1);
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 catch (const interrupt_exception&)
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 octave_interrupt_state = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
926 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
927 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
928
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
929 // 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
930 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
931 octave_stdout << "\n";
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 catch (const index_exception& e)
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 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
936 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
937
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
938 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
939 << 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
940 << std::endl;
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 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
943 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
944 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
945
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
946 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
947 es.display_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
948
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
949 if (m_interpreter.interactive ())
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 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
952 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
953 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
954 else
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 // 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
957 m_exit_status = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
958 break;
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
961 catch (const quit_debug_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
962 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
963 octave_interrupt_state = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
964 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
965 m_parser->reset ();
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 catch (const exit_exception& xe)
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 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
970 break;
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 catch (const std::bad_alloc&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
973 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
974 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
975 m_parser->reset ();
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 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
978 << std::endl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
979 }
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 while (m_exit_status == 0);
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 (m_exit_status == EOF)
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 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
986 octave_stdout << "\n";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
987
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
988 m_exit_status = 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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
991 return m_exit_status;
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
994 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
995 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
996 bool interactive)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
997 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
998 try
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 stmt_list->accept (*this);
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 octave_quit ();
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 if (! interactive)
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 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
1007
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1008 if (m_returning)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1009 m_returning = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1010
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1011 if (m_breaking)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1012 m_breaking--;
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 if (quit)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1015 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1016 }
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 (octave_completion_matches_called)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1019 octave_completion_matches_called = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1020 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1021 catch (const quit_debug_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1022 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1023 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1024 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1025 }
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 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1028 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
1029 int& parse_status, int nargout)
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 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1032
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1033 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
1034
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1035 do
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1036 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1037 eval_parser.reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1038
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1039 // If we are looking at
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1040 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1041 // val = eval ("code");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1042 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1043 // 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
1044
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1045 if (nargout > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1046 eval_parser.disallow_command_syntax ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1047
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1048 parse_status = eval_parser.run ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1049
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1050 if (parse_status == 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1051 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1052 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
1053 = eval_parser.statement_list ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1054
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1055 if (stmt_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1056 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1057 tree_statement *stmt = nullptr;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1058
32936
0b5f3219b650 eliminate all uses of base_list<T> template
John W. Eaton <jwe@octave.org>
parents: 32905
diff changeset
1059 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
1060 && (stmt = stmt_list->front ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1061 && stmt->is_expression ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1062 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1063 tree_expression *expr = stmt->expression ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1064
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1065 if (silent)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1066 expr->set_print_flag (false);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1067
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1068 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
1069
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1070 bool do_bind_ans = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1071
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1072 if (expr->is_identifier ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1073 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
1074 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1075 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
1076
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1077 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
1078 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
1079
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1080 if (nargout == 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1081 retval = octave_value_list ();
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 else if (nargout == 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1084 stmt_list->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1085 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1086 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
1087
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1088 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
1089 break;
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1090 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1091 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
1092 break;
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1093 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1094 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1095 while (parse_status == 0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1096
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1097 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1098 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1099
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1100 octave_value
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1101 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
1102 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
1103 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1104 octave_value retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1105
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1106 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
1107
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1108 if (! tmp.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1109 retval = tmp(0);
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 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1112 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1113
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1114 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1115 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
1116 bool silent, int& parse_status,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1117 int nargout)
31809
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 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
1120
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1121 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
1122 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1123
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1124 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1125 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
1126 int nargout)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1127 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1128 int parse_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1129
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1130 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
1131 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1132
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1133 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1134 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
1135 const std::string& catch_code,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1136 int nargout)
31809
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 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1139
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1140 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
1141
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1142 int parse_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1143
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1144 bool execution_error = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1145
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1146 octave_value_list tmp;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1147
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1148 try
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 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
1151 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1152 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1153 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1154 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1155 m_interpreter.recover_from_exception ();
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 execution_error = true;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1160 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
1161 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1162 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
1163
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1164 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
1165 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1166 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1167 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1168 if (nargout > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1169 retval = tmp;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1170
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1171 // 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
1172 // 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
1173 // execution exception.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1174 if (execution_error)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1175 throw execution_exception ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1178 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1179 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1180
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1181 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1182 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
1183 const std::string& try_code,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1184 int nargout)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1185 {
33034
49128bdb9eb2 use explicit lambda-expression captures (bug #65318)
John W. Eaton <jwe@octave.org>
parents: 33033
diff changeset
1186 unwind_action act ([this] (std::size_t frm)
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 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
1189 }, m_call_stack.current_frame ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1190
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1191 if (context == "caller")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1192 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
1193 else if (context == "base")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1194 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
1195 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1196 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
1197
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1198 int parse_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1199
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1200 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
1201 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1202
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1203 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1204 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
1205 const std::string& try_code,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1206 const std::string& catch_code,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1207 int nargout)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1208 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1209 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1210
33034
49128bdb9eb2 use explicit lambda-expression captures (bug #65318)
John W. Eaton <jwe@octave.org>
parents: 33033
diff changeset
1211 unwind_action act1 ([this] (std::size_t frm)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1212 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1213 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
1214 }, m_call_stack.current_frame ());
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 if (context == "caller")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1217 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
1218 else if (context == "base")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1219 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
1220 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1221 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
1222
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1223 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
1224
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1225 int parse_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1226
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1227 bool execution_error = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1228
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1229 octave_value_list tmp;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1230
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1231 try
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 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
1234 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1235 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1236 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1237 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1238 m_interpreter.recover_from_exception ();
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 execution_error = true;
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 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
1244 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1245 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
1246
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1247 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
1248 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1249 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1250 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1251 if (nargout > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1252 retval = tmp;
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 // 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
1255 // 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
1256 // execution exception.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1257 if (execution_error)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1258 throw execution_exception ();
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 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1262 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1265 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
1266 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
1267 error_unexpected ("tree_evaluator::visit_anon_fcn_handle");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1268 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1271 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
1272 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
1273 error_unexpected ("tree_evaluator::visit_argument_list");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1274 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1277 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
1278 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1279 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
1280 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1283 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
1284 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
1285 error_unexpected ("tree_evaluator::visit_args_block_attribute_list");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1286 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1289 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
1290 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
1291 error_unexpected ("tree_evaluator::visit_args_block_validation_list");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1292 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1295 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
1296 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
1297 error_unexpected ("tree_evaluator::visit_arg_validation");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1298 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1301 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
1302 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
1303 error_unexpected ("tree_evaluator::visit_arg_size_spec");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1304 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1307 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
1308 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
1309 error_unexpected ("tree_evaluator::visit_arg_validation_fcns");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1310 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1313 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
1314 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
1315 error_unexpected ("tree_evaluator::visit_binary_expression");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1316 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1317
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1318 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1319 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
1320 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
1321 error_unexpected ("tree_evaluator::visit_boolean_expression");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1322 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1325 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
1326 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
1327 error_unexpected ("tree_evaluator::visit_compound_binary_expression");
31809
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_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
1332 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1333 if (m_echo_state)
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 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1336 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1337 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1338 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1339 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
1340 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1341
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1342 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1343 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
1344
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1345 if (m_in_loop_command)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1346 m_breaking = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1347 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1348 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
1349 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1352 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
1353 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
1354 error_unexpected ("tree_evaluator::visit_colon_expression");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1355 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1356
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1357 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1358 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
1359 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1360 if (m_echo_state)
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 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1363 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1364 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1365 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1366 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
1367 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1368
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1369 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1370 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
1371
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1372 if (m_in_loop_command)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1373 m_continuing = 1;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1376 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1377 tree_evaluator::statement_printing_enabled ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1378 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1379 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
1380 || m_statement_context == SC_SCRIPT));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1381 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1384 tree_evaluator::reset_debug_state ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1385 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1386 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
1387 || m_dbstep_flag != 0
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1388 || m_break_on_next_stmt
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1389 || in_debug_repl ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1390 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1393 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
1394 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1395 m_debug_mode = mode;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1398 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1399 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
1400 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1401 unwind_protect frame;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1402
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1403 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
1404 command_history::ignoring_entries ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1405
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1406 command_history::ignore_entries (false);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1407
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1408 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
1409 m_call_stack.current_frame ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1410
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1411 // 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
1412 // into deeper levels of debugging.
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 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
1415
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1416 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
1417
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1418 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
1419 es.debug_on_warning ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1420
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1421 es.debug_on_error (false);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1422 es.debug_on_warning (false);
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 // 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
1425
33069
764a8eee1383 don't reset debug_frame if in dbstep mode (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33064
diff changeset
1426 tree_evaluator& tw = m_interpreter.get_evaluator ();
764a8eee1383 don't reset debug_frame if in dbstep mode (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33064
diff changeset
1427
764a8eee1383 don't reset debug_frame if in dbstep mode (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33064
diff changeset
1428 frame.add ([&tw, saved_frame = m_debug_frame] ()
764a8eee1383 don't reset debug_frame if in dbstep mode (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33064
diff changeset
1429 {
764a8eee1383 don't reset debug_frame if in dbstep mode (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33064
diff changeset
1430 if (! tw.dbstep_flag ())
764a8eee1383 don't reset debug_frame if in dbstep mode (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33064
diff changeset
1431 tw.debug_frame (saved_frame);
764a8eee1383 don't reset debug_frame if in dbstep mode (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33064
diff changeset
1432 });
33064
6fa52e36a8f2 protect m_debug_frame to improve recursive debugging (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33060
diff changeset
1433
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1434 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
1435
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1436 // 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
1437 // 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
1438 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1439 // 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
1440 // stmt.accept (tpc);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1441
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1442 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
1443
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1444 m_debugger_stack.push (dbgr);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1445
33034
49128bdb9eb2 use explicit lambda-expression captures (bug #65318)
John W. Eaton <jwe@octave.org>
parents: 33033
diff changeset
1446 frame.add ([this] ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1447 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1448 delete m_debugger_stack.top ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1449 m_debugger_stack.pop ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1450 reset_debug_state ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1451 });
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1452
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1453 dbgr->repl (prompt);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1454 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1455
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1456 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1457 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
1458 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1459 enter_debugger (prompt);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1460 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1461
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1462 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1463 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
1464 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1465 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
1466 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1467
32690
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
1468 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
1469 {
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
1470 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
1471
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
1472 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
1473 }
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
1474
32793
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1475 Matrix
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1476 tree_evaluator::ignored_fcn_outputs () const
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1477 {
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1478 Matrix retval;
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 const std::list<octave_lvalue> *lvalues = m_lvalue_list;
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 if (! lvalues)
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1483 return retval;
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1484
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1485 octave_idx_type nbh = 0;
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1486
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1487 for (const auto& lval : *lvalues)
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1488 nbh += lval.is_black_hole ();
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1489
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1490 if (nbh > 0)
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1491 {
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1492 retval.resize (1, nbh);
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1493
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1494 octave_idx_type k = 0;
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1495 octave_idx_type l = 0;
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1496
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1497 for (const auto& lval : *lvalues)
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1498 {
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1499 if (lval.is_black_hole ())
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1500 retval(l++) = k+1;
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1501
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1502 k += lval.numel ();
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1503 }
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1504 }
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1505
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1506 return retval;
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1507 }
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1508
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1509 // 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
1510 // corresponding function name ("plus", "minus", ...).
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1511
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1512 static std::string
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1513 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
1514 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1515 // 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
1516
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1517 // 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
1518 // 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
1519 // 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
1520 // string compares.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1521
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1522 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
1523
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1524 if (len == 2)
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 if (name[0] == '.')
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1527 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1528 switch (name[1])
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1529 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1530 case '\'':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1531 return "transpose";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1532
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1533 case '*':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1534 return "times";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1535
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1536 case '/':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1537 return "rdivide";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1538
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1539 case '^':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1540 return "power";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1541
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1542 case '\\':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1543 return "ldivide";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1544
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1545 default:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1546 break;
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 (name[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 return "le";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1555
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1556 case '=':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1557 return "eq";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1558
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1559 case '>':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1560 return "ge";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1561
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1562 case '~':
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 "ne";
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 default:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1567 break;
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1570 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1571 else if (len == 1)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1572 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1573 switch (name[0])
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 case '!':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1577 return "not";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1578
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1579 case '\'':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1580 return "ctranspose";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1581
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1582 case '+':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1583 return "plus";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1584
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1585 case '-':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1586 return "minus";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1587
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1588 case '*':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1589 return "mtimes";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1590
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1591 case '/':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1592 return "mrdivide";
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 case '^':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1595 return "mpower";
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 case '\\':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1598 return "mldivide";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1599
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1600 case '<':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1601 return "lt";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1602
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1603 case '>':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1604 return "gt";
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 case '&':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1607 return "and";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1608
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1609 case '|':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1610 return "or";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1611
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1612 default:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1613 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1614 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1615 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1616
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1617 return name;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1618 }
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 // 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
1621 // 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
1622
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1623 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1624 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
1625 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1626 octave_value retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1627
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1628 // 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
1629 // 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
1630 // 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
1631 // 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
1632
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1633 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
1634
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1635 // 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
1636 // 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
1637 // 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
1638 // 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
1639
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1640 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
1641
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1642 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
1643
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1644 if (pos != std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1645 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1646 // 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
1647 // 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
1648 // 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
1649 // 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
1650 // 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
1651 // exactly two elements?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1652 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1653 // object . method
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1654 // object . static-method
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 // 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
1657
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1658 // 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
1659
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1660 // 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
1661 // way to simplify it?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1662
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1663 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
1664
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1665 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
1666 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1667 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
1668
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1669 // 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
1670 // 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
1671
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1672 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
1673
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1674 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
1675 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1676 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
1677
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1678 if (cdef)
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 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
1681
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1682 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
1683
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1684 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
1685
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1686 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
1687
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1688 if (meth.ok ())
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 // 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
1691 // 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
1692 // 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
1693 // 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
1694 // simple function handle.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1695
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1696 if (meth.is_static ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1697 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
1698 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1699 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1700 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
1701
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1702 octave_fcn_handle *fh
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1703 = 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
1704 class_nm, meth_nm);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1705
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1706 return octave_value (fh);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1707 }
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1710 }
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1713 // 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
1714 // 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
1715 // 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
1716
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1717 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
1718 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1719
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1720 // 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
1721 // 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
1722 // 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
1723 // 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
1724 // functions:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1725 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1726 // nested functions (and subfunctions)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1727 // 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
1728 // private function
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1729 // class method
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 // 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
1732 // 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
1733
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1734 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
1735
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1736 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
1737
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1738 if (curr_scope)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1739 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1740 octave_value ov_fcn
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1741 = 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
1742
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1743 // 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
1744 // frame for that function.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1745
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1746 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
1747 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
1748
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1749 if (ov_fcn.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1750 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1751 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
1752
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1753 if (fcn->is_nested_function ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1754 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1755 if (! name_is_operator)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1756 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1757 // 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
1758 // function.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1759
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1760 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
1761 = 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
1762
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1763 // 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
1764 // 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
1765 // 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
1766 // 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
1767 // the current stack frame.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1768
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1769 // 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
1770 // 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
1771 // 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
1772 // 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
1773 // 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
1774
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1775 if (curr_fcn
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1776 && (fcn_name == curr_fcn->name ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1777 || 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
1778 frame = frame->access_link ();
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 octave_fcn_handle *fh
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1781 = 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
1782
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1783 return octave_value (fh);
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1786 else if (fcn->is_subfunction ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1787 /* || fcn->is_localfunction () */
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1788 || fcn->is_private_function ())
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 // 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
1791 // or private function).
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1792
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1793 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
1794
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1795 octave_fcn_handle *fh
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1796 = 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
1797
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1798 return octave_value (fh);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1799 }
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1802 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
1803 || curr_fcn->is_class_constructor ()))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1804 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1805 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
1806
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1807 octave_value ov_meth
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1808 = 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
1809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1810 if (ov_meth.is_defined ())
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 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
1813
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1814 // 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
1815 // 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
1816 // that it is a method?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1817
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1818 if (fcn->is_class_method ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1819 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1820 // 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
1821 // 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
1822
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1823 octave_fcn_handle *fh
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1824 = 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
1825
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1826 return octave_value (fh);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1827 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1828 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1829 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1830 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1831
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1832 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
1833
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1834 // 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
1835 // 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
1836
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1837 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
1838 }
28433
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1839
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1840 /*
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1841 %!test
31464
344e1152ed88 remove operators deprecated in version 7
John W. Eaton <jwe@octave.org>
parents: 30919
diff changeset
1842 %! x = {".'", "transpose";
28433
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1843 %! ".*", "times";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1844 %! "./", "rdivide";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1845 %! ".^", "power";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1846 %! ".\\", "ldivide";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1847 %! "<=", "le";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1848 %! "==", "eq";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1849 %! ">=", "ge";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1850 %! "!=", "ne";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1851 %! "~=", "ne";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1852 %! "~", "not";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1853 %! "!", "not";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1854 %! "\'", "ctranspose";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1855 %! "+", "plus";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1856 %! "-", "minus";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1857 %! "*", "mtimes";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1858 %! "/", "mrdivide";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1859 %! "^", "mpower";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1860 %! "\\", "mldivide";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1861 %! "<", "lt";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1862 %! ">", "gt";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1863 %! "&", "and";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1864 %! "|", "or"};
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1865 %! for i = 1:rows (x)
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1866 %! 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
1867 %! endfor
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1868 */
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1869
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1870 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1871 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
1872 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1873 // 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
1874
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1875 tree_identifier *id = elt->ident ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1876
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1877 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
1878 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1879
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1880 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1881 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
1882 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1883 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
1884 = 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
1885
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1886 return frame->is_variable (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1887 }
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 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1890 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
1891 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1892 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
1893 = 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
1894
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1895 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
1896 }
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 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1899 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
1900 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1901 if (expr->is_identifier ())
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 const tree_identifier *id
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1904 = 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
1905
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1906 if (id->is_black_hole ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1907 return false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1908
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1909 return is_variable (id->symbol ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1910 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1911
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1912 return false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1913 }
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 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1916 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
1917 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1918 if (expr->is_identifier ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1919 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1920 const tree_identifier *id
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1921 = 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
1922
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1923 return is_defined (id->symbol ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1924 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1925
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1926 return false;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1929 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1930 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
1931 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1932 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
1933 = 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
1934
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1935 return frame->is_variable (sym);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1938 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1939 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
1940 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1941 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
1942 = 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
1943
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1944 return frame->is_defined (sym);
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1947 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1948 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
1949 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1950 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
1951 = 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
1952
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1953 return frame->is_global (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1954 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1955
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1956 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1957 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
1958 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1959 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
1960 = 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
1961
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1962 return frame->varval (sym);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1963 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1964
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1965 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1966 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
1967 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1968 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
1969 = 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
1970
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1971 return frame->varval (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1972 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1973
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1974 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1975 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
1976 const octave_value& value,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1977 bool global)
31809
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 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
1980 = 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
1981
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1982 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
1983 }
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 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1986 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
1987 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1988 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
1989 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1990
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1991 octave_value&
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1992 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
1993 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1994 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
1995 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1996
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1997 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1998 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
1999 const octave_value& val)
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 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
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 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2005 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
2006 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2007 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
2008 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2009
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2010 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2011 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
2012 const octave_value& val)
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.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
2015 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2018 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
2019 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2020 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
2021 = 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
2022
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2023 frame->assign (name, val);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2024 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2027 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
2028 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
2029 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2030 // 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
2031 // 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
2032 // calling assign on that?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2033
33034
49128bdb9eb2 use explicit lambda-expression captures (bug #65318)
John W. Eaton <jwe@octave.org>
parents: 33033
diff changeset
2034 unwind_action act ([this] (std::size_t frm)
31809
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 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
2037 }, m_call_stack.current_frame ());
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 if (context == "caller")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2040 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
2041 else if (context == "base")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2042 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
2043 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2044 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
2045
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2046 if (valid_identifier (name))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2047 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2048 // 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
2049 // 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
2050 // already been checked.
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 if (iskeyword (name))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2053 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
2054 name.c_str ());
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 assign (name, val);
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 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2059 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
2060 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2063 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
2064 const std::string& context,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2065 bool verbose, bool require_file)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2066 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2067 // 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
2068 // 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
2069 // 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
2070 // written as
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 // foo1.m:
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 // foo2
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 // foo2.m:
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 // foo1
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 // and called with
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2081 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2082 // foo1
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2083 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2084 // (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
2085 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2086 // foo1.m:
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 // source ("foo2.m")
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 // foo2.m:
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 // source ("foo1.m")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2093 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2094 // and called with
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2095 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2096 // source ("foo1.m")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2097 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2098 // (for example).
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2099
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2100 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
2101
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2102 std::string file_full_name
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2103 = 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
2104
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2105 std::size_t pos
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2106 = 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
2107
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2108 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
2109
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2110 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
2111
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2112 unwind_protect frame;
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 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
2115 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
2116
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2117 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
2118
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2119 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
2120
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2121 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
2122 error ("max_recursion_depth exceeded");
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 if (! context.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2125 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2126 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
2127 m_call_stack.current_frame ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2128
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2129 if (context == "caller")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2130 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
2131 else if (context == "base")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2132 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
2133 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2134 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
2135 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2136
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2137 // 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
2138 std::size_t dir_end
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2139 = 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
2140 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
2141
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2142 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
2143 if (extension == std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2144 extension = file_name.length ();
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 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
2147 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
2148
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2149 // 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
2150 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
2151 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
2152
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2153 // 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
2154 // functions.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2155
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2156 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
2157 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2158 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
2159
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2160 if (! code
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2161 || (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
2162 != full_name))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2163 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2164 // 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
2165 ov_code = octave_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2166 }
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 else
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 // 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
2171 ov_code = octave_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2172 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2173
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2174 // 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
2175 // file, load.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2176
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2177 if (ov_code.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2178 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2179 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2180 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2181 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
2182 file_name, dir_name, "", "",
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2183 require_file, true, false, false);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2184 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2185 catch (execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2186 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2187 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
2188 file_full_name.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2189 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2190 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2191
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2192 // 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
2193
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2194 if (ov_code.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2195 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2196
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2197 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
2198 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
2199
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2200 if (verbose)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2201 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2202 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
2203 octave_stdout.flush ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2204 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2205
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2206 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
2207
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2208 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
2209
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2210 if (verbose)
32687
c34d571b5855 Fix extra newline displayed with --init-trace startup option (bug #65107)
Rik <rik@octave.org>
parents: 32633
diff changeset
2211 {
c34d571b5855 Fix extra newline displayed with --init-trace startup option (bug #65107)
Rik <rik@octave.org>
parents: 32633
diff changeset
2212 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
2213 octave_stdout.flush ();
c34d571b5855 Fix extra newline displayed with --init-trace startup option (bug #65107)
Rik <rik@octave.org>
parents: 32633
diff changeset
2214 }
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2215 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2218 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
2219 const octave_value& val)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2220 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2221 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
2222 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2223
32151
72dcb1cef2c9 maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents: 32148
diff changeset
2224 void
32125
fc5a9a9e5cea new set_nargin and set_nargout functions for evaluator
Petter T. <petter.vilhelm@gmail.com>
parents: 32095
diff changeset
2225 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
2226 {
fc5a9a9e5cea new set_nargin and set_nargout functions for evaluator
Petter T. <petter.vilhelm@gmail.com>
parents: 32095
diff changeset
2227 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
2228 }
fc5a9a9e5cea new set_nargin and set_nargout functions for evaluator
Petter T. <petter.vilhelm@gmail.com>
parents: 32095
diff changeset
2229
32151
72dcb1cef2c9 maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents: 32148
diff changeset
2230 void
32125
fc5a9a9e5cea new set_nargin and set_nargout functions for evaluator
Petter T. <petter.vilhelm@gmail.com>
parents: 32095
diff changeset
2231 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
2232 {
fc5a9a9e5cea new set_nargin and set_nargout functions for evaluator
Petter T. <petter.vilhelm@gmail.com>
parents: 32095
diff changeset
2233 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
2234 }
fc5a9a9e5cea new set_nargin and set_nargout functions for evaluator
Petter T. <petter.vilhelm@gmail.com>
parents: 32095
diff changeset
2235
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2236 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2237 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
2238 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2239 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
2240 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2241
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2242 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2243 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
2244 (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
2245 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2246 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
2247 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2248
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2249 int i = -1;
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 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
2252 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2253 i++;
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 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
2256
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2257 if (i < args.length ())
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 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
2260 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2261 if (! eval_decl_elt (elt))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2262 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
2263 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2264 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2265 ref.define (args(i));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2266 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2267 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2268 eval_decl_elt (elt);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2269 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2270 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2271
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2272 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2273 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
2274 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2275 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
2276 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2277 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
2278
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2279 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
2280 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2281 }
25382
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2282
29968
7aa4d8c049e5 eliminate obsolete DEFCONSTFUN and DEFCONSTMETHOD macros
John W. Eaton <jwe@octave.org>
parents: 29961
diff changeset
2283 DEFMETHOD (end, interp, args, ,
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2284 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
2285 @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
2286 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
2287 @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
2288 @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
2289
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2290 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
2291 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
2292
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2293 Example:
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2294
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2295 @example
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2296 @group
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2297 @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
2298 @var{x}(1,end)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2299 @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
2300 @var{x}(end,1)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2301 @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
2302 @var{x}(end,end)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2303 @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
2304 @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
2305 @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
2306
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 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
2308 @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
2309 @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
2310 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
2311 @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
2312
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 @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
2314 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
2315 must be overloaded with a function definition such as:
32953
98b34c7f7d73 Correct whitespace for end docstring, remove doc location comment (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32904
diff changeset
2316 @example
98b34c7f7d73 Correct whitespace for end docstring, remove doc location comment (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32904
diff changeset
2317 @group
98b34c7f7d73 Correct whitespace for end docstring, remove doc location comment (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32904
diff changeset
2318 function last_index = end (obj, end_dim, ndim_obj)
98b34c7f7d73 Correct whitespace for end docstring, remove doc location comment (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32904
diff changeset
2319  if (end_dim == ndim_obj)
98b34c7f7d73 Correct whitespace for end docstring, remove doc location comment (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32904
diff changeset
2320    last_index = prod (size (obj)(end_dim:ndim_obj));
98b34c7f7d73 Correct whitespace for end docstring, remove doc location comment (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32904
diff changeset
2321  else
98b34c7f7d73 Correct whitespace for end docstring, remove doc location comment (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32904
diff changeset
2322    last_index = size (obj, end_dim);
98b34c7f7d73 Correct whitespace for end docstring, remove doc location comment (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32904
diff changeset
2323  endif
98b34c7f7d73 Correct whitespace for end docstring, remove doc location comment (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32904
diff changeset
2324 endfunction
98b34c7f7d73 Correct whitespace for end docstring, remove doc location comment (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32904
diff changeset
2325 @end group
98b34c7f7d73 Correct whitespace for end docstring, remove doc location comment (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32904
diff changeset
2326 @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
2327 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
2328 @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
2329 @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
2330
25382
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2331 @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
2332 @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
2333 {
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2334 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
2335
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2336 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
2337 }
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2338
27100
b453b586da16 improve error message when indexing undefined object with "end" (bug #33637)
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
2339 /*
28617
0bac488f17fa throw error if 'end' is applied to undefined symbol (bug #58830)
John W. Eaton <jwe@octave.org>
parents: 28560
diff changeset
2340 %!test <*58830>
0bac488f17fa throw error if 'end' is applied to undefined symbol (bug #58830)
John W. Eaton <jwe@octave.org>
parents: 28560
diff changeset
2341 %! 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
2342 %! "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
2343
30322
552239d43c18 update bug status
John W. Eaton <jwe@octave.org>
parents: 29847
diff changeset
2344 %!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
2345 %! 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
2346 %! 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
2347 %! 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
2348 %! 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
2349 */
b453b586da16 improve error message when indexing undefined object with "end" (bug #33637)
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
2350
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2351 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2352 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
2353 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2354 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
2355
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2356 for (auto elt : *args)
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 // 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
2359
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2360 if (! elt)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2361 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2362
32410
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
2363 // 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
2364 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
2365
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2366 if (tmp.is_cs_list ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2367 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2368 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
2369
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2370 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
2371 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
2372 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2373 else if (tmp.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2374 arg_vals.push_back (tmp);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2375 }
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 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
2378 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2379
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2380 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2381 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
2382 (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
2383 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2384 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
2385 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
2386
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2387 // 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
2388 if (len == 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2389 return varargout;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2390 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2391 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2392 int i = 0;
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 (nargout <= len)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2395 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2396 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
2397 octave_value_list retval (nout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2398
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2399 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
2400 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2401 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
2402 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2403
32780
e96e2f9f9f37 avoid error with ignored values returned from function calls (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32632
diff changeset
2404 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
2405 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
2406
e96e2f9f9f37 avoid error with ignored values returned from function calls (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32632
diff changeset
2407 i++;
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2408
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2409 if (i == nout)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2410 break;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2413 return retval;
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 else
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 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
2418
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2419 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
2420 {
32780
e96e2f9f9f37 avoid error with ignored values returned from function calls (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32632
diff changeset
2421 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
2422 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
2423
e96e2f9f9f37 avoid error with ignored values returned from function calls (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32632
diff changeset
2424 i++;
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2425 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2426
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2427 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
2428 retval(i++) = varargout(j);
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 return retval;
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 }
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2435 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2436 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
2437 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2438 bool retval = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2439
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2440 tree_identifier *id = elt->ident ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2441 tree_expression *expr = elt->expression ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2442
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2443 if (id && expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2444 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2445 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
2446
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2447 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
2448
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2449 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
2450
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2451 retval = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2452 }
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 return retval;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2457 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2458 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
2459 const octave_value& val)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2460 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2461 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
2462
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2463 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
2464
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2465 if (label_value.is_defined ())
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 if (label_value.iscell ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2468 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2469 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
2470
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2471 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
2472 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2473 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
2474 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2475 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
2476
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2477 if (match)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2478 return true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2479 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2480 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2481 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2482 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2483 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
2484 }
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 return false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2487 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2488
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2489 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2490 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
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 (scope);
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_function *fcn,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2497 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
2498 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2499 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
2500 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2501
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2502 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2503 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
2504 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
2505 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
2506 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2507 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
2508 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2509
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2510 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2511 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
2512 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2513 m_call_stack.push (script);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2514 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2515
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2516 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2517 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
2518 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2519 m_call_stack.push (fcn);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2520 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2521
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2522 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2523 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
2524 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2525 m_call_stack.pop ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2526 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2527
32146
18c6b6997055 new function to pop and return top of call stack
Petter T. <petter.vilhelm@gmail.com>
parents: 32131
diff changeset
2528 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
2529 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
2530 {
18c6b6997055 new function to pop and return top of call stack
Petter T. <petter.vilhelm@gmail.com>
parents: 32131
diff changeset
2531 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
2532 }
18c6b6997055 new function to pop and return top of call stack
Petter T. <petter.vilhelm@gmail.com>
parents: 32131
diff changeset
2533
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2534 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2535 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
2536 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2537 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
2538 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2539
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2540 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2541 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
2542 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2543 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
2544 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2545
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2546 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2547 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
2548 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2549 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
2550 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2551
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2552 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2553 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
2554 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2555 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
2556 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2557
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2558 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2559 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
2560 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2561 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
2562
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2563 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
2564 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2565
33060
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2566 void
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2567 tree_evaluator::debug_list (std::ostream& os, int num_lines) const
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2568 {
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2569 std::shared_ptr<stack_frame> frm = m_call_stack.current_user_frame ();
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2570
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2571 if (! (frm->is_user_script_frame () || frm->is_user_fcn_frame ()))
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2572 error ("dblist: must be inside a user function or script to use dblist\n");
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2573
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2574 frm->debug_list (os, num_lines);
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2575 }
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2576
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2577 void
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2578 tree_evaluator::debug_type (std::ostream& os, int start_line, int end_line) const
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2579 {
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2580 std::shared_ptr<stack_frame> frm = m_call_stack.current_user_frame ();
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2581
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2582 if (! (frm->is_user_script_frame () || frm->is_user_fcn_frame ()))
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2583 error ("dbtype: must be inside a user function or script to use dbtype\n");
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2584
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2585 frm->debug_type (os, start_line, end_line);
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2586 }
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2587
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2588 octave_user_code *
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2589 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
2590 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2591 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
2592 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2593
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2594 unwind_protect *
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2595 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
2596 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2597 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
2598 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2599
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2600 octave_user_code *
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2601 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
2602 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2603 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
2604 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2605
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2606 octave_function *
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2607 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
2608 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2609 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
2610 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2611
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2612 octave_function *
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2613 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
2614 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2615 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
2616 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2617
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2618 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2619 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
2620 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2621 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
2622 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2623
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2624 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2625 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
2626 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2627 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
2628 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2629
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2630 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2631 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
2632 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2633 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
2634 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2635
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2636 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2637 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
2638 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2639 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
2640 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2641
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2642 std::string
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2643 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
2644 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2645 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
2646 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2647
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2648 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2649 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
2650 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2651 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
2652 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2653
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2654 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2655 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
2656 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2657 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
2658 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2659
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2660 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2661 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
2662 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2663 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
2664 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2665
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2666 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
2667 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
2668 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2669 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
2670 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2671
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2672 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
2673 tree_evaluator::backtrace_frames () 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_frames ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2678 std::list<frame_info>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2679 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
2680 bool print_subfn) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2681 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2682 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
2683 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2684
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2685 std::list<frame_info>
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2686 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
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_info ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2691 octave_map
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2692 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
2693 bool print_subfn) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2694 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2695 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
2696 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2697
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2698 octave_map
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2699 tree_evaluator::backtrace () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2700 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2701 return m_call_stack.backtrace ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2702 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2703
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2704 octave_map
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2705 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
2706 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2707 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
2708 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2709
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2710 std::string
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2711 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
2712 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2713 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
2714
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2715 std::ostringstream buf;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2716
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2717 for (const auto& frm : frames)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2718 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2719 buf << " " << frm.fcn_name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2720
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2721 int line = frm.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2722
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2723 if (line > 0)
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 << " at line " << line;
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 int column = frm.column ();
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 if (column > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2730 buf << " column " << column;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2731
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2732 buf << "\n";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2733 }
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2736 return buf.str ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2737 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2738
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2739 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2740 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
2741 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2742 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
2743
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2744 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
2745 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2746
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2747 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2748 tree_evaluator::pop_scope ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2749 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2750 m_call_stack.pop ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2751 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2752
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2753 symbol_scope
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2754 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
2755 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2756 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
2757 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2758
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2759 symbol_scope
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2760 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
2761 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2762 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
2763 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2764
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2765 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2766 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
2767 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2768 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
2769
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2770 if (! fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2771 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
2772
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2773 if (fcn->is_builtin_function ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2774 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2775 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
2776 return;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2779 fcn->lock ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2780 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2781
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2782 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2783 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
2784 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2785 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
2786
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2787 if (! fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2788 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
2789
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2790 if (fcn->is_builtin_function ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2791 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2792 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
2793 return;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2796 fcn->unlock ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2797 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2798
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2799 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2800 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
2801 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2802 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
2803
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2804 if (! fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2805 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
2806
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2807 return fcn->islocked ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2808 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2810 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2811 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
2812 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2813 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
2814 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2815
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2816 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2817 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
2818 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2819 m_call_stack.display ();
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2822 octave_value
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2823 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
2824 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2825 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
2826 = 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
2827
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2828 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
2829
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2830 if (val.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2831 return val;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2832
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2833 // 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
2834 // 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
2835 // from a .m file.
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 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
2838
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2839 if (fcn.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2840 return fcn;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2841
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2842 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
2843
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2844 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
2845 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2846
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2847 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2848 tree_evaluator::clear_objects ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2849 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2850 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
2851 = 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
2852
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2853 frame->clear_objects ();
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2856 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2857 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
2858 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2859 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
2860 = 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
2861
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2862 frame->clear_variable (name);
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2865 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2866 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
2867 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2868 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
2869 = 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
2870
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2871 frame->clear_variable_pattern (pattern);
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2874 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2875 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
2876 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2877 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
2878 = 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
2879
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2880 frame->clear_variable_regexp (pattern);
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2883 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2884 tree_evaluator::clear_variables ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2885 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2886 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
2887 = 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
2888
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2889 frame->clear_variables ();
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2892 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2893 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
2894 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2895 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
2896 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2897
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2898 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2899 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
2900 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2901 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
2902 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2903
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2904 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2905 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
2906 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2907 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
2908 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2909
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2910 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2911 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
2912 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2913 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
2914 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2915
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2916 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2917 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
2918 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2919 // 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
2920
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2921 clear_variables ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2922 clear_global_variables ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2923
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2924 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
2925
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2926 symtab.clear_functions (force);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2927 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2928
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2929 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2930 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
2931 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2932 // 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
2933
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2934 clear_variable (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2935
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2936 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
2937
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2938 symtab.clear_function (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2939 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2940
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2941 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2942 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
2943 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2944 // 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
2945
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2946 clear_variable_pattern (pattern);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2947
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2948 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
2949
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2950 symtab.clear_function_pattern (pattern);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2951 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2952
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2953 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2954 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
2955 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2956 // 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
2957
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2958 clear_variable_regexp (pattern);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2959
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2960 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
2961
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2962 symtab.clear_function_regexp (pattern);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2963 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2964
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2965 std::list<std::string>
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2966 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
2967 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2968 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
2969 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2970
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2971 std::list<std::string>
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2972 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
2973 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2974 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
2975 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2976
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2977 std::list<std::string>
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2978 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
2979 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2980 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
2981 }
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 // 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
2984 // 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
2985 // current call stack.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2986
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2987 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
2988 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
2989 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2990 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
2991
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2992 if (fname.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2993 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
2994 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2995 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2996 std::string name = fname;
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 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
2999 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3000 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
3001 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
3002 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
3003 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3004
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3005 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
3006
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3007 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
3008 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
3009
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3010 if (name.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3011 return nullptr;
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 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
3014
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3015 octave_value fcn;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3016 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
3017
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3018 if (name[0] == '@')
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 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
3021
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3022 if (p1 == std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3023 return nullptr;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3024
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3025 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
3026
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3027 p2 = name.find ('>', p1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3028
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3029 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
3030
32434
9296e2b74d0b Overhaul handling of breakpoints in classdef methods (bug #46451).
Markus Mützel <markus.muetzel@gmx.de>
parents: 32427
diff changeset
3031 // 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
3032 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
3033
32434
9296e2b74d0b Overhaul handling of breakpoints in classdef methods (bug #46451).
Markus Mützel <markus.muetzel@gmx.de>
parents: 32427
diff changeset
3034 // 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
3035
9296e2b74d0b Overhaul handling of breakpoints in classdef methods (bug #46451).
Markus Mützel <markus.muetzel@gmx.de>
parents: 32427
diff changeset
3036 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
3037 if (cls.ok () && cls.get_name () == dispatch_type)
33431
af2b017a5a7a Fix segmentation fault when trying to set breakpoint in non-existent method (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 32953
diff changeset
3038 {
33571
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3039 if (! method.compare (0, 4, "get."))
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3040 {
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3041 // find get method of classdef property
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3042 std::string prop_name = method.substr (4);
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3043 cdef_property prop = cls.find_property (prop_name);
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3044 if (prop.ok () && prop.get_name () == prop_name)
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3045 {
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3046 const octave_value& get_meth = prop.get ("GetMethod");
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3047 if (get_meth.is_function_handle ())
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3048 return get_meth.user_function_value ()->user_code_value ();
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3049 else
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3050 return nullptr;
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3051 }
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3052 }
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3053 else if (! method.compare (0, 4, "set."))
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3054 {
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3055 // find set method of classdef property
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3056 std::string prop_name = method.substr (4);
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3057 cdef_property prop = cls.find_property (prop_name);
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3058 if (prop.ok () && prop.get_name () == prop_name)
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3059 {
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3060 const octave_value& set_meth = prop.get ("SetMethod");
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3061 if (set_meth.is_function_handle ())
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3062 return set_meth.user_function_value ()->user_code_value ();
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3063 else
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3064 return nullptr;
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3065 }
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3066 }
33431
af2b017a5a7a Fix segmentation fault when trying to set breakpoint in non-existent method (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 32953
diff changeset
3067 else
33571
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3068 {
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3069 cdef_method meth = cls.find_method (method);
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3070 if (meth.ok () && meth.get_name () == method)
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3071 fcn = meth.get_function ();
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3072 else
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3073 return nullptr;
742d8fc77688 Support setting breakpoints in get and set methods of classdef properties (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 33446
diff changeset
3074 }
33431
af2b017a5a7a Fix segmentation fault when trying to set breakpoint in non-existent method (bug #65610).
Markus Mützel <markus.muetzel@gmx.de>
parents: 32953
diff changeset
3075 }
31809
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 // 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
3078 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
3079 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
3080 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3081 else
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 p2 = name.find ('>');
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 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
3086
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3087 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
3088 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3089
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3090 // 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
3091 std::string subfuns;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3092
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3093 if (p2 != std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3094 subfuns = name.substr (p2+1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3095
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3096 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
3097 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
3098
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3099 if (! user_code || subfuns.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3100 return user_code;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3101
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3102 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
3103
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3104 if (fcn.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3105 return nullptr;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3106
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3107 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
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 return user_code;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3111 }
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 std::string
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3114 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
3115 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3116 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
3117
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3118 if (curfcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3119 return curfcn->name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3120
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3121 return "";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3122 }
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 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3125 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
3126 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3127 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
3128 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3131 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
3132 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3133 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3134 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3135 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3136 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3137 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3138 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3139 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
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 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3143 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
3144
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3145 // 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
3146 // really have an accept method?
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 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
3149
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3150 if (init_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3151 init_list->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3152 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3153
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3154 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3155 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
3156 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3157 tree_identifier *id = elt.ident ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3158
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3159 if (id)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3160 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3161 if (elt.is_global ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3162 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
3163 else if (elt.is_persistent ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3164 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
3165 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3166 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
3167
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3168 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
3169
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3170 if (ult.is_undefined ())
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 tree_expression *expr = elt.expression ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3173
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3174 octave_value init_val;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3175
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3176 if (expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3177 init_val = expr->evaluate (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3178 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3179 init_val = Matrix ();
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 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
3182 }
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3186 template <typename T>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3187 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3188 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
3189 octave_lvalue& ult,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3190 tree_statement_list *loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3191 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3192 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
3193
32095
28ef2991fb5a Emit warning about infinite loop if for loop range starts with infinite value.
Rik <rik@octave.org>
parents: 31827
diff changeset
3194 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
3195 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
3196 "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
3197 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
3198
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3199 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
3200 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3201 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3202 m_echo_file_pos = line;
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 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
3205
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3206 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
3207
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3208 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3209 loop_body->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3210
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3211 if (quit_loop_now ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3212 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3213 }
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3216 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3217 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
3218 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3219 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3220 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3221 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3222
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3223 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3224 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3225 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3226 line++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3227 }
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 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3230 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
3231
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3232 // 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
3233 // and cmd.maxproc_expr ();
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 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
3236
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3237 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
3238
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3239 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
3240
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3241 if (rhs.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3242 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3243
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3244 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
3245
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3246 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
3247
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3248 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
3249
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3250 if (rhs.is_range ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3251 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3252 // 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
3253
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3254 if (rhs.is_double_type ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3255 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3256 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
3257 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3258 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3259
31827
c8dd3da44e83 maint: Remove `#if 0` commented-out code from the codebase.
Arun Giridhar <arungiridhar@gmail.com>
parents: 31809
diff changeset
3260 // 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
3261 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3262
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3263 if (rhs.is_scalar_type ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3264 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3265 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3266 m_echo_file_pos = line;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3267
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3268 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
3269
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3270 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3271 loop_body->accept (*this);
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 // 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
3274 quit_loop_now ();
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 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3277 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3278
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3279 // 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
3280 // 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
3281
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3282 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
3283 || rhs.is_string () || rhs.isstruct ())
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 // 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
3286 // columns.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3287
32598
2f3b54f81947 avoid dim_vector copies in more places where possible (bug #64962)
John W. Eaton <jwe@octave.org>
parents: 32589
diff changeset
3288 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
3289
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3290 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
3291 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
3292
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3293 octave_value arg = rhs;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3294 if (rhs.ndims () > 2)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3295 arg = arg.reshape (dv);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3296
33009
38112a5ee9c6 Don't skip loop iterations if number of rows of loop array is zero (bug #55622).
John W. Eaton <jwe@octave.org>
parents: 32954
diff changeset
3297 if (steps > 0)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3298 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3299 octave_value_list idx;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3300 octave_idx_type iidx;
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 // 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
3303 if (nrows == 1)
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 idx.resize (1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3306 iidx = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3307 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3308 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3309 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3310 idx.resize (2);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3311 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
3312 iidx = 1;
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 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
3316 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3317 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3318 m_echo_file_pos = line;
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 // 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
3321 idx(iidx) = i;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3322 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
3323
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3324 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
3325
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3326 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3327 loop_body->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3328
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3329 if (quit_loop_now ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3330 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3331 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3332 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3333 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3334 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3335 // 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
3336 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
3337 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3338
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3339 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3340 }
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 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
3343 cmd.line (), cmd.column ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3344 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3347 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
3348 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3349 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3350 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3351 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3352
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3353 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3354 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3355 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3356 line++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3357 }
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 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3360 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
3361
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3362 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
3363
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3364 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
3365
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3366 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
3367
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3368 if (rhs.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3369 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3370
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3371 if (! rhs.isstruct ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3372 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
3373
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3374 // 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
3375 // 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
3376 // structure element.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3377
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3378 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
3379
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3380 auto p = lhs->begin ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3381
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3382 tree_expression *elt = *p++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3383
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3384 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
3385
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3386 elt = *p;
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 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
3389
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3390 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
3391
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3392 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
3393
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3394 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
3395
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3396 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
3397
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3398 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
3399 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3400 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3401 m_echo_file_pos = line;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3402
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3403 std::string key = keys[i];
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3404
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3405 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
3406
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3407 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
3408
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3409 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
3410
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3411 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
3412 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
3413
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3414 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3415 loop_body->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3416
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3417 if (quit_loop_now ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3418 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3419 }
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
3422 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
3423 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
3424 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3425 // 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
3426
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3427 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
3428
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3429 if (body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3430 body->accept (*this);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3433 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3434 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
3435 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3436 // 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
3437 // 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
3438
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3439 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
3440 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
3441
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3442 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
3443 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
3444 = 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
3445
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3446 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
3447
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3448 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
3449
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3450 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
3451
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3452 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
3453 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
3454
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3455 tree_expression *expr = afh.expression ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3456 if (expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3457 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3458 tree_expression *expr_dup = expr->dup (new_scope);
33296
70b7f1c285c7 refactor comment handling in the lexer and parser
John W. Eaton <jwe@octave.org>
parents: 33069
diff changeset
3459 tree_statement *stmt = new tree_statement (expr_dup);
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3460 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
3461 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3462
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3463 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
3464
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3465 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
3466
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3467 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
3468
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3469 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
3470 = 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
3471
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3472 for (auto& name : free_vars)
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 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
3475
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3476 if (val.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3477 local_vars[name] = val;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3478 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3479
33309
d422992b5483 refactor position tracking in the parser
John W. Eaton <jwe@octave.org>
parents: 33296
diff changeset
3480 octave_user_function *af = new octave_user_function (new_scope, nullptr, param_list_dup, ret_list, stmt_list);
31809
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 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
3483
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3484 bool is_nested = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3485
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3486 if (curr_fcn)
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 // 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
3489 // 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
3490
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3491 // 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
3492 // 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
3493 // 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 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
3496 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3497 is_nested = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3498 af->mark_as_nested_function ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3499 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
3500 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3501
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3502 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
3503
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3504 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
3505 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
3506
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3507 // 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
3508 // 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
3509
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3510 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
3511 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
3512
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3513 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
3514 }
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 af->mark_as_anonymous_function ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3517
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3518 octave_value ov_fcn (af);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3519
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3520 return (is_nested
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3521 ? 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
3522 : 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
3523 }
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 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3526 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
3527 int nargout,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3528 const octave_value_list& args)
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 octave_value_list 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 if (args.has_magic_colon ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3533 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
3534
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3535 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
3536
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3537 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
3538
32410
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3539 // 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
3540 // 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
3541 if (nargout < 0)
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3542 nargout = 1;
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3543
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3544 if (fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3545 retval = (*fcn) (args, nargout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3546 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3547 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3548 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
3549
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3550 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
3551 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3552
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3553 // 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
3554 // 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
3555
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3556 retval.make_storable_values ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3557
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3558 // 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
3559 // 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
3560 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3561 // octave_value retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3562 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3563 // instead of
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3564 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3565 // octave_value_list retval;
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 // 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
3568
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3569 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
3570 retval.clear ();
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 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3573 }
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 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3576 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
3577 int nargout,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3578 const octave_value_list& args)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3579 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3580 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3581
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3582 if (args.has_magic_colon ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3583 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
3584
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3585 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
3586
32410
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3587 // 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
3588 // 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
3589 if (nargout < 0)
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3590 nargout = 1;
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3591
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3592 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
3593
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3594 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3595 }
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 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3598 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
3599 int nargout,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3600 const octave_value_list& args)
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 octave_value_list retval;
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 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
3605
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3606 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
3607 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
3608
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3609 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
3610
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3611 if (! cmd_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3612 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3613
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3614 // 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
3615 // 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
3616
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3617 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
3618 error ("max_recursion_depth exceeded");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3619
32309
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3620 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
3621
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3622 profiler::enter<octave_user_script> block (m_profiler, user_script);
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3623
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3624 if (echo ())
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3625 push_echo_state (tree_evaluator::ECHO_SCRIPTS, file_name);
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3626
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3627 // FIXME: Should we be using tree_evaluator::eval here?
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3628
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3629 cmd_list->accept (*this);
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3630
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3631 if (m_returning)
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3632 m_returning = 0;
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3633
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3634 if (m_breaking)
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3635 m_breaking--;
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3636
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3637 return retval;
31809
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3640 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3641 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
3642 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3643 // ??
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3644 error_unexpected ("tree_evaluator::visit_octave_user_script");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3645 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3646
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3647 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3648 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
3649 int nargout,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3650 const octave_value_list& xargs)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3651 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3652 octave_value_list retval;
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 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
3655 // 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
3656
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3657 octave_value_list args (xargs);
32148
dea87a95ad18 experimental stack-based virtual machine
Petter T. <petter.vilhelm@gmail.com>
parents: 32147
diff changeset
3658
32793
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
3659 // 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
3660 Matrix ignored_outputs = ignored_fcn_outputs ();
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
3661
32794
512e07384ae9 atttempt to make isargout work properly in more cases (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32793
diff changeset
3662 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
3663
512e07384ae9 atttempt to make isargout work properly in more cases (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32793
diff changeset
3664 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
3665 {
512e07384ae9 atttempt to make isargout work properly in more cases (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32793
diff changeset
3666 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
3667 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
3668 }
512e07384ae9 atttempt to make isargout work properly in more cases (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32793
diff changeset
3669
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3670 octave_value_list ret_args;
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 int nargin = args.length ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3673
32410
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3674 // 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
3675 // 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
3676 if (nargout < 0)
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3677 nargout = 1;
32427
8a8f16e7c462 maint: strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 32410
diff changeset
3678
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3679 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
3680 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3681 if (nargin > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3682 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3683 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
3684 --nargin;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3685 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
3686 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3687 else
33382
79cfa1b7a813 replace nearly all remaining uses of panic_impossible with error
John W. Eaton <jwe@octave.org>
parents: 33365
diff changeset
3688 error ("invalid call to classdef constructor in tree_evaluator::execute_user_function - please report this bug");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3689 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3690
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3691 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
3692
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3693 bool takes_varargs = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3694 int max_inputs = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3695
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3696 if (param_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3697 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3698 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
3699 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
3700 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3701
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3702 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
3703 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3704 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
3705
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3706 if (name.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3707 name = "@<anonymous>";
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 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
3710 "%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
3711 name.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3712 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3713
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3714 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
3715
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3716 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
3717
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3718 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
3719 {
32936
0b5f3219b650 eliminate all uses of base_list<T> template
John W. Eaton <jwe@octave.org>
parents: 32905
diff changeset
3720 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
3721
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3722 if (nargout > max_outputs)
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 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
3725
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3726 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
3727 "%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
3728 name.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3729 }
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
32793
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
3732 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
3733 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
3734 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
3735
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3736 // 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
3737 // 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
3738
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3739 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
3740 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3741 if (! ret_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3742 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
3743 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
3744
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3745 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
3746 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3747
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3748 // 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
3749 // 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
3750
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3751 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
3752 error ("max_recursion_depth exceeded");
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 unwind_action act2 ([&user_function] () {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3755 user_function.restore_warning_states ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3758 // 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
3759
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3760 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
3761
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3762 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
3763
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3764 if (cmd_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3765 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3766 profiler::enter<octave_user_function>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3767 block (m_profiler, user_function);
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 if (echo ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3770 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
3771 user_function.fcn_file_name ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3772
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3773 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
3774 {
32936
0b5f3219b650 eliminate all uses of base_list<T> template
John W. Eaton <jwe@octave.org>
parents: 32905
diff changeset
3775 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
3776
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3777 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
3778
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3779 tree_expression *expr = stmt->expression ();
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 if (expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3782 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3783 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
3784
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3785 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
3786
ff1d5873f805 don't allow anon fcn eval to return comma-separated list (bug #64783)
John W. Eaton <jwe@octave.org>
parents: 32847
diff changeset
3787 // 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
3788
ff1d5873f805 don't allow anon fcn eval to return comma-separated list (bug #64783)
John W. Eaton <jwe@octave.org>
parents: 32847
diff changeset
3789 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
3790 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
3791 }
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 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3794 cmd_list->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3795
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3796 if (m_returning)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3797 m_returning = 0;
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 if (m_breaking)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3800 m_breaking--;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3801 }
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 // Copy return values out.
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 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
3806 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3807 Cell varargout;
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 if (ret_list->takes_varargs ())
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 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
3812
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3813 if (varargout_varval.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3814 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
3815 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3816
32780
e96e2f9f9f37 avoid error with ignored values returned from function calls (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32632
diff changeset
3817 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
3818 }
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 return retval;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3823 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3824 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
3825 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3826 // ??
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3827 error_unexpected ("tree_evaluator::visit_octave_user_function");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3828 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3829
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3830 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3831 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
3832 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3833 error_unexpected ("tree_evaluator::visit_octave_user_function_header");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3834 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3835
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3836 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3837 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
3838 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3839 error_unexpected ("tree_evaluator::visit_octave_user_function_trailer");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3840 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3841
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3842 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3843 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
3844 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3845 octave_value fcn = cmd.function ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3846
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3847 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
3848
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3849 if (f)
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 std::string nm = f->name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3852
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3853 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
3854
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3855 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
3856
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3857 // 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
3858 // function is cleared.
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 assign (nm);
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3863
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3864 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3865 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
3866 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3867 error_unexpected ("tree_evaluator::visit_identifier");
31809
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3870 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3871 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
3872 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3873 error_unexpected ("tree_evaluator::visit_if_clause");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3874 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3877 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
3878 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3879 if (m_echo_state)
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 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3882 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3883 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3884 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3885 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
3886 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3887
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3888 // 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
3889 // really have an accept method?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3890
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3891 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
3892
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3893 if (lst)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3894 lst->accept (*this);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3897 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3898 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
3899 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3900 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
3901 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3902 tree_expression *expr = tic->condition ();
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 if (! (in_debug_repl ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3905 && 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
3906 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
3907
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3908 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
3909 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
3910
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3911 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
3912 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3913 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
3914
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3915 if (stmt_lst)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3916 stmt_lst->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3917
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3918 break;
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3922
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3923 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3924 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
3925 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3926 error_unexpected ("tree_evaluator::visit_index_expression");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3927 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3928
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3929 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3930 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
3931 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3932 error_unexpected ("tree_evaluator::visit_matrix");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3933 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3934
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3935 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3936 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
3937 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3938 error_unexpected ("tree_evaluator::visit_cell");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3939 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3940
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3941 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3942 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
3943 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3944 error_unexpected ("tree_evaluator::visit_multi_assignment");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3945 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3946
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3947 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3948 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
3949 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3950 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3951 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3952 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3953 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3954 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3955 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3956 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
3957 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3958
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3959 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
3960 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
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3964 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
3965 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3966 error_unexpected ("tree_evaluator::visit_constant");
31809
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3969 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3970 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
3971 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3972 error_unexpected ("tree_evaluator::visit_fcn_handle");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3973 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3976 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
3977 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3978 error_unexpected ("tree_evaluator::visit_parameter_list");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3979 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3982 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
3983 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3984 error_unexpected ("tree_evaluator::visit_postfix_expression");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3985 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3986
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3987 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3988 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
3989 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3990 error_unexpected ("tree_evaluator::visit_prefix_expression");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3991 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3992
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3993 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3994 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
3995 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3996 if (m_echo_state)
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 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3999 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4000 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4001 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4002 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
4003 }
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_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4006 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
4007
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4008 // Act like dbcont.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4009
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4010 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
4011 dbcont ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4012 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
4013 || m_statement_context == SC_SCRIPT
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4014 || m_in_loop_command)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4015 m_returning = 1;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4018 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4019 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
4020 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
4021 error_unexpected ("tree_evaluator::visit_simple_assignment");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4022 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4023
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4024 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4025 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
4026 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4027 tree_command *cmd = stmt.command ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4028 tree_expression *expr = stmt.expression ();
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 if (cmd || expr)
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 (! (in_debug_repl ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4033 && 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
4034 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
4035
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4036 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4037 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4038 if (cmd)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4039 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4040 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
4041 upv (m_lvalue_list, nullptr);
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 cmd->accept (*this);
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 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4046 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4047 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4048 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4049 int line = stmt.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4050 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4051 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4052 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4053 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
4054 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4055
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4056 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4057 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
4058
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4059 // 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
4060 // 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
4061 // 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
4062 // printing the result.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4063
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4064 // 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
4065 // 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
4066 // everything, binding ans as necessary?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4067
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4068 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
4069
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4070 if (tmp_result.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4071 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4072 bool do_bind_ans = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4073
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4074 if (expr->is_identifier ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4075 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
4076 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4077 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
4078
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4079 if (do_bind_ans)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4080 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
4081 && statement_printing_enabled ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4082 }
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4085 catch (const std::bad_alloc&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4086 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4087 // 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
4088 // 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
4089 // 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
4090 // 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
4091
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4092 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
4093 "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
4094 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4095 catch (const interrupt_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4096 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4097 // 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
4098 // Otherwise, jump out of here.
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 (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4101 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4102 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4103 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4104 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4105 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4106 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4107 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
4108
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4109 if ((m_interpreter.interactive ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4110 || application::forced_interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4111 && ((es.debug_on_error ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4112 && 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
4113 || (es.debug_on_caught ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4114 && 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
4115 && in_user_code ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4116 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4117 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4118 es.display_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4119
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4120 enter_debugger ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4121
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4122 // 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
4123 // 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
4124 // 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
4125
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4126 throw quit_debug_exception (true);
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 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4129 throw;
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4132 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4133
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4134 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4135 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
4136 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4137 // 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
4138 // 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
4139
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4140 auto p = lst.begin ();
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 if (p != lst.end ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4143 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4144 while (true)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4145 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4146 tree_statement *elt = *p++;
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 if (! elt)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4149 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
4150
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4151 octave_quit ();
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 elt->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4154
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4155 if (m_breaking || m_continuing)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4156 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4157
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4158 if (m_returning)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4159 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4160
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4161 if (p == lst.end ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4162 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4163 else
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 // 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
4166 // 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
4167 // 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
4168 // example, in code like this:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4169 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4170 // 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
4171 // # after this statement
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4172 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4173 // 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
4174 // # 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
4175 // # 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
4176 // # between statements here
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4177
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4178 // result_values = empty_list;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4179 }
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 }
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4184 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4185 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
4186 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
4187 error_unexpected ("tree_evaluator::visit_switch_case");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4188 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4191 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
4192 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
4193 error_unexpected ("tree_evaluator::visit_switch_case_list");
31809
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_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
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 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4209 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
4210
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4211 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
4212
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4213 if (! expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4214 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
4215 cmd.line (), cmd.column ());
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 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
4218
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4219 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
4220
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4221 if (lst)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4222 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4223 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
4224 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4225 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
4226 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4227 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
4228
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4229 if (stmt_lst)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4230 stmt_lst->accept (*this);
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 break;
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 }
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4237
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4238 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4239 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
4240 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4241 if (m_echo_state)
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 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4244 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4245 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4246 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4247 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
4248 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4249
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4250 bool execution_error = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4251 octave_scalar_map err_map;
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_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
4254
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4255 if (try_code)
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 // unwind frame before catch block
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 unwind_protect frame;
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 interpreter_try (frame);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4262
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4263 // 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
4264 // 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
4265
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4266 try
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 try_code->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4269 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4270 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4271 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4272 execution_error = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4273
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4274 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
4275
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4276 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4277
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4278 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
4279 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
4280 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
4281
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4282 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4283 }
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 // 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
4286 // to executing the catch block.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4287 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4288
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4289 if (execution_error)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4290 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4291 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
4292
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4293 if (catch_code)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4294 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4295 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
4296
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4297 if (expr_id)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4298 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4299 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
4300
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4301 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
4302 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4303
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4304 // perform actual "catch" block
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4305 catch_code->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4306 }
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4309
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4310 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4311 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
4312 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4313 unwind_protect frame;
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 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
4316 octave_interrupt_state = 0;
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 // 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
4319 // backtracking.
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 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
4322 m_call_stack.current_line ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4323
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4324 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
4325 m_call_stack.current_column ());
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 // 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
4328 // 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
4329 // 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
4330 // only occur in loops.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4331
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4332 frame.protect_var (m_returning);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4333 m_returning = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4334
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4335 frame.protect_var (m_breaking);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4336 m_breaking = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4337
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4338 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4339 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4340 if (list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4341 list->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4342 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4343 catch (const execution_exception& ee)
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 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
4346
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4347 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4348 m_interpreter.recover_from_exception ();
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 if (m_breaking || m_returning)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4351 frame.discard (2);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4352 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4353 frame.run (2);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4354
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4355 frame.discard (2);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4356
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4357 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4358 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4359
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4360 // 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
4361 // 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
4362
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4363 // 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
4364 // 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
4365 // 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
4366 // 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
4367 // Consider the case of
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 // function foo ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4370 // unwind_protect
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4371 // 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
4372 // break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4373 // 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
4374 // unwind_protect_cleanup
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4375 // 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
4376 // return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4377 // 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
4378 // end_unwind_protect
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4379 // endfunction
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4380 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4381 // 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
4382 // 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
4383 // 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
4384 // 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
4385 // 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
4386
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4387 if (m_breaking || m_returning)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4388 frame.discard (2);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4389 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4390 frame.run (2);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4393 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4394 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
4395 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4396 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4397 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4398 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4399 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4400 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4401 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4402 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
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 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
4406
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4407 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
4408
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4409 if (unwind_protect_code)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4410 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4411 try
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 unwind_protect_code->accept (*this);
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 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4416 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4417 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
4418
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4419 // 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
4420 // 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
4421 // 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
4422 // here?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4423 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4424 m_interpreter.recover_from_exception ();
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 // 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
4427 // 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
4428 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
4429
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4430 // 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
4431 // 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
4432 throw;
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 catch (const interrupt_exception&)
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 // 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
4437 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4438 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
4439 throw;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4442 // 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
4443 // 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
4444 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
4445 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4449 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
4450 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4451 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4452 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4453 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4454
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4455 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4456 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4457 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4458 line++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4459 }
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 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
4462
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4463 tree_expression *expr = cmd.condition ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4464
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4465 if (! expr)
33382
79cfa1b7a813 replace nearly all remaining uses of panic_impossible with error
John W. Eaton <jwe@octave.org>
parents: 33365
diff changeset
4466 error ("unexpected: while condition is nullptr - please report this bug");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4467
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4468 for (;;)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4469 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4470 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4471 m_echo_file_pos = line;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4472
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4473 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4474 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
4475
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4476 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
4477 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4478 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
4479
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4480 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4481 loop_body->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4482
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4483 if (quit_loop_now ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4484 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4485 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4486 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4487 break;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4491 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4492 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
4493 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4494 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4495 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4496 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4497
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4498 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4499 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4500 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4501 line++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4502 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4503
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4504 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
4505
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4506 tree_expression *expr = cmd.condition ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4507
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4508 if (! expr)
33382
79cfa1b7a813 replace nearly all remaining uses of panic_impossible with error
John W. Eaton <jwe@octave.org>
parents: 33365
diff changeset
4509 error ("unexpected: do-until condition is nullptr - please report this bug");
31809
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 for (;;)
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 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4514 m_echo_file_pos = line;
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 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
4517
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4518 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4519 loop_body->accept (*this);
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 if (quit_loop_now ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4522 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4523
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4524 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4525 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
4526
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4527 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
4528 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4529 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4530 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4531
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4532 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4533 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
4534 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
4535 error_unexpected ("tree_evaluator::visit_superclass_ref");
31809
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4538 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4539 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
4540 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
4541 error_unexpected ("tree_evaluator::visit_metaclass_query");
31809
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4544 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4545 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
4546 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4547 static std::string ans = "ans";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4548
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4549 if (val.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4550 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4551 if (val.is_cs_list ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4552 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4553 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
4554
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4555 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
4556 bind_ans (lst(i), print);
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 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4559 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4560 // 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
4561 // just for convenience?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4562
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4563 assign (ans, val);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4564
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4565 if (print)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4566 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4567 // 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
4568 // 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
4569 // 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
4570
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4571 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
4572 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
4573 m_interpreter.feval ("display", args);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4574 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4575 }
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 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4580 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
4581 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4582 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
4583 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
4584 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4587 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
4588 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
4589 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4590 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
4591
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4592 if (is_breakpoint)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4593 break_on_this_statement = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4594 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
4595 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4596 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
4597 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4598 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
4599 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4600 // 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
4601 // 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
4602 // 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
4603 // 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
4604 // line and return to prompt.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4605
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4606 break_on_this_statement = true;
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 else
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 // 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
4611
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4612 m_dbstep_flag--;
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
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 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
4617 && 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
4618 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4619 // 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
4620
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4621 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
4622
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4623 break_on_this_statement = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4624 }
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 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
4627 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4628 // 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
4629
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4630 break_on_this_statement = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4631
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4632 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
4633 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4634 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
4635 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4636 // 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
4637 // 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
4638 // 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
4639 // "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
4640 // that frame.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4641
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4642 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
4643 && 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
4644 m_dbstep_flag = -1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4645 }
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 if (! break_on_this_statement)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4648 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
4649
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4650 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
4651
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4652 if (break_on_this_statement)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4653 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4654 m_dbstep_flag = 0;
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 enter_debugger ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4657 }
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4660 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4661 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
4662 const char *warn_for)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4663 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4664 bool expr_value = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4665
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4666 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
4667
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4668 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
4669
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4670 if (t1.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4671 return t1.is_true ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4672 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4673 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
4674
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4675 return expr_value;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4678 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4679 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
4680 int nargout)
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 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
4683 "max_recursion_depth", 0);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4686 symbol_info_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4687 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
4688 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4689 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
4690 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4691
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4692 symbol_info_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4693 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
4694 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4695 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
4696 }
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 symbol_info_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4699 tree_evaluator::get_symbol_info ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4700 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4701 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
4702 }
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 symbol_info_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4705 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
4706 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4707 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
4708 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4709
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4710 octave_map
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4711 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
4712 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4713 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
4714 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
4715
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4716 octave_idx_type i = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4717 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
4718 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4719 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
4720 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
4721
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4722 i++;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4725 octave_map m;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4726
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4727 m.assign ("function", fcn_names);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4728 m.assign ("file", file_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 return m;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4731 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4732
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4733 std::string
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4734 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
4735 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4736 std::string retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4737
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4738 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
4739
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4740 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
4741 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4742 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
4743
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4744 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
4745 }
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 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4748 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4749
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4750 std::list<std::string>
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4751 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
4752 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4753 std::list<std::string> names;
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 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
4756 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
4757
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4758 return names;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4761 std::list<std::string>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4762 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
4763 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4764 std::list<std::string> names;
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 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
4767 if (nm == fcn_fname.second)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4768 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
4769
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4770 return names;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4771 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4772
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4773 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4774 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
4775 const std::string& nm)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4776 {
32546
f561b6a31e02 remove experimental bytecode interpreter from stable branch for release
John W. Eaton <jwe@octave.org>
parents: 32545
diff changeset
4777 m_autoload_map[fcn] = check_autoload_file (nm);
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4778 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4779
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4780 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4781 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
4782 const std::string& nm)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4783 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4784 check_autoload_file (nm);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4785
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4786 // 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
4787 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
4788
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4789 symtab.clear_dld_function (fcn);
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 m_autoload_map.erase (fcn);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4794 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4795 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
4796 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4797 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
4798 "whos_line_format");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4799 }
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 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4802 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
4803 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4804 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
4805 "silent_functions");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4806 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4807
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4808 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4809 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
4810 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4811 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
4812 "string_fill_char");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4813 }
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 // 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
4816 // 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
4817 // 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
4818
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4819 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4820 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
4821 const tree_expression *expr)
31809
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 std::string extra_message;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4824
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4825 if (is_variable (expr))
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 std::string var = expr->name ();
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 ie.set_var (var);
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 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
4832
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4833 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
4834
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4835 if (fcn.is_function ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4836 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4837 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
4838
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4839 if (fp && fp->name () == var)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4840 extra_message
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4841 = " (note: variable '" + var + "' shadows function)";
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 }
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 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
4846
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4847 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
4848 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4849
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4850 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4851 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
4852 bool return_list, bool verbose)
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 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
4855 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4856
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4857 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4858 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
4859 const string_vector& arg_nm)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4860 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4861 octave_value_list retval;
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 if (args)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4864 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4865 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
4866 upv (m_lvalue_list, nullptr);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4867
32936
0b5f3219b650 eliminate all uses of base_list<T> template
John W. Eaton <jwe@octave.org>
parents: 32905
diff changeset
4868 int len = args->size ();
31809
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 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
4871 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
4872
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4873 m_num_indices = len;
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 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
4876
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4877 int k = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4878
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4879 for (auto elt : *args)
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 // 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
4882
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4883 if (! elt)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4884 break;
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 m_index_position = k++;
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 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
4889
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4890 if (tmp.is_cs_list ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4891 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4892 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
4893
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4894 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
4895 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
4896 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4897 else if (tmp.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4898 arg_vals.push_back (tmp);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4899 }
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 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
4902 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4903
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4904 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
4905
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4906 if (n > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4907 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
4908
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4909 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4910 }
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 std::list<octave_lvalue>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4913 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
4914 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4915 std::list<octave_lvalue> retval;
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 for (tree_expression *elt : *lhs)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4918 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
4919
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4920 return retval;
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::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
4925 int pos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4926 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4927 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
4928
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4929 if (frame)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4930 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4931 push_echo_state_cleanup (*frame);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4932
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4933 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
4934 }
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4937 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4938 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
4939 int pos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4940 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4941 m_echo_state = echo_this_file (file_name, type);
32307
02faaad763d4 VM Add support for echo
Petter T.
parents: 32306
diff changeset
4942
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4943 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
4944 m_echo_file_pos = pos;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4945 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4948 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
4949 int pos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4950 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4951 m_echo_state = state;
32307
02faaad763d4 VM Add support for echo
Petter T.
parents: 32306
diff changeset
4952
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4953 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
4954 m_echo_file_pos = pos;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4955 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4956
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4957 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4958 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
4959 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4960 octave_function *caller = caller_function ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4961
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4962 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
4963 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4964 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
4965
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4966 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
4967
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4968 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
4969
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4970 // 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
4971 // 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
4972 // 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
4973
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4974 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
4975
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4976 if (pos < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4977 pos = 1;
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 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
4980 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4981 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4984 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
4985 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4986 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
4987 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
4988 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4989
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4990 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4991 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
4992 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4993 // 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
4994 // 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
4995 // 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
4996 // elements to restore echo state.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4997
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4998 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
4999
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5000 if (frame)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5001 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5002 push_echo_state_cleanup (*frame);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5003 return true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5004 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5005
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5006 return false;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5009
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5010 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5011 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
5012 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5013 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
5014
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5015 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
5016
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5017 switch (args.length ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5018 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5019 case 0:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5020 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
5021 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5022 m_echo = ECHO_OFF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5023 m_echo_files.clear ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5024 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5025 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5026 m_echo = ECHO_SCRIPTS;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5027 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5028
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5029 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
5030 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5031 std::string arg0 = argv[0];
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5032
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5033 if (arg0 == "on")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5034 m_echo = ECHO_SCRIPTS;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5035 else if (arg0 == "off")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5036 m_echo = ECHO_OFF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5037 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
5038 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5039 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
5040 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
5041
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5042 if (file.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5043 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
5044
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5045 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
5046 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5047 // 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
5048 // for this one.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5049
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5050 m_echo_files[file] = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5051 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5052 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5053 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5054 // 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
5055
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5056 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
5057
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5058 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
5059 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5060 // 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
5061
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5062 m_echo |= ECHO_FUNCTIONS;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5063 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
5064 }
ea5a632b2553 improve error checking for undefined function outputs (bug #58686, #58695)
John W. Eaton <jwe@octave.org>
parents: 28532
diff changeset
5065 else
ea5a632b2553 improve error checking for undefined function outputs (bug #58686, #58695)
John W. Eaton <jwe@octave.org>
parents: 28532
diff changeset
5066 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5067 // 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
5068 // status for it.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5069
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5070 p->second = ! p->second;
23435
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
5071 }
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
5072 }
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
5073 }
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
5074 }
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5075 break;
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 case 2:
27873
020d0e8f7ac6 reafactor mlock, munlock, and mislocked functions
John W. Eaton <jwe@octave.org>
parents: 27844
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 arg0 = argv[0];
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5080 std::string arg1 = argv[1];
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 (arg1 == "on" || arg1 == "off")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5083 std::swap (arg0, arg1);
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 if (arg0 == "on")
26065
2eb71b83d3e2 partially refactor function lookup in symbol table
John W. Eaton <jwe@octave.org>
parents: 26039
diff changeset
5086 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5087 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
5088 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5089 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
5090 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
5091 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22164
diff changeset
5092 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22164
diff changeset
5093 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5094 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
5095 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
5096
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5097 if (file.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5098 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
5099
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5100 m_echo |= ECHO_FUNCTIONS;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5101 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
5102 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22164
diff changeset
5103 }
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5104 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
5105 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5106 if (arg1 == "all")
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 m_echo = ECHO_OFF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5109 m_echo_files.clear ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5110 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5111 else
28562
b0b80efecea1 error for functions called with too many inputs or outputs
John W. Eaton <jwe@octave.org>
parents: 28561
diff changeset
5112 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5113 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
5114 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
5115
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5116 if (file.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5117 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
5118
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5119 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
5120 }
b0b80efecea1 error for functions called with too many inputs or outputs
John W. Eaton <jwe@octave.org>
parents: 28561
diff changeset
5121 }
b0b80efecea1 error for functions called with too many inputs or outputs
John W. Eaton <jwe@octave.org>
parents: 28561
diff changeset
5122 else
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5123 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
5124 }
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5125 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5126
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5127 default:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5128 print_usage ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5129 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5130 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5131
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5132 if (cleanup_pushed)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5133 maybe_set_echo_state ();
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 return octave_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5136 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5137
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5138 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5139 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
5140 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5141 return (m_debugger_stack.empty ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5142 ? 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
5143 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5144
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5145 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5146 tree_evaluator::dbcont ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5147 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5148 if (! m_debugger_stack.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5149 m_debugger_stack.top()->dbcont ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5150 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5151
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5152 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5153 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
5154 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5155 if (! m_debugger_stack.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5156 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
5157 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5158
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5159 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5160 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
5161 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5162 int nargin = args.length ();
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 if (nargin != 0 && nargin != 3)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5165 print_usage ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5166
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5167 if (nargin == 3)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5168 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5169 octave_idx_type index_position
33446
5fded8395daa rename yTYPE_value functions strict_TYPE_value
John W. Eaton <jwe@octave.org>
parents: 33432
diff changeset
5170 = args(1).strict_idx_type_value ("end: K must be integer value");
31809
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 if (index_position < 1)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5173 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
5174
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5175 octave_idx_type num_indices
33446
5fded8395daa rename yTYPE_value functions strict_TYPE_value
John W. Eaton <jwe@octave.org>
parents: 33432
diff changeset
5176 = args(2).strict_idx_type_value ("end: N must be integer value");
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5177
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5178 if (num_indices < 1)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5179 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
5180
32147
8763a313ab91 new octave_value member function to compute end index for object
Petter T. <petter.vilhelm@gmail.com>
parents: 32146
diff changeset
5181 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
5182 }
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 // 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
5185 // 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
5186 // 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
5187 // 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
5188 // 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
5189
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5190 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
5191 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
5192
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5193 octave_value expr_result;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5194
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5195 if (m_index_list.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5196 expr_result = m_indexed_object;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5197 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5198 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5199 try
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 // 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
5202 // 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
5203 // 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
5204 // 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
5205 // 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
5206 // 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
5207
33034
49128bdb9eb2 use explicit lambda-expression captures (bug #65318)
John W. Eaton <jwe@octave.org>
parents: 33033
diff changeset
5208 unwind_action act ([this] (std::size_t frm)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5209 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5210 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
5211 }, m_call_stack.current_frame ());
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::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
5214 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
5215
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5216 // 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
5217 // 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
5218 // evaluates the argument list.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5219
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5220 // Silently ignore extra output values.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5221
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5222 octave_value_list tmp
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5223 = 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
5224
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5225 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
5226
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5227 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
5228 err_indexed_cs_list ();
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 catch (const index_exception&)
31607
aac27ad79be6 maint: Re-indent code after switch to using namespace macros.
Rik <rik@octave.org>
parents: 31605
diff changeset
5231 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5232 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
5233 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5234 }
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 (expr_result.isobject ())
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 // 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
5239 // 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
5240 // appropriately?
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 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
5243
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5244 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
5245
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5246 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
5247
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5248 if (meth.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5249 return m_interpreter.feval
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5250 (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
5251 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5252
32147
8763a313ab91 new octave_value member function to compute end index for object
Petter T. <petter.vilhelm@gmail.com>
parents: 32146
diff changeset
5253 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
5254 }
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 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5257 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
5258 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5259 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
5260 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5261
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5262 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5263 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
5264 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5265 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
5266 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5267 // 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
5268 return true;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5271 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
5272 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5273 // 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
5274 // Now, which ones?
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 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
5277
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5278 if (m_echo & ECHO_ALL)
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 // 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
5281 // file.
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 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
5284 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5285 else
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 // 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
5288
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5289 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
5290 }
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5293 return false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5294 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5295
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5296 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5297 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
5298 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5299 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
5300
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5301 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
5302
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5303 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
5304 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5305 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
5306
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5307 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
5308
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5309 std::deque<std::string> lines
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5310 = 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
5311
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5312 for (auto& elt : lines)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5313 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
5314 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5315 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5316
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5317 // 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
5318 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5319 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
5320 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5321 octave_quit ();
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 // Maybe handle 'continue N' someday...
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5324
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5325 if (m_continuing)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5326 m_continuing--;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5327
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5328 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
5329
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5330 if (m_breaking)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5331 m_breaking--;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5332
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5333 return quit;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5334 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5335
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5336 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5337 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
5338 const Matrix& ignored_outputs,
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5339 int nargin, int nargout,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5340 bool takes_varargs,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5341 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
5342 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5343 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
5344 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
5345 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
5346 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
5347 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
5348
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5349 if (takes_varargs)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5350 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
5351 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5352
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5353 std::string
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5354 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
5355 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5356 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
5357 return nm;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5358
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5359 std::string full_name = nm;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5360
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5361 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
5362
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5363 bool found = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5364
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5365 if (fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5366 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5367 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
5368
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5369 if (! fname.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5370 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5371 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
5372 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
5373
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5374 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
5375
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5376 if (fs.exists ())
31607
aac27ad79be6 maint: Re-indent code after switch to using namespace macros.
Rik <rik@octave.org>
parents: 31605
diff changeset
5377 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5378 full_name = fname + nm;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5379 found = true;
31607
aac27ad79be6 maint: Re-indent code after switch to using namespace macros.
Rik <rik@octave.org>
parents: 31605
diff changeset
5380 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros.
Rik <rik@octave.org>
parents: 31605
diff changeset
5381 }
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5382 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5383
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5384 if (! found)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5385 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
5386 "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
5387 nm.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5388
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5389 return full_name;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5390 }
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5391
23705
4c597585ff52 move Vmax_recursion_depth and Vsilent_functions to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23702
diff changeset
5392 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
5393 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
5394 @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
5395 @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
5396 @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
5397 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
5398 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
5399
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5400 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
5401 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
5402
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5403 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
5404 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
5405 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
5406
41f80b9af274 prevent stack overflow crash on deeply nested function calls (bug #47620)
John W. Eaton <jwe@octave.org>
parents: 24738
diff changeset
5407 @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
5408 @end deftypefn */)
10578
cb0883127251 limit on recursion via calls to source function
John W. Eaton <jwe@octave.org>
parents: 10315
diff changeset
5409 {
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5410 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
5411
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5412 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
5413 }
cb0883127251 limit on recursion via calls to source function
John W. Eaton <jwe@octave.org>
parents: 10315
diff changeset
5414
12833
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5415 /*
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5416 %!test
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5417 %! 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
5418 %! 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
5419 %! 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
5420 %! 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
5421 %! 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
5422 %! 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
5423
28930
2883b3d08b7e maint: Remove unnecessary parentheses bracketing %!error BIST tests.
Rik <rik@octave.org>
parents: 28857
diff changeset
5424 %!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
5425 */
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5426
26087
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5427 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
5428 doc: /* -*- texinfo -*-
26087
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5429 @deftypefn {} {@var{val} =} whos_line_format ()
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5430 @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
5431 @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
5432 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
5433
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5434 A full format string is:
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5435 @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
5436
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5437 @smallexample
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5438 %[modifier]<command>[:width[:left-min[:balance]]];
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5439 @end smallexample
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5440
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5441 The following command sequences are available:
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5442
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5443 @table @code
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5444 @item %a
29856
56b3e2af0298 Add 's'=sparse attribute for whos function (bug #60687)
Rik <rik@octave.org>
parents: 29848
diff changeset
5445 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
5446 g=global, p=persistent).
26087
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5447
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5448 @item %b
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5449 Prints number of bytes occupied by variables.
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 @item %c
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5452 Prints class names of variables.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5453
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5454 @item %e
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5455 Prints elements held by variables.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5456
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5457 @item %n
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5458 Prints variable names.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5459
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5460 @item %s
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5461 Prints dimensions of variables.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5462
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5463 @item %t
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5464 Prints type names of variables.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5465 @end table
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5466
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5467 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
5468
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5469 @table @code
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5470 @item l
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5471 Left alignment.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5472
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5473 @item r
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5474 Right alignment (default).
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5475
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5476 @item c
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5477 Column-aligned (only applicable to command %s).
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5478 @end table
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5479
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5480 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
5481 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
5482 auto-expand as required.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5483
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5484 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
5485 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
5486 @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
5487 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
5488 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
5489 the left of the specified balance column.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5490
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5491 The default format is:
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5492
29856
56b3e2af0298 Add 's'=sparse attribute for whos function (bug #60687)
Rik <rik@octave.org>
parents: 29848
diff changeset
5493 @example
56b3e2af0298 Add 's'=sparse attribute for whos function (bug #60687)
Rik <rik@octave.org>
parents: 29848
diff changeset
5494 " %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
5495 @end example
26087
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5496
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5497 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
5498 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
5499 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
5500 @seealso{whos}
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5501 @end deftypefn */)
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5502 {
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5503 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
5504
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5505 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
5506 }
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5507
23705
4c597585ff52 move Vmax_recursion_depth and Vsilent_functions to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23702
diff changeset
5508 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
5509 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
5510 @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
5511 @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
5512 @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
5513 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
5514 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
5515
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5516 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
5517 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
5518 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
5519
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5520 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
5521 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
5522 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
5523 @end deftypefn */)
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5524 {
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5525 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
5526
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5527 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
5528 }
12833
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5529
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5530 /*
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5531 %!test
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5532 %! orig_val = silent_functions ();
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5533 %! 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
5534 %! 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
5535 %! 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
5536 %! silent_functions (orig_val);
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5537 %! 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
5538
28930
2883b3d08b7e maint: Remove unnecessary parentheses bracketing %!error BIST tests.
Rik <rik@octave.org>
parents: 28857
diff changeset
5539 %!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
5540 */
23706
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5541
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5542 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
5543 doc: /* -*- texinfo -*-
23706
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5544 @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
5545 @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
5546 @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
5547 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
5548 matrix to the same length.
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5549
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5550 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
5551 single space). For example:
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5552
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5553 @example
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5554 @group
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5555 string_fill_char ("X");
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5556 [ "these"; "are"; "strings" ]
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5557 @result{} "theseXX"
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5558 "areXXXX"
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5559 "strings"
23706
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5560 @end group
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5561 @end example
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5562
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5563 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
5564 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
5565 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
5566 @end deftypefn */)
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5567 {
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5568 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
5569
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5570 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
5571 }
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5572
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5573 /*
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5574 ## 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
5575 ## 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
5576 %!shared orig_val, old_val
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5577 %! orig_val = string_fill_char ();
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5578 %! 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
5579 %!test
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5580 %! assert (orig_val, old_val);
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5581 %! assert (string_fill_char (), "X");
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5582 %! 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
5583 %! string_fill_char (orig_val);
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5584 %! 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
5585
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5586 %!assert ( [ [], {1} ], {1} )
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5587
28930
2883b3d08b7e maint: Remove unnecessary parentheses bracketing %!error BIST tests.
Rik <rik@octave.org>
parents: 28857
diff changeset
5588 %!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
5589 */
23723
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5590
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5591 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
5592 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
5593 @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
5594 @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
5595 @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
5596 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
5597 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
5598
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5599 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
5600 @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
5601
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5602 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
5603 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
5604 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
5605 @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
5606 @end deftypefn */)
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5607 {
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5608 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
5609 }
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5610
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5611 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
5612 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
5613 @deftypefn {} {} echo
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5614 @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
5615 @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
5616 @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
5617 @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
5618 @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
5619 @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
5620 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
5621
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5622 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
5623
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5624 @table @code
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5625 @item on
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5626 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
5627
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5628 @item off
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5629 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
5630
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5631 @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
5632 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
5633 functions.
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5634
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5635 @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
5636 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
5637 functions.
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5638
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5639 @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
5640 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
5641
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5642 @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
5643 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
5644 @end table
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5645
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5646 @noindent
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5647 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
5648
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5649 @seealso{PS4}
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5650 @end deftypefn */)
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5651 {
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5652 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
5653
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5654 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
5655 }
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5656
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5657 /*
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5658 %!error echo ([])
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5659 %!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
5660 %!error echo ("")
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5661 %!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
5662 %!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
5663 %!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
5664 %!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
5665 */
29958
32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29956
diff changeset
5666
32690
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5667 /*
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5668 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
5669 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
5670
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5671 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
5672 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
5673 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
5674
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5675 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
5676 a = 1:4;
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5677 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
5678 % 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
5679 */
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5680 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
5681 doc: /* -*- texinfo -*-
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5682 @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
5683 @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
5684 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
5685
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5686 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
5687 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
5688 (@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
5689 @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
5690
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5691 @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
5692 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
5693
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5694 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
5695 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
5696 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
5697 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
5698 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
5699 @seealso{nargin, narginchk}
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5700 @end deftypefn */)
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5701 {
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5702 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
5703
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5704 if (nargin < 1)
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5705 print_usage ();
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5706
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5707 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
5708 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
5709 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
5710
33446
5fded8395daa rename yTYPE_value functions strict_TYPE_value
John W. Eaton <jwe@octave.org>
parents: 33432
diff changeset
5711 int n = args(0).strict_int_value ("inputname: N must be a scalar index");
32690
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5712
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5713 if (n < 1)
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5714 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
5715
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5716 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
5717
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5718 if (nargin == 2)
33446
5fded8395daa rename yTYPE_value functions strict_TYPE_value
John W. Eaton <jwe@octave.org>
parents: 33432
diff changeset
5719 ids_only = args(1).strict_bool_value ("inputname: IDS_ONLY must be a logical value");
32690
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 // 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
5722 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
5723 }
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5724
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 %!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
5727 %! name = inputname (1);
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5728 %!endfunction
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5729
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5730 %!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
5731 %! 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
5732 %!endfunction
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5733
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5734 %!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
5735 %! name = inputname (2);
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5736 %!endfunction
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5737
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5738 %!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
5739 %! 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
5740 %! 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
5741 %! 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
5742 %! endfor
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5743 %!endfunction
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 %!test
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5746 %! assert (__iname1__ ('xvar'), "");
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5747 %! xvar = 1;
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5748 %! 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
5749
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5750 %!test
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5751 %! 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
5752 %! assert (__iname2__ (xvar), "");
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5753 %! 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
5754
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5755 %!test
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5756 %! 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
5757 %! 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
5758 %! 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
5759 %! 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
5760
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5761 ## 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
5762 %!test
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5763 %! 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
5764 %! x = 1;
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5765 %! 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
5766 %! assert (__iname1__ (Inf), "");
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5767
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5768 %!test
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5769 %! 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
5770 %! x = 1;
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5771 %! 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
5772 %! 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
5773
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5774 %!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
5775 %!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
5776 %!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
5777 */
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5778
31605
e88a07dec498 maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents: 30919
diff changeset
5779 OCTAVE_END_NAMESPACE(octave)