Mercurial > octave

annotate libinterp/parse-tree/pt-eval.cc @ 33435:066a27297ba3 bytecode-interpreter

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge default to bytecode-interpreter
author Arun Giridhar <arungiridhar@gmail.com>
date Fri, 19 Apr 2024 12:57:20 -0400
parents e6806f30226a 83352d86f20d
children 662938d6b684
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
2 //
32632
2e484f9f1f18 maint: update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents: 32589
diff changeset
3 // Copyright (C) 2009-2024 The Octave Project Developers
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
4 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
7 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
9 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
14 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
19 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
23 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
24 ////////////////////////////////////////////////////////////////////////
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25
21724
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents: 21542
diff changeset
26 #if defined (HAVE_CONFIG_H)
21301
40de9f8f23a6 Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents: 21211
diff changeset
27 # include "config.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 #endif
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 #include <cctype>
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31
29619
5cf985f5760a move get_line_and_eval to parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 29572
diff changeset
32 #include <condition_variable>
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33 #include <iostream>
25438
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible
John W. Eaton <jwe@octave.org>
parents: 25407
diff changeset
34 #include <list>
29619
5cf985f5760a move get_line_and_eval to parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 29572
diff changeset
35 #include <mutex>
25438
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible
John W. Eaton <jwe@octave.org>
parents: 25407
diff changeset
36 #include <string>
29619
5cf985f5760a move get_line_and_eval to parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 29572
diff changeset
37 #include <thread>
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38
23723
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
39 #include "cmd-edit.h"
25360
bc5f225bc578 eliminate some global accesses to the breakpoint table
John W. Eaton <jwe@octave.org>
parents: 25337
diff changeset
40 #include "file-ops.h"
27016
9b261300a001 move file-scope static autoload map variable and functions to evaluator
John W. Eaton <jwe@octave.org>
parents: 27015
diff changeset
41 #include "file-stat.h"
28804
3719f5d452d4 refactor implementation of END indexing in interpreter (bug #58953)
John W. Eaton <jwe@octave.org> and Fernando Alvarruiz
parents: 28726
diff changeset
42 #include "lo-array-errwarn.h"
27100
b453b586da16 improve error message when indexing undefined object with "end" (bug #33637)
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
43 #include "lo-ieee.h"
23723
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
44 #include "oct-env.h"
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
45
23137
334119c390b3 move bp_table class to separate file
John W. Eaton <jwe@octave.org>
parents: 23110
diff changeset
46 #include "bp-table.h"
22091
0f6fc2ec3b1a move call_stack class to a separate file
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
47 #include "call-stack.h"
26975
de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451)
John W. Eaton <jwe@octave.org>
parents: 26924
diff changeset
48 #include "cdef-manager.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49 #include "defun.h"
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
50 #include "error.h"
21100
e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents: 20962
diff changeset
51 #include "errwarn.h"
27263
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27261
diff changeset
52 #include "event-manager.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
53 #include "input.h"
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23587
diff changeset
54 #include "interpreter-private.h"
22094
9203833cab7d move new interpreter class to separate file
John W. Eaton <jwe@octave.org>
parents: 22091
diff changeset
55 #include "interpreter.h"
30919
4ed7dfe28584 move eval of anon fcn handles and built-in and mex functions to pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 30896
diff changeset
56 #include "mex-private.h"
27037
8408acb7ca4f make dbup/dbdown work again (bug #56020)
John W. Eaton <jwe@octave.org>
parents: 27019
diff changeset
57 #include "octave.h"
26769
2f847e3e8d6b split classdef into multiple smaller source files
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
58 #include "ov-classdef.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
59 #include "ov-fcn-handle.h"
30919
4ed7dfe28584 move eval of anon fcn handles and built-in and mex functions to pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 30896
diff changeset
60 #include "ov-mex-fcn.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
61 #include "ov-usr-fcn.h"
23435
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
62 #include "ov-re-sparse.h"
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
63 #include "ov-cx-sparse.h"
26686
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26662
diff changeset
64 #include "parse.h"
23435
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
65 #include "profiler.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
66 #include "pt-all.h"
26661
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects
John W. Eaton <jwe@octave.org>
parents: 26512
diff changeset
67 #include "pt-anon-scopes.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
68 #include "pt-eval.h"
23435
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
69 #include "pt-tm-const.h"
28430
5bfa8e018704 store local init vars for anonymous functions in handle, not function object
John W. Eaton <jwe@octave.org>
parents: 28429
diff changeset
70 #include "stack-frame.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
71 #include "symtab.h"
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
72 #include "unwind-prot.h"
23723
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
73 #include "utils.h"
23435
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
74 #include "variables.h"
32593
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
75 #if defined (OCTAVE_ENABLE_BYTECODE_EVALUATOR)
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
76 # include "pt-bytecode-vm.h"
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
77 # include "pt-bytecode-walk.h"
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
78 #endif
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
79
31605
e88a07dec498 maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents: 30919
diff changeset
80 OCTAVE_BEGIN_NAMESPACE(octave)
29960
939bef0b66e0 merge "namespace octave" and OCTAVE_NAMESPACE_BEGIN/END blocks
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
81
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
82 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
83 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
84 {
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
85 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
86 }
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
87
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
88 // Normal evaluator.
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 class debugger
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 public:
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 enum execution_mode
31607
aac27ad79be6 maint: Re-indent code after switch to using namespace macros.
Rik <rik@octave.org>
parents: 31605
diff changeset
95 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
96 EX_NORMAL = 0,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
97 EX_CONTINUE = 1,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
98 EX_QUIT = 2,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
99 EX_QUIT_ALL = 3
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
100 };
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
101
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
102 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
103 : 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
104 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
105 { }
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 int server_loop ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
108
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
109 void 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
110
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
111 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
112
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
113 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
114
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
115 void dbquit (bool all = false)
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
116 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
117 if (all)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
118 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
119 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
120 m_execution_mode = EX_QUIT;
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
121 }
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
122
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
123 bool quitting_debugger () const;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
124
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
125 private:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
126
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
127 interpreter& m_interpreter;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
128
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
129 std::size_t m_level;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
130 execution_mode m_execution_mode;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
131 bool m_in_debug_repl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
132 };
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
133
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
134 // 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
135 // 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
136 // 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
137
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
138 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
139 debugger::server_loop ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
140 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
141 // 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
142
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
143 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
144
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
145 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
146 = &tree_evaluator::server_mode;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
147 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
148
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
149 int exit_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
150
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
151 do
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
152 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
153 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
154 break;
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 if (quitting_debugger ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
157 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
158
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
159 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
160 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
161 // 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
162 // 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
163
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
164 octave_quit ();
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 // 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
167 // the command_editor.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
168
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
169 // 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
170 // 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
171 // 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
172 // 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
173 // 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
174 // 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
175 // 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
176 // 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
177 // is met?
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 // 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
180 // 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
181 // 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
182
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
183 command_editor::run_event_hooks ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
184
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
185 release_unreferenced_dynamic_libraries ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
186
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
187 sleep (0.1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
188 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
189 catch (const interrupt_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
190 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
191 octave_interrupt_state = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
192 m_interpreter.recover_from_exception ();
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 // 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
195 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
196 octave_stdout << "\n";
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 catch (const index_exception& e)
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 m_interpreter.recover_from_exception ();
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 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
203 << 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
204 << std::endl;
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 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
207 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
208 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
209
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
210 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
211 es.display_exception (ee);
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 if (m_interpreter.interactive ())
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 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
218 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
219 // 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
220 exit_status = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
221 break;
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
224 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
225 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
226 if (qde.all ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
227 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
228
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
229 // Continue in this debug level.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
230 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
231 catch (const std::bad_alloc&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
232 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
233 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
234
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
235 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
236 << std::endl;
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 while (exit_status == 0);
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 (exit_status == EOF)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
242 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
243 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
244 octave_stdout << "\n";
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 exit_status = 0;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
249 return exit_status;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
250 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
251
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
252 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
253 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
254 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
255 unwind_protect frame;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
256
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
257 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
258 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
259
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
260 m_in_debug_repl = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
261
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
262 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
263
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
264 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
265
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
266 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
267 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
268
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
269 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
270
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
271 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
272 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
273
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
274 if (caller)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
275 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
276 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
277 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
278 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
279
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
280 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
281
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
282 std::ostringstream buf;
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 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
285
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
286 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
287
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
288 if (! fcn_nm.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
289 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
290 if (input_sys.gud_mode ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
291 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
292 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
293
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
294 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
295 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
296 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
297 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
298 // 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
299 // 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
300 // 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
301
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
302 if (! silent)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
303 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
304 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
305
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
306 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
307 }
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 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
310
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
311 evmgr.set_workspace ();
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 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
314 fcn_nm, curr_debug_line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
315
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
316 if (! silent)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
317 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
318 std::string line_buf;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
319
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
320 if (caller)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
321 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
322
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
323 if (! line_buf.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
324 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
325 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
326 }
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
329 if (silent)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
330 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
331
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
332 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
333
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
334 if (m_interpreter.server_mode ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
335 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
336 if (! stopped_in_msg.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
337 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
338
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
339 evmgr.push_event_queue ();
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 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
342
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
343 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
344
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
345 std::shared_ptr<push_parser>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
346 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
347
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
348 tw.set_parser (debug_parser);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
349
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
350 server_loop ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
351 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
352 else
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 if (! stopped_in_msg.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
355 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
356
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
357 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
358 if (m_level > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
359 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
360
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
361 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
362 m_interpreter.PS1 (tmp_prompt);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
363
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
364 if (! m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
365 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
366 void (interpreter::*interactive_fptr) (bool)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
367 = &interpreter::interactive;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
368 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
369 m_interpreter.interactive ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
370
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
371 m_interpreter.interactive (true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
372
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
373 // 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
374 // interpreter?
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 application *app = application::app ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
377
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
378 if (app)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
379 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
380 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
381 = &application::forced_interactive;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
382 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
383 app->forced_interactive ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
384
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
385 app->forced_interactive (true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
386 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
387 }
27533
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
388
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
389 #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
390
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
391 input_reader reader (m_interpreter);
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 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
394
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
395 #else
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
396
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
397 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
398
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
399 #endif
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
400
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
401 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
402
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
403 while (m_in_debug_repl)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
404 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
405 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
406 break;
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 if (quitting_debugger ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
409 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
410
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
411 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
412 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
413 debug_parser.reset ();
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
414
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
415 #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
416
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
417 int retval = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
418
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
419 std::string prompt
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
420 = 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
421
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
422 do
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
423 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
424 bool eof = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
425 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
426
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
427 if (eof)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
428 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
429 retval = EOF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
430 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
431 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
432
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
433 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
434
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
435 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
436 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
437 while (retval < 0);
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
438
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
439 #else
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
440
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
441 int retval = debug_parser.run ();
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
442
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
443 #endif
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
444 if (command_editor::interrupt (false))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
445 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
446 // 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
447
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
448 quitting_debugger ();
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 break;
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 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
453 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
454 if (retval == 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
455 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
456 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
457 = debug_parser.statement_list ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
458
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
459 if (stmt_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
460 stmt_list->accept (tw);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
461
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
462 if (octave_completion_matches_called)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
463 octave_completion_matches_called = false;
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 // 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
466 // 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
467 // 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
468 // 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
469 // 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
470 // 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
471 // 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
472 // 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
473 // fix this problem?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
474 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
475 }
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 octave_quit ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
478 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
479 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
480 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
481 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
482 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
483 es.display_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
484
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
485 // 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
486 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
487 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
488 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
489 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
490 if (qde.all ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
491 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
492
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
493 // Continue in this debug level.
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 }
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
498
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
499 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
500 debugger::quitting_debugger () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
501 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
502 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
503 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
504 // 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
505 // 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
506
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
507 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
508 || 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
509 throw quit_debug_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
510 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
511 return true;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
514 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
515 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
516 // 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
517 // the same as dbcont.
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 (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
520 throw quit_debug_exception (true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
521 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
522 return true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
523 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
524
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
525 return false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
526 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
527
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
528 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
529 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
530 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
531 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
532 }
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 std::string
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
535 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
536 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
537 std::string fname;
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 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
540
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
541 if (fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
542 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
543 fname = fcn->fcn_file_name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
544
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
545 if (fname.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
546 fname = fcn->name ();
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 if (opt == "fullpathext")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
550 return fname;
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::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
553 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
554
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
555 if (epos <= dpos+1)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
556 epos = std::string::npos;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
557
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
558 if (epos != std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
559 fname = fname.substr (0, epos);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
560
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
561 if (opt == "fullpath")
27015
4d9e1a832a55 move core of mfilename function to evaluator
John W. Eaton <jwe@octave.org>
parents: 27014
diff changeset
562 return fname;
31809
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 (dpos != std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
565 fname = fname.substr (dpos+1);
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 return fname;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
568 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
569
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
570 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
571 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
572 bool& incomplete_parse)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
573 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
574 incomplete_parse = false;
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 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
577
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
578 if (at_top_level ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
579 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
580 dbstep_flag (0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
581 reset_debug_state ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
582 }
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 // 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
585 // that do the actual prompting?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
586
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
587 // 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
588 // 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
589 // 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
590 // 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
591 // 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
592
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
593 Vlast_prompt_time.stamp ();
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 bool eof = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
596
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
597 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
598
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
599 if (command_history::add (input))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
600 evmgr.append_history (input);
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 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
603
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
604 if (m_exit_status == 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
605 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
606 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
607 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
608
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
609 if (stmt_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
610 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
611 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
612
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
613 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
614
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
615 evmgr.set_workspace ();
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 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
618 m_exit_status = EOF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
619 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
620 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
621 incomplete_parse = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
622
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
623 // 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
624 // 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
625 // 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
626
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
627 if (m_exit_status == -1)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
628 m_exit_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
629 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
630 m_parser->reset ();
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 evmgr.pre_input_event ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
633 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
634
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
635 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
636 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
637 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
638 std::mutex mtx;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
639 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
640 std::condition_variable cv;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
641 bool incomplete_parse = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
642 bool evaluation_pending = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
643 bool exiting = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
644
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
645 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
646
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
647 while (true)
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 // 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
650 // 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
651 // execution.
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::string ps
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
654 = 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
655
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
656 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
657
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
658 std::string input;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
659 std::getline (std::cin, input);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
660
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
661 if (input.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
662 continue;
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 incomplete_parse = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
665 evaluation_pending = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
666 exiting = false;
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 evmgr.post_event
33034
49128bdb9eb2 use explicit lambda-expression captures (bug #65318)
John W. Eaton <jwe@octave.org>
parents: 33033
diff changeset
669 ([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
670 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
671 // INTERPRETER THREAD
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::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
674
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
675 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
676 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
677 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
678 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
679 catch (const exit_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
680 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
681 evaluation_pending = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
682 exiting = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
683 cv.notify_all ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
684 throw;
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 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
687 {
33034
49128bdb9eb2 use explicit lambda-expression captures (bug #65318)
John W. Eaton <jwe@octave.org>
parents: 33033
diff changeset
688 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
689
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
690 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
691 es.display_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
692
33034
49128bdb9eb2 use explicit lambda-expression captures (bug #65318)
John W. Eaton <jwe@octave.org>
parents: 33033
diff changeset
693 if (interp.interactive ())
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
694 {
33034
49128bdb9eb2 use explicit lambda-expression captures (bug #65318)
John W. Eaton <jwe@octave.org>
parents: 33033
diff changeset
695 interp.recover_from_exception ();
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
696 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
697 evaluation_pending = false;
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
700 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
701 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
702 evaluation_pending = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
703 cv.notify_all ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
704 throw exit_exception (1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
705 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
706 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
707 catch (...)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
708 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
709 evaluation_pending = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
710 cv.notify_all ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
711 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
712 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
713
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
714 evaluation_pending = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
715 cv.notify_all ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
718 // 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
719 // again.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
720
33034
49128bdb9eb2 use explicit lambda-expression captures (bug #65318)
John W. Eaton <jwe@octave.org>
parents: 33033
diff changeset
721 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
722
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
723 if (exiting)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
724 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
725 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
726 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
727
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
728 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
729 tree_evaluator::repl ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
730 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
731 // 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
732 // 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
733 // 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
734 // 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
735
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
736 int exit_status = 0;
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 // 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
739 // 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
740 // interactive sessions.
29846
78cb255c78a4 move top-level REPL from interpreter to evaluator
John W. Eaton <jwe@octave.org>
parents: 29832
diff changeset
741
78cb255c78a4 move top-level REPL from interpreter to evaluator
John W. Eaton <jwe@octave.org>
parents: 29832
diff changeset
742 #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
743 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
744 #else
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
745 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
746 #endif
78cb255c78a4 move top-level REPL from interpreter to evaluator
John W. Eaton <jwe@octave.org>
parents: 29832
diff changeset
747
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
748 // 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
749 // 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
750 // 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
751 // 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
752
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
753 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
754
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
755 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
756 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
757 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
758 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
759 push_parser *pp
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
760 = new push_parser (m_interpreter,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
761 new input_reader (m_interpreter));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
762
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
763 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
764 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
765 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
766 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
767 parser *pp = new parser (new lexer (m_interpreter));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
768 repl_parser = std::shared_ptr<base_parser> (pp);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
769 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
770 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
771 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
772 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
773 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
774 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
775 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
776
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
777 do
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
778 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
779 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
780 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
781 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
782
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
783 repl_parser->reset ();
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 if (at_top_level ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
786 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
787 dbstep_flag (0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
788 reset_debug_state ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
789 }
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 exit_status = repl_parser->run ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
792
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
793 if (exit_status == 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
794 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
795 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
796 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
797
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
798 if (stmt_list)
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 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
801
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
802 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
803 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
804 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
805 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
806 exit_status = EOF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
807 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
808 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
809 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
810 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
811 catch (const interrupt_exception&)
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 m_interpreter.recover_from_exception ();
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 // 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
816 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
817 octave_stdout << "\n";
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 catch (const index_exception& ie)
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 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
822
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
823 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
824 << 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
825 << std::endl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
826 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
827 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
828 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
829 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
830
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
831 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
832 es.display_exception (ee);
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 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
835 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
836 else
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 // 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
839 exit_status = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
840 break;
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
843 catch (const quit_debug_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
844 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
845 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
846
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
847 // 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
848 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
849 catch (const std::bad_alloc&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
850 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
851 m_interpreter.recover_from_exception ();
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 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
854 << std::endl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
855 }
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 while (exit_status == 0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
858
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
859 if (exit_status == EOF)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
860 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
861 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
862 octave_stdout << "\n";
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 exit_status = 0;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
867 return exit_status;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
868 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
869
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
870 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
871 tree_evaluator::server_loop ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
872 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
873 // 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
874
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
875 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
876
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
877 m_exit_status = 0;
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 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
880 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
881
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
882 // 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
883 // 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
884 // 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
885 // 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
886 // segfaults in the test suite.
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 do
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 try
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 // 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
893 // 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
894
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
895 octave_quit ();
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: 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
898 // 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
899 // 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
900 // 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
901
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
902 command_editor::run_event_hooks ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
903
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
904 release_unreferenced_dynamic_libraries ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
905
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
906 sleep (0.1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
907 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
908 catch (const interrupt_exception&)
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_interrupt_state = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
911 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
912 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
913
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
914 // 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
915 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
916 octave_stdout << "\n";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
917 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
918 catch (const index_exception& e)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
919 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
920 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
921 m_parser->reset ();
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 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
924 << 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
925 << std::endl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
926 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
927 catch (const execution_exception& ee)
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 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
930
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
931 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
932 es.display_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
933
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
934 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
935 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
936 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
937 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
938 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
939 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
940 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
941 // 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
942 m_exit_status = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
943 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
944 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
945 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
946 catch (const quit_debug_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
947 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
948 octave_interrupt_state = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
949 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
950 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
951 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
952 catch (const exit_exception& xe)
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 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
955 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
956 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
957 catch (const std::bad_alloc&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
958 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
959 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
960 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
961
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
962 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
963 << std::endl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
964 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
965 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
966 while (m_exit_status == 0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
967
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
968 if (m_exit_status == EOF)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
969 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
970 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
971 octave_stdout << "\n";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
972
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
973 m_exit_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
974 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
975
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
976 return m_exit_status;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
977 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
978
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
979 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
980 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
981 bool interactive)
31809
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 try
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 stmt_list->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
986
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
987 octave_quit ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
988
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
989 if (! interactive)
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 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
992
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
993 if (m_returning)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
994 m_returning = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
995
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
996 if (m_breaking)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
997 m_breaking--;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
998
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
999 if (quit)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1000 return;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1003 if (octave_completion_matches_called)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1004 octave_completion_matches_called = false;
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 catch (const quit_debug_exception&)
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 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1009 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1010 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1011
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1012 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1013 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
1014 int& parse_status, int nargout)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1015 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1016 octave_value_list retval;
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 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
1019
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1020 do
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1021 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1022 eval_parser.reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1023
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1024 // If we are looking at
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 // val = eval ("code");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1027 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1028 // 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
1029
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1030 if (nargout > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1031 eval_parser.disallow_command_syntax ();
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 parse_status = eval_parser.run ();
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 if (parse_status == 0)
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 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
1038 = eval_parser.statement_list ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1039
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1040 if (stmt_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1041 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1042 tree_statement *stmt = nullptr;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1043
32936
0b5f3219b650 eliminate all uses of base_list<T> template
John W. Eaton <jwe@octave.org>
parents: 32905
diff changeset
1044 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
1045 && (stmt = stmt_list->front ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1046 && stmt->is_expression ())
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 tree_expression *expr = stmt->expression ();
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 (silent)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1051 expr->set_print_flag (false);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1052
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1053 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
1054
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1055 bool do_bind_ans = false;
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 if (expr->is_identifier ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1058 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
1059 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1060 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
1061
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1062 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
1063 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
1064
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1065 if (nargout == 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1066 retval = octave_value_list ();
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 else if (nargout == 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1069 stmt_list->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1070 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1071 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
1072
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1073 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
1074 break;
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1075 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1076 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
1077 break;
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1078 }
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 while (parse_status == 0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1081
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1082 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1083 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1084
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1085 octave_value
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1086 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
1087 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
1088 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1089 octave_value retval;
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 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
1092
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1093 if (! tmp.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1094 retval = tmp(0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1095
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1096 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1097 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1098
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1099 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1100 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
1101 bool silent, int& parse_status,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1102 int nargout)
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 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
1105
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1106 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
1107 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1108
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1109 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1110 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
1111 int nargout)
31809
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 int parse_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1114
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1115 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
1116 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1117
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1118 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1119 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
1120 const std::string& catch_code,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1121 int nargout)
31809
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 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1124
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1125 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
1126
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1127 int parse_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1128
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1129 bool execution_error = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1130
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1131 octave_value_list tmp;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1132
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1133 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1134 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1135 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
1136 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1137 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1138 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1139 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1140 m_interpreter.recover_from_exception ();
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 execution_error = true;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1145 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
1146 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1147 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
1148
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1149 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
1150 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1151 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1152 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1153 if (nargout > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1154 retval = tmp;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1155
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1156 // 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
1157 // 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
1158 // execution exception.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1159 if (execution_error)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1160 throw execution_exception ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1163 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1164 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1165
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1166 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1167 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
1168 const std::string& try_code,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1169 int nargout)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1170 {
33034
49128bdb9eb2 use explicit lambda-expression captures (bug #65318)
John W. Eaton <jwe@octave.org>
parents: 33033
diff changeset
1171 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
1172 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1173 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
1174 }, m_call_stack.current_frame ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1175
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1176 if (context == "caller")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1177 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
1178 else if (context == "base")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1179 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
1180 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1181 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
1182
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1183 int parse_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1184
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1185 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
1186 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1187
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1188 octave_value_list
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1189 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
1190 const std::string& try_code,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1191 const std::string& catch_code,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1192 int nargout)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1193 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1194 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1195
33034
49128bdb9eb2 use explicit lambda-expression captures (bug #65318)
John W. Eaton <jwe@octave.org>
parents: 33033
diff changeset
1196 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
1197 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1198 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
1199 }, m_call_stack.current_frame ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1200
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1201 if (context == "caller")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1202 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
1203 else if (context == "base")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1204 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
1205 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1206 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
1207
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1208 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
1209
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1210 int parse_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1211
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1212 bool execution_error = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1213
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1214 octave_value_list tmp;
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 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1217 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1218 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
1219 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1220 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1221 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1222 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1223 m_interpreter.recover_from_exception ();
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 execution_error = true;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1228 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
1229 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1230 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
1231
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1232 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
1233 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1234 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1235 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1236 if (nargout > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1237 retval = tmp;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1238
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1239 // 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
1240 // 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
1241 // execution exception.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1242 if (execution_error)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1243 throw execution_exception ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1246 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1247 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1248
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1249 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1250 tree_evaluator::visit_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
1251 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
1252 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
1253 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1254
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1255 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1256 tree_evaluator::visit_argument_list (tree_argument_list&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1257 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
1258 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
1259 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1260
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1261 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1262 tree_evaluator::visit_arguments_block (tree_arguments_block&)
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 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
1265 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1266
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1267 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1268 tree_evaluator::visit_args_block_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
1269 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
1270 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
1271 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1272
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1273 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1274 tree_evaluator::visit_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
1275 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
1276 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
1277 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1278
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1279 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1280 tree_evaluator::visit_arg_validation (tree_arg_validation&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1281 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
1282 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
1283 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1284
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1285 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1286 tree_evaluator::visit_arg_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
1287 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
1288 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
1289 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1290
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1291 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1292 tree_evaluator::visit_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
1293 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
1294 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
1295 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1296
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1297 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1298 tree_evaluator::visit_binary_expression (tree_binary_expression&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1299 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
1300 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
1301 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1302
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1303 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1304 tree_evaluator::visit_boolean_expression (tree_boolean_expression&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1305 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
1306 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
1307 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1308
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1309 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1310 tree_evaluator::visit_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
1311 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
1312 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
1313 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1314
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1315 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1316 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
1317 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1318 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1319 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1320 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1321 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1322 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1323 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1324 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
1325 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1326
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1327 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1328 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
1329
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1330 if (m_in_loop_command)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1331 m_breaking = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1332 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1333 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
1334 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1335
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1336 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1337 tree_evaluator::visit_colon_expression (tree_colon_expression&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1338 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
1339 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
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1343 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
1344 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1345 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1346 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1347 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1348 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1349 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1350 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1351 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
1352 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1353
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1354 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1355 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
1356
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1357 if (m_in_loop_command)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1358 m_continuing = 1;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1361 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1362 tree_evaluator::statement_printing_enabled ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1363 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1364 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
1365 || m_statement_context == SC_SCRIPT));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1366 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1369 tree_evaluator::reset_debug_state ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1370 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1371 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
1372 || m_dbstep_flag != 0
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1373 || m_break_on_next_stmt
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1374 || in_debug_repl ());
32593
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
1375
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
1376 #if defined (OCTAVE_ENABLE_BYTECODE_EVALUATOR)
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
1377 update_vm_dbgprofecho_flag ();
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
1378 #endif
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1379 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1380
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1381 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1382 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
1383 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1384 m_debug_mode = mode;
32593
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
1385 #if defined (OCTAVE_ENABLE_BYTECODE_EVALUATOR)
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
1386 update_vm_dbgprofecho_flag ();
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
1387 #endif
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1388 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1389
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1390 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1391 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
1392 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1393 unwind_protect frame;
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 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
1396 command_history::ignoring_entries ());
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 command_history::ignore_entries (false);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1399
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1400 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
1401 m_call_stack.current_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 // 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
1404 // into deeper levels of debugging.
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 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
1407
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1408 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
1409
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1410 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
1411 es.debug_on_warning ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1412
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1413 es.debug_on_error (false);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1414 es.debug_on_warning (false);
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 // 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
1417
33069
764a8eee1383 don't reset debug_frame if in dbstep mode (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33064
diff changeset
1418 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
1419
764a8eee1383 don't reset debug_frame if in dbstep mode (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33064
diff changeset
1420 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
1421 {
764a8eee1383 don't reset debug_frame if in dbstep mode (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33064
diff changeset
1422 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
1423 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
1424 });
33064
6fa52e36a8f2 protect m_debug_frame to improve recursive debugging (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33060
diff changeset
1425
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1426 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
1427
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1428 // 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
1429 // 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
1430 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1431 // 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
1432 // stmt.accept (tpc);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1433
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1434 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
1435
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1436 m_debugger_stack.push (dbgr);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1437
33034
49128bdb9eb2 use explicit lambda-expression captures (bug #65318)
John W. Eaton <jwe@octave.org>
parents: 33033
diff changeset
1438 frame.add ([this] ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1439 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1440 delete m_debugger_stack.top ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1441 m_debugger_stack.pop ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1442 reset_debug_state ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1445 dbgr->repl (prompt);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1446 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1449 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
1450 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1451 enter_debugger (prompt);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1454 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1455 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
1456 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1457 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
1458 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1459
32690
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
1460 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
1461 {
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
1462 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
1463
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
1464 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
1465 }
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
1466
32793
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1467 Matrix
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1468 tree_evaluator::ignored_fcn_outputs () const
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1469 {
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1470 Matrix retval;
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1471
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1472 const std::list<octave_lvalue> *lvalues = m_lvalue_list;
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1473
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1474 if (! lvalues)
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1475 return retval;
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1476
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1477 octave_idx_type nbh = 0;
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1478
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1479 for (const auto& lval : *lvalues)
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1480 nbh += lval.is_black_hole ();
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 (nbh > 0)
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1483 {
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1484 retval.resize (1, nbh);
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1485
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1486 octave_idx_type k = 0;
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1487 octave_idx_type l = 0;
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1488
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1489 for (const auto& lval : *lvalues)
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1490 {
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1491 if (lval.is_black_hole ())
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1492 retval(l++) = k+1;
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 k += lval.numel ();
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1495 }
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
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1498 return retval;
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1499 }
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
1500
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1501 // 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
1502 // corresponding function name ("plus", "minus", ...).
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1503
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1504 static std::string
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1505 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
1506 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1507 // 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
1508
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1509 // 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
1510 // 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
1511 // 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
1512 // string compares.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1513
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1514 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
1515
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1516 if (len == 2)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1517 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1518 if (name[0] == '.')
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1519 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1520 switch (name[1])
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 case '\'':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1523 return "transpose";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1524
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1525 case '*':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1526 return "times";
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 case '/':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1529 return "rdivide";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1530
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1531 case '^':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1532 return "power";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1533
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1534 case '\\':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1535 return "ldivide";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1536
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1537 default:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1538 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1539 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1540 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1541 else if (name[1] == '=')
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1542 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1543 switch (name[0])
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 case '<':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1546 return "le";
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 case '=':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1549 return "eq";
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 case '>':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1552 return "ge";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1553
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1554 case '~':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1555 case '!':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1556 return "ne";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1557
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1558 default:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1559 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1560 }
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1563 else if (len == 1)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1564 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1565 switch (name[0])
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1566 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1567 case '~':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1568 case '!':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1569 return "not";
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 case '\'':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1572 return "ctranspose";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1573
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1574 case '+':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1575 return "plus";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1576
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1577 case '-':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1578 return "minus";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1579
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1580 case '*':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1581 return "mtimes";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1582
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1583 case '/':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1584 return "mrdivide";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1585
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1586 case '^':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1587 return "mpower";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1588
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1589 case '\\':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1590 return "mldivide";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1591
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1592 case '<':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1593 return "lt";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1594
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1595 case '>':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1596 return "gt";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1597
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1598 case '&':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1599 return "and";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1600
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1601 case '|':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1602 return "or";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1603
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1604 default:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1605 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1606 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1607 }
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 return name;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1610 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1611
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1612 // 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
1613 // 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
1614
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1615 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1616 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
1617 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1618 octave_value retval;
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 // 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
1621 // 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
1622 // 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
1623 // 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
1624
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1625 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
1626
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1627 // 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
1628 // 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
1629 // 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
1630 // 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
1631
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1632 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
1633
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1634 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
1635
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1636 if (pos != std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1637 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1638 // 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
1639 // 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
1640 // 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
1641 // 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
1642 // 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
1643 // exactly two elements?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1644 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1645 // object . method
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1646 // object . static-method
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1647 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1648 // 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
1649
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1650 // 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
1651
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1652 // 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
1653 // way to simplify it?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1654
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1655 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
1656
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1657 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
1658 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1659 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
1660
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1661 // 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
1662 // 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
1663
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1664 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
1665
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1666 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
1667 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1668 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
1669
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1670 if (cdef)
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 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
1673
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1674 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
1675
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1676 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
1677
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1678 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
1679
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1680 if (meth.ok ())
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 // 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
1683 // 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
1684 // 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
1685 // 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
1686 // simple function handle.
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.is_static ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1689 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
1690 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1691 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1692 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
1693
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1694 octave_fcn_handle *fh
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1695 = 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
1696 class_nm, meth_nm);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1697
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1698 return octave_value (fh);
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 }
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1703 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1704
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1705 // 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
1706 // 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
1707 // 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
1708
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1709 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
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 // 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
1713 // 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
1714 // 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
1715 // 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
1716 // functions:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1717 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1718 // nested functions (and subfunctions)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1719 // 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
1720 // private function
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1721 // class method
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1722 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1723 // 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
1724 // 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
1725
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1726 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
1727
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1728 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
1729
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1730 if (curr_scope)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1731 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1732 octave_value ov_fcn
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1733 = 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
1734
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1735 // 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
1736 // frame for that function.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1737
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1738 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
1739 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
1740
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1741 if (ov_fcn.is_defined ())
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 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
1744
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1745 if (fcn->is_nested_function ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1746 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1747 if (! name_is_operator)
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 // 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
1750 // function.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1751
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1752 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
1753 = 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
1754
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1755 // 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
1756 // 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
1757 // 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
1758 // 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
1759 // the current stack frame.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1760
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1761 // 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
1762 // 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
1763 // 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
1764 // 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
1765 // 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
1766
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1767 if (curr_fcn
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1768 && (fcn_name == curr_fcn->name ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1769 || 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
1770 frame = frame->access_link ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1771
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1772 octave_fcn_handle *fh
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1773 = 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
1774
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1775 return octave_value (fh);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1776 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1777 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1778 else if (fcn->is_subfunction ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1779 /* || fcn->is_localfunction () */
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1780 || fcn->is_private_function ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1781 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1782 // 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
1783 // or private function).
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 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
1786
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1787 octave_fcn_handle *fh
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1788 = 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
1789
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1790 return octave_value (fh);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1791 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1792 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1793
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1794 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
1795 || curr_fcn->is_class_constructor ()))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1796 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1797 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
1798
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1799 octave_value ov_meth
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1800 = 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
1801
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1802 if (ov_meth.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1803 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1804 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
1805
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1806 // 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
1807 // 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
1808 // that it is a method?
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 (fcn->is_class_method ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1811 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1812 // Create 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
1813 // 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
1814
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1815 octave_fcn_handle *fh
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1816 = 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
1817
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1818 return octave_value (fh);
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1821 }
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1824 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
1825
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1826 // 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
1827 // 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
1828
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1829 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
1830 }
28433
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1831
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1832 /*
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1833 %!test
31464
344e1152ed88 remove operators deprecated in version 7
John W. Eaton <jwe@octave.org>
parents: 30919
diff changeset
1834 %! x = {".'", "transpose";
28433
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1835 %! ".*", "times";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1836 %! "./", "rdivide";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1837 %! ".^", "power";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1838 %! ".\\", "ldivide";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1839 %! "<=", "le";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1840 %! "==", "eq";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1841 %! ">=", "ge";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1842 %! "!=", "ne";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1843 %! "~=", "ne";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1844 %! "~", "not";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1845 %! "!", "not";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1846 %! "\'", "ctranspose";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1847 %! "+", "plus";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1848 %! "-", "minus";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1849 %! "*", "mtimes";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1850 %! "/", "mrdivide";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1851 %! "^", "mpower";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1852 %! "\\", "mldivide";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1853 %! "<", "lt";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1854 %! ">", "gt";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1855 %! "&", "and";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1856 %! "|", "or"};
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1857 %! for i = 1:rows (x)
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1858 %! 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
1859 %! endfor
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1860 */
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1861
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1862 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1863 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
1864 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1865 // 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
1866
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1867 tree_identifier *id = elt->ident ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1868
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1869 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
1870 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1871
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1872 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1873 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
1874 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1875 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
1876 = 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
1877
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1878 return frame->is_variable (name);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1881 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1882 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
1883 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1884 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
1885 = 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
1886
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1887 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
1888 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1889
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1890 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1891 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
1892 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1893 if (expr->is_identifier ())
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 const tree_identifier *id
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1896 = 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
1897
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1898 if (id->is_black_hole ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1899 return false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1900
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1901 return is_variable (id->symbol ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1902 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1903
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1904 return false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1905 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1906
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1907 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1908 tree_evaluator::is_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
1909 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1910 if (expr->is_identifier ())
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 const tree_identifier *id
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1913 = 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
1914
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1915 return is_defined (id->symbol ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1916 }
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 return false;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1921 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1922 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
1923 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1924 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
1925 = 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
1926
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1927 return frame->is_variable (sym);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1930 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1931 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
1932 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1933 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
1934 = 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
1935
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1936 return frame->is_defined (sym);
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1939 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1940 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
1941 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1942 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
1943 = 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
1944
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1945 return frame->is_global (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1946 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1947
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1948 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1949 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
1950 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1951 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
1952 = 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
1953
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1954 return frame->varval (sym);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1957 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1958 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
1959 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1960 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
1961 = 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
1962
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1963 return frame->varval (name);
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1966 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1967 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
1968 const octave_value& value,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
1969 bool global)
31809
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 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
1972 = 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
1973
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1974 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
1975 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1976
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1977 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1978 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
1979 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1980 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
1981 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1982
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1983 octave_value&
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1984 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
1985 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1986 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
1987 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1988
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1989 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1990 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
1991 const octave_value& val)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1992 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1993 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
1994 }
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 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1997 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
1998 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1999 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
2000 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2001
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2002 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2003 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
2004 const octave_value& val)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2005 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2006 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
2007 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2010 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
2011 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2012 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
2013 = 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
2014
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2015 frame->assign (name, val);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2018 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2019 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
2020 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
2021 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2022 // 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
2023 // 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
2024 // calling assign on that?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2025
33034
49128bdb9eb2 use explicit lambda-expression captures (bug #65318)
John W. Eaton <jwe@octave.org>
parents: 33033
diff changeset
2026 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
2027 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2028 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
2029 }, m_call_stack.current_frame ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2030
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2031 if (context == "caller")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2032 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
2033 else if (context == "base")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2034 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
2035 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2036 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
2037
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2038 if (valid_identifier (name))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2039 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2040 // 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
2041 // 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
2042 // already been checked.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2043
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2044 if (iskeyword (name))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2045 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
2046 name.c_str ());
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 assign (name, val);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2049 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2050 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2051 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
2052 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2053
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2054 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2055 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
2056 const std::string& context,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2057 bool verbose, bool require_file)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2058 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2059 // 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
2060 // 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
2061 // 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
2062 // written as
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2063 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2064 // foo1.m:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2065 // ------
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2066 // foo2
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2067 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2068 // foo2.m:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2069 // ------
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2070 // foo1
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2071 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2072 // and called with
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2073 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2074 // foo1
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2075 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2076 // (for example) 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
2077 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2078 // foo1.m:
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 // source ("foo2.m")
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 // foo2.m:
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 // source ("foo1.m")
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 // and called with
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 ("foo1.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 // (for example).
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 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
2093
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2094 std::string file_full_name
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2095 = 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
2096
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2097 std::size_t pos
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2098 = 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
2099
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2100 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
2101
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2102 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
2103
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2104 unwind_protect frame;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2105
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2106 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
2107 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
2108
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2109 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
2110
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2111 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
2112
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2113 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
2114 error ("max_recursion_depth exceeded");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2115
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2116 if (! context.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2117 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2118 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
2119 m_call_stack.current_frame ());
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 (context == "caller")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2122 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
2123 else if (context == "base")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2124 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
2125 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2126 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
2127 }
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 // 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
2130 std::size_t dir_end
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2131 = 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
2132 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
2133
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2134 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
2135 if (extension == std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2136 extension = file_name.length ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2137
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2138 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
2139 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
2140
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2141 // 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
2142 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
2143 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
2144
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2145 // 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
2146 // functions.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2147
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2148 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
2149 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2150 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
2151
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2152 if (! code
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2153 || (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
2154 != full_name))
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 // 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
2157 ov_code = octave_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2158 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2159 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2160 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2161 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2162 // 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
2163 ov_code = octave_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2164 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2165
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2166 // 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
2167 // file, load.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2168
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2169 if (ov_code.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2170 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2171 try
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 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
2174 file_name, dir_name, "", "",
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2175 require_file, true, false, false);
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 catch (execution_exception& ee)
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 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
2180 file_full_name.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2181 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2182 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2183
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2184 // 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
2185
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2186 if (ov_code.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2187 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2188
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2189 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
2190 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
2191
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2192 if (verbose)
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 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
2195 octave_stdout.flush ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2198 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
2199
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2200 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
2201
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2202 if (verbose)
32687
c34d571b5855 Fix extra newline displayed with --init-trace startup option (bug #65107)
Rik <rik@octave.org>
parents: 32633
diff changeset
2203 {
c34d571b5855 Fix extra newline displayed with --init-trace startup option (bug #65107)
Rik <rik@octave.org>
parents: 32633
diff changeset
2204 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
2205 octave_stdout.flush ();
c34d571b5855 Fix extra newline displayed with --init-trace startup option (bug #65107)
Rik <rik@octave.org>
parents: 32633
diff changeset
2206 }
31809
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2209 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2210 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
2211 const octave_value& val)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2212 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2213 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
2214 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2215
32151
72dcb1cef2c9 maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents: 32148
diff changeset
2216 void
32125
fc5a9a9e5cea new set_nargin and set_nargout functions for evaluator
Petter T. <petter.vilhelm@gmail.com>
parents: 32095
diff changeset
2217 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
2218 {
fc5a9a9e5cea new set_nargin and set_nargout functions for evaluator
Petter T. <petter.vilhelm@gmail.com>
parents: 32095
diff changeset
2219 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
2220 }
fc5a9a9e5cea new set_nargin and set_nargout functions for evaluator
Petter T. <petter.vilhelm@gmail.com>
parents: 32095
diff changeset
2221
32151
72dcb1cef2c9 maint: Strip trailing whitespace from source files.
John W. Eaton <jwe@octave.org>
parents: 32148
diff changeset
2222 void
32125
fc5a9a9e5cea new set_nargin and set_nargout functions for evaluator
Petter T. <petter.vilhelm@gmail.com>
parents: 32095
diff changeset
2223 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
2224 {
fc5a9a9e5cea new set_nargin and set_nargout functions for evaluator
Petter T. <petter.vilhelm@gmail.com>
parents: 32095
diff changeset
2225 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
2226 }
fc5a9a9e5cea new set_nargin and set_nargout functions for evaluator
Petter T. <petter.vilhelm@gmail.com>
parents: 32095
diff changeset
2227
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2228 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2229 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
2230 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2231 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
2232 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2233
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2234 void
32593
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2235 tree_evaluator::set_active_bytecode_ip (int ip)
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2236 {
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2237 m_call_stack.set_active_bytecode_ip (ip);
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2238 }
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2239
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2240 void
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2241 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
2242 (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
2243 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2244 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
2245 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2246
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2247 int i = -1;
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 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
2250 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2251 i++;
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 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
2254
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2255 if (i < args.length ())
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 (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
2258 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2259 if (! eval_decl_elt (elt))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2260 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
2261 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2262 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2263 ref.define (args(i));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2264 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2265 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2266 eval_decl_elt (elt);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2267 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2268 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2271 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
2272 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2273 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
2274 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2275 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
2276
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2277 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
2278 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2279 }
25382
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2280
29968
7aa4d8c049e5 eliminate obsolete DEFCONSTFUN and DEFCONSTMETHOD macros
John W. Eaton <jwe@octave.org>
parents: 29961
diff changeset
2281 DEFMETHOD (end, interp, args, ,
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2282 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
2283 @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
2284 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
2285 @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
2286 @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
2287
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2288 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
2289 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
2290
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2291 Example:
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 @group
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2295 @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
2296 @var{x}(1,end)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2297 @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
2298 @var{x}(end,1)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2299 @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
2300 @var{x}(end,end)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2301 @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
2302 @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
2303 @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
2304
cf43680cd221 doc: Add notes to 'end' docstring about class and subsref limation (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32891
diff changeset
2305 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
2306 @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
2307 @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
2308 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
2309 @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
2310
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 @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
2312 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
2313 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
2314 @example
98b34c7f7d73 Correct whitespace for end docstring, remove doc location comment (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32904
diff changeset
2315 @group
98b34c7f7d73 Correct whitespace for end docstring, remove doc location comment (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32904
diff changeset
2316 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
2317  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
2318    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
2319  else
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 = 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
2321  endif
98b34c7f7d73 Correct whitespace for end docstring, remove doc location comment (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32904
diff changeset
2322 endfunction
98b34c7f7d73 Correct whitespace for end docstring, remove doc location comment (bug #59737)
Nicholas R. Jankowski <jankowski.nicholas@gmail.com>
parents: 32904
diff changeset
2323 @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
2324 @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
2325 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
2326 @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
2327 @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
2328
25382
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2329 @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
2330 @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
2331 {
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2332 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
2333
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2334 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
2335 }
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2336
27100
b453b586da16 improve error message when indexing undefined object with "end" (bug #33637)
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
2337 /*
28617
0bac488f17fa throw error if 'end' is applied to undefined symbol (bug #58830)
John W. Eaton <jwe@octave.org>
parents: 28560
diff changeset
2338 %!test <*58830>
0bac488f17fa throw error if 'end' is applied to undefined symbol (bug #58830)
John W. Eaton <jwe@octave.org>
parents: 28560
diff changeset
2339 %! 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
2340 %! "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
2341
30322
552239d43c18 update bug status
John W. Eaton <jwe@octave.org>
parents: 29847
diff changeset
2342 %!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
2343 %! 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
2344 %! 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
2345 %! 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
2346 %! 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
2347 */
b453b586da16 improve error message when indexing undefined object with "end" (bug #33637)
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
2348
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2349 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2350 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
2351 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2352 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
2353
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2354 for (auto elt : *args)
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 // 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
2357
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2358 if (! elt)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2359 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2360
32410
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
2361 // 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
2362 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
2363
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2364 if (tmp.is_cs_list ())
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 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
2367
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2368 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
2369 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
2370 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2371 else if (tmp.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2372 arg_vals.push_back (tmp);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2373 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2374
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2375 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
2376 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2377
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2378 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2379 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
2380 (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
2381 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2382 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
2383 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
2384
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2385 // 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
2386 if (len == 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2387 return varargout;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2388 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2389 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2390 int i = 0;
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 if (nargout <= len)
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 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
2395 octave_value_list retval (nout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2396
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2397 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
2398 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2399 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
2400 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2401
32780
e96e2f9f9f37 avoid error with ignored values returned from function calls (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32632
diff changeset
2402 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
2403 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
2404
e96e2f9f9f37 avoid error with ignored values returned from function calls (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32632
diff changeset
2405 i++;
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2406
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2407 if (i == nout)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2408 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2409 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2410
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2411 return retval;
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 else
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 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
2416
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2417 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
2418 {
32780
e96e2f9f9f37 avoid error with ignored values returned from function calls (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32632
diff changeset
2419 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
2420 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
2421
e96e2f9f9f37 avoid error with ignored values returned from function calls (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32632
diff changeset
2422 i++;
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2423 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2424
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2425 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
2426 retval(i++) = varargout(j);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2427
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2428 return retval;
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 }
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 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2434 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
2435 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2436 bool retval = false;
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 tree_identifier *id = elt->ident ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2439 tree_expression *expr = elt->expression ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2440
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2441 if (id && expr)
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 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
2444
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2445 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
2446
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2447 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
2448
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2449 retval = true;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2452 return retval;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2455 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2456 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
2457 const octave_value& val)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2458 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2459 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
2460
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2461 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
2462
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2463 if (label_value.is_defined ())
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.iscell ())
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 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
2468
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2469 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
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 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
2472 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2473 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
2474
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2475 if (match)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2476 return true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2477 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2478 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2479 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2480 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2481 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
2482 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2483
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2484 return false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2485 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2486
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2487 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2488 tree_evaluator::push_stack_frame (const symbol_scope& scope)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2489 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2490 m_call_stack.push (scope);
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2493 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2494 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
2495 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
2496 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2497 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
2498 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2499
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2500 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2501 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
2502 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
2503 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
2504 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2505 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
2506 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2507
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2508 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2509 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
2510 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2511 m_call_stack.push (script);
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2514 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2515 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
2516 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2517 m_call_stack.push (fcn);
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
32593
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2520 #if defined (OCTAVE_ENABLE_BYTECODE_EVALUATOR)
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2521
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2522 void tree_evaluator::push_stack_frame (vm &vm, octave_user_function *fcn, int nargout, int nargin)
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2523 {
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2524 m_call_stack.push (vm, fcn, nargout, nargin);
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2525 }
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2526
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2527 void tree_evaluator::push_stack_frame (vm &vm, octave_user_script *fcn, int nargout, int nargin)
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2528 {
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2529 m_call_stack.push (vm, fcn, nargout, nargin);
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2530 }
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2531
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2532 void tree_evaluator::push_stack_frame (vm &vm, octave_user_code *fcn, int nargout, int nargin)
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2533 {
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2534 if (fcn->is_user_function ())
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2535 m_call_stack.push (vm, static_cast<octave_user_function*> (fcn), nargout, nargin);
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2536 else
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2537 m_call_stack.push (vm, static_cast<octave_user_script*> (fcn), nargout, nargin);
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2538 }
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2539
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2540 void tree_evaluator::push_stack_frame (vm &vm, octave_user_code *fcn, int nargout, int nargin,
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2541 const std::shared_ptr<stack_frame>& closure_frames)
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2542 {
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2543
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2544 CHECK_PANIC (fcn->is_user_function ());
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2545 m_call_stack.push (vm, static_cast<octave_user_function*> (fcn), nargout, nargin, closure_frames);
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2546 }
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2547
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2548 #endif
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
2549
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2550 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2551 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
2552 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2553 m_call_stack.pop ();
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
32146
18c6b6997055 new function to pop and return top of call stack
Petter T. <petter.vilhelm@gmail.com>
parents: 32131
diff changeset
2556 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
2557 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
2558 {
18c6b6997055 new function to pop and return top of call stack
Petter T. <petter.vilhelm@gmail.com>
parents: 32131
diff changeset
2559 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
2560 }
18c6b6997055 new function to pop and return top of call stack
Petter T. <petter.vilhelm@gmail.com>
parents: 32131
diff changeset
2561
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2562 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2563 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
2564 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2565 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
2566 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2567
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2568 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2569 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
2570 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2571 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
2572 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2573
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2574 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2575 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
2576 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2577 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
2578 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2579
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2580 int
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2581 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
2582 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2583 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
2584 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2585
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2586 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2587 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
2588 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2589 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
2590
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2591 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
2592 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2593
33060
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2594 void
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2595 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
2596 {
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2597 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
2598
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2599 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
2600 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
2601
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2602 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
2603 }
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2604
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2605 void
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2606 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
2607 {
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2608 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
2609
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2610 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
2611 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
2612
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2613 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
2614 }
50e19b01e111 make dblist and dbtype follow debugger stack frame pointer (bug #65330)
John W. Eaton <jwe@octave.org>
parents: 33034
diff changeset
2615
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2616 octave_user_code *
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2617 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
2618 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2619 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
2620 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2621
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2622 unwind_protect *
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2623 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
2624 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2625 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
2626 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2627
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2628 octave_user_code *
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2629 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
2630 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2631 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
2632 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2633
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2634 octave_function *
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2635 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
2636 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2637 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
2638 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2639
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2640 octave_function *
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2641 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
2642 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2643 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
2644 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2645
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2646 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2647 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
2648 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2649 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
2650 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2651
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2652 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2653 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
2654 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2655 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
2656 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2657
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2658 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2659 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
2660 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2661 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
2662 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2663
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2664 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2665 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
2666 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2667 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
2668 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2669
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2670 std::string
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2671 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
2672 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2673 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
2674 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2675
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2676 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2677 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
2678 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2679 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
2680 }
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 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2683 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
2684 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2685 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
2686 }
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 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2689 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
2690 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2691 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
2692 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2693
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2694 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
2695 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
2696 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2697 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
2698 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2699
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2700 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
2701 tree_evaluator::backtrace_frames () const
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 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
2704 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2705
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2706 std::list<frame_info>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2707 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
2708 bool print_subfn) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2709 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2710 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
2711 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2712
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2713 std::list<frame_info>
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2714 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
2715 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2716 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
2717 }
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 octave_map
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2720 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
2721 bool print_subfn) const
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 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
2724 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2725
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2726 octave_map
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2727 tree_evaluator::backtrace () const
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2728 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2729 return m_call_stack.backtrace ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2730 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2731
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2732 octave_map
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2733 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
2734 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2735 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
2736 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2737
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2738 std::string
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2739 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
2740 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2741 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
2742
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2743 std::ostringstream buf;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2744
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2745 for (const auto& frm : frames)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2746 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2747 buf << " " << frm.fcn_name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2748
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2749 int line = frm.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2750
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2751 if (line > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2752 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2753 buf << " at line " << line;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2754
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2755 int column = frm.column ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2756
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2757 if (column > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2758 buf << " column " << column;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2759
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2760 buf << "\n";
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 }
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 return buf.str ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2765 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2766
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2767 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2768 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
2769 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2770 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
2771
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2772 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
2773 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2774
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2775 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2776 tree_evaluator::pop_scope ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2777 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2778 m_call_stack.pop ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2779 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2780
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2781 symbol_scope
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2782 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
2783 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2784 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
2785 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2786
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2787 symbol_scope
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2788 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
2789 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2790 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
2791 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2792
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2793 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2794 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
2795 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2796 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
2797
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2798 if (! fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2799 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
2800
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2801 if (fcn->is_builtin_function ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2802 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2803 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
2804 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2805 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2806
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2807 fcn->lock ();
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2810 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2811 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
2812 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2813 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
2814
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2815 if (! fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2816 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
2817
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2818 if (fcn->is_builtin_function ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2819 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2820 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
2821 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2822 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2823
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2824 fcn->unlock ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2825 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2826
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2827 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2828 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
2829 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2830 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
2831
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2832 if (! fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2833 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
2834
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2835 return fcn->islocked ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2838 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2839 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
2840 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2841 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
2842 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2843
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2844 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2845 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
2846 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2847 m_call_stack.display ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2848 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2849
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2850 octave_value
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2851 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
2852 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2853 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
2854 = 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
2855
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2856 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
2857
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2858 if (val.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2859 return val;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2860
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2861 // 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
2862 // 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
2863 // from a .m file.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2864
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2865 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
2866
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2867 if (fcn.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2868 return fcn;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2869
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2870 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
2871
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2872 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
2873 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2874
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2875 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2876 tree_evaluator::clear_objects ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2877 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2878 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
2879 = 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
2880
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2881 frame->clear_objects ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2882 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2883
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2884 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2885 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
2886 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2887 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
2888 = 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
2889
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2890 frame->clear_variable (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2891 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2892
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2893 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2894 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
2895 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2896 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
2897 = 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
2898
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2899 frame->clear_variable_pattern (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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2902 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2903 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
2904 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2905 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
2906 = 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
2907
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2908 frame->clear_variable_regexp (pattern);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2909 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2910
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2911 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2912 tree_evaluator::clear_variables ()
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2913 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2914 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
2915 = 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
2916
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2917 frame->clear_variables ();
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2920 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2921 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
2922 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2923 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
2924 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2927 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
2928 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2929 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
2930 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2931
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2932 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2933 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
2934 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2935 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
2936 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2937
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2938 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2939 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
2940 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2941 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
2942 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2943
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2944 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2945 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
2946 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2947 // 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
2948
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2949 clear_variables ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2950 clear_global_variables ();
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 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
2953
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2954 symtab.clear_functions (force);
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2957 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2958 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
2959 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2960 // 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
2961
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2962 clear_variable (name);
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 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
2965
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2966 symtab.clear_function (name);
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2969 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2970 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
2971 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2972 // 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
2973
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2974 clear_variable_pattern (pattern);
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 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
2977
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2978 symtab.clear_function_pattern (pattern);
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2981 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2982 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
2983 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2984 // 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
2985
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2986 clear_variable_regexp (pattern);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2987
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2988 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
2989
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2990 symtab.clear_function_regexp (pattern);
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2993 std::list<std::string>
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2994 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
2995 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2996 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
2997 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2998
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
2999 std::list<std::string>
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
3000 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
3001 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3002 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
3003 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3004
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
3005 std::list<std::string>
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
3006 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
3007 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3008 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
3009 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3010
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3011 // 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
3012 // 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
3013 // current call stack.
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_user_code *
32434
9296e2b74d0b Overhaul handling of breakpoints in classdef methods (bug #46451).
Markus Mützel <markus.muetzel@gmx.de>
parents: 32427
diff changeset
3016 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
3017 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3018 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
3019
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3020 if (fname.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3021 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
3022 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3023 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3024 std::string name = fname;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3025
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3026 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
3027 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3028 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
3029 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
3030 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
3031 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3032
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3033 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
3034
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3035 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
3036 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
3037
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3038 if (name.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3039 return nullptr;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3040
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3041 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
3042
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3043 octave_value fcn;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3044 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
3045
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3046 if (name[0] == '@')
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3047 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3048 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
3049
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3050 if (p1 == std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3051 return nullptr;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3052
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3053 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
3054
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3055 p2 = name.find ('>', p1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3056
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3057 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
3058
32434
9296e2b74d0b Overhaul handling of breakpoints in classdef methods (bug #46451).
Markus Mützel <markus.muetzel@gmx.de>
parents: 32427
diff changeset
3059 // 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
3060 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
3061
32434
9296e2b74d0b Overhaul handling of breakpoints in classdef methods (bug #46451).
Markus Mützel <markus.muetzel@gmx.de>
parents: 32427
diff changeset
3062 // 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
3063
9296e2b74d0b Overhaul handling of breakpoints in classdef methods (bug #46451).
Markus Mützel <markus.muetzel@gmx.de>
parents: 32427
diff changeset
3064 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
3065 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
3066 {
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 cdef_method meth = cls.find_method (method);
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
3068 if (meth.ok () && meth.get_name () == method)
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
3069 fcn = meth.get_function ();
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
3070 else
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
3071 return nullptr;
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
3072 }
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3073
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3074 // If 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
3075 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
3076 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
3077 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3078 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3079 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3080 p2 = name.find ('>');
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3081
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3082 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
3083
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3084 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
3085 }
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 // 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
3088 std::string subfuns;
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 if (p2 != std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3091 subfuns = name.substr (p2+1);
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 (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
3094 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
3095
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3096 if (! user_code || subfuns.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3097 return user_code;
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 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
3100
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3101 if (fcn.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3102 return nullptr;
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 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
3105 }
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 return user_code;
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 std::string
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3111 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
3112 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3113 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
3114
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3115 if (curfcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3116 return curfcn->name ();
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 return "";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3119 }
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 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3122 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
3123 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3124 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
3125 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3128 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
3129 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3130 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3131 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3132 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3133 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3134 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3135 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3136 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
3137 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3138
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3139 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3140 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
3141
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3142 // 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
3143 // really have an accept method?
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 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
3146
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3147 if (init_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3148 init_list->accept (*this);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3151 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3152 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
3153 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3154 tree_identifier *id = elt.ident ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3155
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3156 if (id)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3157 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3158 if (elt.is_global ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3159 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
3160 else if (elt.is_persistent ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3161 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
3162 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3163 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
3164
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3165 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
3166
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3167 if (ult.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3168 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3169 tree_expression *expr = elt.expression ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3170
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3171 octave_value init_val;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3172
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3173 if (expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3174 init_val = expr->evaluate (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3175 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3176 init_val = Matrix ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3177
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3178 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
3179 }
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 }
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 template <typename T>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3184 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3185 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
3186 octave_lvalue& ult,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3187 tree_statement_list *loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3188 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3189 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
3190
32095
28ef2991fb5a Emit warning about infinite loop if for loop range starts with infinite value.
Rik <rik@octave.org>
parents: 31827
diff changeset
3191 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
3192 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
3193 "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
3194 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
3195
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3196 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
3197 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3198 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3199 m_echo_file_pos = line;
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 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
3202
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3203 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
3204
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3205 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3206 loop_body->accept (*this);
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 (quit_loop_now ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3209 break;
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3212
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3213 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3214 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
3215 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3216 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3217 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3218 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3219
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3220 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3221 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3222 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3223 line++;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3226 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3227 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
3228
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3229 // 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
3230 // and cmd.maxproc_expr ();
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 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
3233
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3234 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
3235
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3236 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
3237
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3238 if (rhs.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3239 return;
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 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
3242
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3243 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
3244
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3245 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
3246
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3247 if (rhs.is_range ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3248 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3249 // 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
3250
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3251 if (rhs.is_double_type ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3252 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3253 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
3254 return;
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
31827
c8dd3da44e83 maint: Remove `#if 0` commented-out code from the codebase.
Arun Giridhar <arungiridhar@gmail.com>
parents: 31809
diff changeset
3257 // 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
3258 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3259
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3260 if (rhs.is_scalar_type ())
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 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3263 m_echo_file_pos = line;
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 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
3266
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3267 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3268 loop_body->accept (*this);
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 // 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
3271 quit_loop_now ();
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 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3274 }
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 // 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
3277 // 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
3278
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3279 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
3280 || rhs.is_string () || rhs.isstruct ())
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 // 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
3283 // columns.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3284
32598
2f3b54f81947 avoid dim_vector copies in more places where possible (bug #64962)
John W. Eaton <jwe@octave.org>
parents: 32589
diff changeset
3285 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
3286
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3287 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
3288 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
3289
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3290 octave_value arg = rhs;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3291 if (rhs.ndims () > 2)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3292 arg = arg.reshape (dv);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3293
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
3294 if (steps > 0)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3295 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3296 octave_value_list idx;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3297 octave_idx_type iidx;
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 // 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
3300 if (nrows == 1)
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 idx.resize (1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3303 iidx = 0;
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 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3306 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3307 idx.resize (2);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3308 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
3309 iidx = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3310 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3311
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3312 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
3313 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3314 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3315 m_echo_file_pos = line;
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 // 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
3318 idx(iidx) = i;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3319 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
3320
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3321 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
3322
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3323 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3324 loop_body->accept (*this);
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 (quit_loop_now ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3327 break;
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3330 else
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 // 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
3333 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
3334 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3335
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3336 return;
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 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
3340 cmd.line (), cmd.column ());
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3343 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3344 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
3345 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3346 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3347 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3348 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3349
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3350 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3351 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3352 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3353 line++;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3356 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3357 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
3358
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3359 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
3360
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3361 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
3362
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3363 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
3364
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3365 if (rhs.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3366 return;
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.isstruct ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3369 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
3370
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3371 // 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
3372 // 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
3373 // structure element.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3374
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3375 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
3376
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3377 auto p = lhs->begin ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3378
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3379 tree_expression *elt = *p++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3380
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3381 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
3382
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3383 elt = *p;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3384
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3385 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
3386
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3387 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
3388
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3389 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
3390
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3391 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
3392
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3393 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
3394
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3395 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
3396 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3397 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3398 m_echo_file_pos = line;
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 std::string key = keys[i];
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3401
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3402 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
3403
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3404 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
3405
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3406 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
3407
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3408 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
3409 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
3410
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3411 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3412 loop_body->accept (*this);
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 (quit_loop_now ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3415 break;
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3418
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
3419 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
3420 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
3421 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3422 // 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
3423
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3424 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
3425
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3426 if (body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3427 body->accept (*this);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3430 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3431 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
3432 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3433 // 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
3434 // 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
3435
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3436 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
3437 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
3438
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3439 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
3440 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
3441 = 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
3442
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3443 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
3444
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3445 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
3446
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3447 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
3448
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3449 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
3450 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
3451
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3452 tree_expression *expr = afh.expression ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3453 if (expr)
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_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
3456 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
3457 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
3458 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3459
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3460 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
3461
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3462 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
3463
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3464 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
3465
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3466 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
3467 = 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
3468
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3469 for (auto& name : free_vars)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3470 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3471 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
3472
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3473 if (val.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3474 local_vars[name] = val;
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
33309
d422992b5483 refactor position tracking in the parser
John W. Eaton <jwe@octave.org>
parents: 33296
diff changeset
3477 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
3478
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3479 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
3480
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3481 bool is_nested = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3482
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3483 if (curr_fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3484 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3485 // 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
3486 // 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
3487
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3488 // 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
3489 // 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
3490 // function.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3491
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3492 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
3493 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3494 is_nested = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3495 af->mark_as_nested_function ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3496 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
3497 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3498
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3499 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
3500
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3501 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
3502 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
3503
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3504 // 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
3505 // 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
3506
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3507 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
3508 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
3509
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3510 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
3511 }
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->mark_as_anonymous_function ();
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 octave_value ov_fcn (af);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3516
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3517 return (is_nested
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3518 ? 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
3519 : 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
3520 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3521
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3522 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3523 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
3524 int nargout,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3525 const octave_value_list& args)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3526 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3527 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3528
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3529 if (args.has_magic_colon ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3530 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
3531
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3532 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
3533
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3534 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
3535
32410
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3536 // 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
3537 // 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
3538 if (nargout < 0)
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3539 nargout = 1;
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3540
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3541 if (fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3542 retval = (*fcn) (args, nargout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3543 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3544 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3545 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
3546
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3547 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
3548 }
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 // 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
3551 // 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
3552
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3553 retval.make_storable_values ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3554
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3555 // 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
3556 // 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
3557 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3558 // octave_value retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3559 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3560 // instead of
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3561 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3562 // octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3563 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3564 // 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
3565
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3566 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
3567 retval.clear ();
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 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3570 }
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 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3573 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
3574 int nargout,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3575 const octave_value_list& args)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3576 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3577 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3578
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3579 if (args.has_magic_colon ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3580 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
3581
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3582 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
3583
32410
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3584 // 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
3585 // 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
3586 if (nargout < 0)
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3587 nargout = 1;
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3588
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3589 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
3590
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3591 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3592 }
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 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3595 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
3596 int nargout,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3597 const octave_value_list& args)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3598 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3599 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3600
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3601 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
3602
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3603 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
3604 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
3605
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3606 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
3607
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3608 if (! cmd_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3609 return retval;
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 // 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
3612 // 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
3613
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3614 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
3615 error ("max_recursion_depth exceeded");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3616
32309
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3617 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
3618
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3619 profiler::enter<octave_user_script> block (m_profiler, user_script);
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3620
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3621 if (echo ())
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3622 push_echo_state (tree_evaluator::ECHO_SCRIPTS, file_name);
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 // FIXME: Should we be using tree_evaluator::eval here?
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3625
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3626 cmd_list->accept (*this);
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3627
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3628 if (m_returning)
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3629 m_returning = 0;
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_breaking)
822314643f50 VM Add support for nested functions
Petter T.
parents: 32308
diff changeset
3632 m_breaking--;
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 return retval;
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3635 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3636
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3637 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3638 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
3639 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3640 // ??
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3641 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
3642 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3643
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3644 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3645 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
3646 int nargout,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3647 const octave_value_list& xargs)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3648 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3649 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3650
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3651 // 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
3652 // 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
3653
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3654 octave_value_list args (xargs);
32148
dea87a95ad18 experimental stack-based virtual machine
Petter T. <petter.vilhelm@gmail.com>
parents: 32147
diff changeset
3655
32793
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
3656 // 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
3657 Matrix ignored_outputs = ignored_fcn_outputs ();
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
3658
32794
512e07384ae9 atttempt to make isargout work properly in more cases (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32793
diff changeset
3659 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
3660
512e07384ae9 atttempt to make isargout work properly in more cases (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32793
diff changeset
3661 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
3662 {
512e07384ae9 atttempt to make isargout work properly in more cases (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32793
diff changeset
3663 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
3664 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
3665 }
512e07384ae9 atttempt to make isargout work properly in more cases (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32793
diff changeset
3666
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3667 octave_value_list ret_args;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3668
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3669 int nargin = args.length ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3670
32410
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3671 // 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
3672 // 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
3673 if (nargout < 0)
554a932fc6d0 Fix nargout when calling class subsref method (bug #63841)
Fernando Alvarruiz <feralber@upvnet.upv.es>
parents: 32309
diff changeset
3674 nargout = 1;
32427
8a8f16e7c462 maint: strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 32410
diff changeset
3675
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3676 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
3677 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3678 if (nargin > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3679 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3680 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
3681 --nargin;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3682 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
3683 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3684 else
33382
79cfa1b7a813 replace nearly all remaining uses of panic_impossible with error
John W. Eaton <jwe@octave.org>
parents: 33365
diff changeset
3685 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
3686 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3687
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3688 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
3689
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3690 bool takes_varargs = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3691 int max_inputs = 0;
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 if (param_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3694 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3695 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
3696 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
3697 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3698
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3699 if (! takes_varargs && nargin > max_inputs)
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 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
3702
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3703 if (name.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3704 name = "@<anonymous>";
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 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
3707 "%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
3708 name.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3709 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3710
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3711 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
3712
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3713 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
3714
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3715 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
3716 {
32936
0b5f3219b650 eliminate all uses of base_list<T> template
John W. Eaton <jwe@octave.org>
parents: 32905
diff changeset
3717 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
3718
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3719 if (nargout > max_outputs)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3720 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3721 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
3722
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3723 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
3724 "%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
3725 name.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3726 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3727 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3728
32793
8fb76692bbbd Backed out changeset 56995fce2adc
John W. Eaton <jwe@octave.org>
parents: 32783
diff changeset
3729 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
3730 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
3731 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
3732
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3733 // 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
3734 // 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
3735
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3736 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
3737 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3738 if (! ret_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3739 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
3740 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
3741
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3742 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
3743 }
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 // 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
3746 // 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
3747
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3748 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
3749 error ("max_recursion_depth exceeded");
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 unwind_action act2 ([&user_function] () {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3752 user_function.restore_warning_states ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3755 // 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
3756
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3757 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
3758
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3759 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
3760
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3761 if (cmd_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3762 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3763 profiler::enter<octave_user_function>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3764 block (m_profiler, user_function);
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 if (echo ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3767 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
3768 user_function.fcn_file_name ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3769
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3770 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
3771 {
32936
0b5f3219b650 eliminate all uses of base_list<T> template
John W. Eaton <jwe@octave.org>
parents: 32905
diff changeset
3772 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
3773
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3774 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
3775
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3776 tree_expression *expr = stmt->expression ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3777
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3778 if (expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3779 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3780 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
3781
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3782 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
3783
ff1d5873f805 don't allow anon fcn eval to return comma-separated list (bug #64783)
John W. Eaton <jwe@octave.org>
parents: 32847
diff changeset
3784 // 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
3785
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 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
3787 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
3788 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3789 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3790 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3791 cmd_list->accept (*this);
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 if (m_returning)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3794 m_returning = 0;
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_breaking)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3797 m_breaking--;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3798 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3799
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3800 // Copy return values out.
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 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
3803 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3804 Cell varargout;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3805
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3806 if (ret_list->takes_varargs ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3807 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3808 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
3809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3810 if (varargout_varval.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3811 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
3812 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3813
32780
e96e2f9f9f37 avoid error with ignored values returned from function calls (bug #65153)
John W. Eaton <jwe@octave.org>
parents: 32632
diff changeset
3814 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
3815 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3816
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3817 return retval;
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3821 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
3822 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3823 // ??
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3824 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
3825 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3826
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3827 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3828 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
3829 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3830 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
3831 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3832
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3833 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3834 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
3835 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3836 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
3837 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3838
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3839 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3840 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
3841 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3842 octave_value fcn = cmd.function ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3843
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3844 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
3845
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3846 if (f)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3847 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3848 std::string nm = f->name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3849
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3850 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
3851
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3852 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
3853
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3854 // 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
3855 // function is cleared.
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 assign (nm);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3858 }
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3861 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3862 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
3863 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3864 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
3865 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3866
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3867 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3868 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
3869 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3870 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
3871 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3872
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3873 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3874 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
3875 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3876 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3877 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3878 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3879 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3880 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3881 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3882 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
3883 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3884
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3885 // 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
3886 // really have an accept method?
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 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
3889
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3890 if (lst)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3891 lst->accept (*this);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3894 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3895 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
3896 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3897 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
3898 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3899 tree_expression *expr = tic->condition ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3900
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3901 if (! (in_debug_repl ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3902 && 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
3903 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
3904
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3905 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
3906 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
3907
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3908 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
3909 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3910 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
3911
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3912 if (stmt_lst)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3913 stmt_lst->accept (*this);
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 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3916 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3917 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3918 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3921 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
3922 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3923 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
3924 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3925
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3926 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3927 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
3928 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3929 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
3930 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3931
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3932 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3933 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
3934 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3935 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
3936 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3937
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3938 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3939 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
3940 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3941 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
3942 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3943
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3944 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3945 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
3946 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3947 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3948 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3949 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3950 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3951 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3952 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3953 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
3954 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3955
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3956 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
3957 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
3958 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3959
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3960 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3961 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
3962 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3963 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
3964 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3965
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3966 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3967 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
3968 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3969 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
3970 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3971
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3972 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3973 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
3974 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3975 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
3976 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3977
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3978 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3979 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
3980 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3981 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
3982 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3983
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3984 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3985 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
3986 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
3987 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
3988 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3989
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3990 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3991 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
3992 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3993 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3994 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3995 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3996 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3997 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3998 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3999 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
4000 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4001
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4002 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4003 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
4004
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4005 // Act like dbcont.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4006
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4007 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
4008 dbcont ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4009 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
4010 || m_statement_context == SC_SCRIPT
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4011 || m_in_loop_command)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4012 m_returning = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4013 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4014
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4015 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4016 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
4017 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
4018 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
4019 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4020
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4021 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4022 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
4023 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4024 tree_command *cmd = stmt.command ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4025 tree_expression *expr = stmt.expression ();
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 if (cmd || expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4028 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4029 if (! (in_debug_repl ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4030 && 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
4031 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
4032
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4033 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4034 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4035 if (cmd)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4036 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4037 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
4038 upv (m_lvalue_list, nullptr);
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 cmd->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4041 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4042 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4043 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4044 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4045 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4046 int line = stmt.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4047 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4048 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4049 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4050 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
4051 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4052
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4053 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4054 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
4055
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4056 // 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
4057 // 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
4058 // 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
4059 // printing the result.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4060
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4061 // 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
4062 // 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
4063 // everything, binding ans as necessary?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4064
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4065 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
4066
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4067 if (tmp_result.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4068 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4069 bool do_bind_ans = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4070
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4071 if (expr->is_identifier ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4072 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
4073 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4074 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
4075
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4076 if (do_bind_ans)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4077 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
4078 && statement_printing_enabled ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4079 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4080 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4081 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4082 catch (const std::bad_alloc&)
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 // 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
4085 // 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
4086 // 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
4087 // 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
4088
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4089 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
4090 "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
4091 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4092 catch (const interrupt_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4093 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4094 // 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
4095 // Otherwise, jump out of here.
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 (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4098 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4099 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4100 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4101 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4102 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4103 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4104 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
4105
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4106 if ((m_interpreter.interactive ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4107 || application::forced_interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4108 && ((es.debug_on_error ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4109 && 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
4110 || (es.debug_on_caught ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4111 && 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
4112 && in_user_code ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4113 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4114 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4115 es.display_exception (ee);
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 enter_debugger ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4118
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4119 // 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
4120 // 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
4121 // 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
4122
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4123 throw quit_debug_exception (true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4124 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4125 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4126 throw;
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4129 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4132 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
4133 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4134 // 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
4135 // 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
4136
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4137 auto p = lst.begin ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4138
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4139 if (p != lst.end ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4140 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4141 while (true)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4142 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4143 tree_statement *elt = *p++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4144
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4145 if (! elt)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4146 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
4147
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4148 octave_quit ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4149
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4150 elt->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4151
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4152 if (m_breaking || m_continuing)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4153 break;
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_returning)
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 (p == lst.end ())
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 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4161 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4162 // 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
4163 // 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
4164 // 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
4165 // example, in code like this:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4166 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4167 // 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
4168 // # after this statement
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(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
4171 // # 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
4172 // # 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
4173 // # between statements here
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4174
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4175 // result_values = empty_list;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4176 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4177 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4178 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4179 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4182 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
4183 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
4184 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
4185 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4186
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4187 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4188 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
4189 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
4190 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
4191 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4192
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4193 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4194 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
4195 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4196 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4197 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4198 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4199 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4200 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4201 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4202 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
4203 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4204
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4205 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4206 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
4207
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4208 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
4209
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4210 if (! expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4211 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
4212 cmd.line (), cmd.column ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4213
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4214 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
4215
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4216 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
4217
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4218 if (lst)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4219 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4220 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
4221 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4222 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
4223 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4224 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
4225
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4226 if (stmt_lst)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4227 stmt_lst->accept (*this);
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 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4230 }
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 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4236 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
4237 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4238 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4239 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4240 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4241 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4242 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4243 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4244 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
4245 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4246
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4247 bool execution_error = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4248 octave_scalar_map err_map;
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 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
4251
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4252 if (try_code)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4253 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4254 // unwind frame before catch block
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4255
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4256 unwind_protect frame;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4257
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4258 interpreter_try (frame);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4259
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4260 // 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
4261 // 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
4262
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4263 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4264 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4265 try_code->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4266 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4267 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4268 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4269 execution_error = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4270
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4271 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
4272
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4273 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4274
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4275 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
4276 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
4277 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
4278
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4279 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4280 }
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 // 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
4283 // to executing the catch block.
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4286 if (execution_error)
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 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
4289
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4290 if (catch_code)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4291 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4292 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
4293
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4294 if (expr_id)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4295 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4296 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
4297
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4298 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
4299 }
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 // perform actual "catch" block
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4302 catch_code->accept (*this);
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4305 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4308 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
4309 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4310 unwind_protect frame;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4311
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4312 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
4313 octave_interrupt_state = 0;
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 // 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
4316 // backtracking.
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 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
4319 m_call_stack.current_line ());
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_column, &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_column ());
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 // 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
4325 // 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
4326 // 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
4327 // only occur in loops.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4328
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4329 frame.protect_var (m_returning);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4330 m_returning = 0;
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_breaking);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4333 m_breaking = 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 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4336 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4337 if (list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4338 list->accept (*this);
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 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4341 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4342 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
4343
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4344 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4345 m_interpreter.recover_from_exception ();
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 if (m_breaking || m_returning)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4348 frame.discard (2);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4349 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4350 frame.run (2);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4351
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4352 frame.discard (2);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4353
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4354 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4355 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4356
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4357 // 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
4358 // 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
4359
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4360 // 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
4361 // 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
4362 // 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
4363 // 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
4364 // Consider the case of
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4365 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4366 // function foo ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4367 // unwind_protect
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4368 // 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
4369 // break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4370 // 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
4371 // unwind_protect_cleanup
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4372 // 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
4373 // return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4374 // 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
4375 // end_unwind_protect
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4376 // endfunction
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4377 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4378 // 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
4379 // 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
4380 // 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
4381 // 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
4382 // 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
4383
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4384 if (m_breaking || m_returning)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4385 frame.discard (2);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4386 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4387 frame.run (2);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4388 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4389
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4390 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4391 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
4392 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4393 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4394 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4395 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4396 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4397 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4398 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4399 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
4400 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4401
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4402 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
4403
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4404 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
4405
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4406 if (unwind_protect_code)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4407 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4408 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4409 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4410 unwind_protect_code->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4411 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4412 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4413 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4414 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
4415
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4416 // 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
4417 // 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
4418 // 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
4419 // here?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4420 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4421 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4422
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4423 // 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
4424 // 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
4425 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
4426
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4427 // 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
4428 // 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
4429 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4430 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4431 catch (const interrupt_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4432 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4433 // 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
4434 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4435 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
4436 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4437 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4438
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4439 // 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
4440 // 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
4441 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
4442 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4443 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4444
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4445 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4446 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
4447 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4448 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4449 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4450 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4451
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4452 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4453 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4454 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4455 line++;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4458 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
4459
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4460 tree_expression *expr = cmd.condition ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4461
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4462 if (! expr)
33382
79cfa1b7a813 replace nearly all remaining uses of panic_impossible with error
John W. Eaton <jwe@octave.org>
parents: 33365
diff changeset
4463 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
4464
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4465 for (;;)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4466 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4467 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4468 m_echo_file_pos = line;
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_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4471 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
4472
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4473 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
4474 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4475 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
4476
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4477 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4478 loop_body->accept (*this);
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 (quit_loop_now ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4481 break;
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 else
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4487
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4488 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4489 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
4490 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4491 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4492 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4493 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4494
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4495 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4496 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4497 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4498 line++;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4501 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
4502
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4503 tree_expression *expr = cmd.condition ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4504
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4505 if (! expr)
33382
79cfa1b7a813 replace nearly all remaining uses of panic_impossible with error
John W. Eaton <jwe@octave.org>
parents: 33365
diff changeset
4506 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
4507
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4508 for (;;)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4509 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4510 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4511 m_echo_file_pos = line;
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 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
4514
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4515 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4516 loop_body->accept (*this);
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 (quit_loop_now ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4519 break;
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 (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4522 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
4523
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4524 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
4525 break;
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4528
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4529 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4530 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
4531 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
4532 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
4533 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4534
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4535 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4536 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
4537 {
33349
1191eae272fa eliminate some calls to panic_impossible in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 33309
diff changeset
4538 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
4539 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4540
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4541 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4542 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
4543 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4544 static std::string ans = "ans";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4545
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4546 if (val.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4547 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4548 if (val.is_cs_list ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4549 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4550 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
4551
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4552 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
4553 bind_ans (lst(i), print);
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 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4556 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4557 // 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
4558 // just for convenience?
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 assign (ans, val);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4561
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4562 if (print)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4563 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4564 // 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
4565 // 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
4566 // 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
4567
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4568 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
4569 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
4570 m_interpreter.feval ("display", args);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4571 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4572 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4573 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4574 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4577 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
4578 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4579 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
4580 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
4581 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4582
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4583 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4584 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
4585 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
4586 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4587 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
4588
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4589 if (is_breakpoint)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4590 break_on_this_statement = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4591 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
4592 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4593 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
4594 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4595 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
4596 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4597 // 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
4598 // 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
4599 // 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
4600 // 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
4601 // line and return to prompt.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4602
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4603 break_on_this_statement = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4604 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4605 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4606 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4607 // 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
4608
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4609 m_dbstep_flag--;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4610 }
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4613 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
4614 && 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
4615 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4616 // 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
4617
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4618 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
4619
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4620 break_on_this_statement = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4621 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4622 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4623 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
4624 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4625 // 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
4626
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4627 break_on_this_statement = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4628
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4629 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
4630 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4631 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
4632 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4633 // 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
4634 // 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
4635 // 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
4636 // "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
4637 // that frame.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4638
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4639 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
4640 && 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
4641 m_dbstep_flag = -1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4642 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4643
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4644 if (! break_on_this_statement)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4645 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
4646
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4647 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
4648
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4649 if (break_on_this_statement)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4650 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4651 m_dbstep_flag = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4652
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4653 enter_debugger ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4654 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4655 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4656
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4657 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4658 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
4659 const char *warn_for)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4660 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4661 bool expr_value = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4662
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4663 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
4664
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4665 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
4666
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4667 if (t1.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4668 return t1.is_true ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4669 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4670 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
4671
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4672 return expr_value;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4673 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4674
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4675 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4676 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
4677 int nargout)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4678 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4679 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
4680 "max_recursion_depth", 0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4681 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4682
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4683 symbol_info_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4684 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
4685 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4686 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
4687 }
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 symbol_info_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4690 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
4691 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4692 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
4693 }
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 symbol_info_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4696 tree_evaluator::get_symbol_info ()
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 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
4699 }
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 symbol_info_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4702 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
4703 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4704 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
4705 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4706
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4707 octave_map
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4708 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
4709 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4710 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
4711 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
4712
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4713 octave_idx_type i = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4714 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
4715 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4716 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
4717 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
4718
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4719 i++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4720 }
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 octave_map m;
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 m.assign ("function", fcn_names);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4725 m.assign ("file", file_names);
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 return m;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4728 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4729
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4730 std::string
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4731 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
4732 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4733 std::string retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4734
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4735 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
4736
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4737 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
4738 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4739 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
4740
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4741 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
4742 }
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 return retval;
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4747 std::list<std::string>
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4748 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
4749 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4750 std::list<std::string> names;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4751
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4752 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
4753 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
4754
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4755 return names;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4756 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4757
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4758 std::list<std::string>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4759 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
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> names;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4762
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4763 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
4764 if (nm == fcn_fname.second)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4765 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
4766
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4767 return names;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4768 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4769
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4770 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4771 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
4772 const std::string& nm)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4773 {
32593
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
4774 std::string file_name = check_autoload_file (nm);
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
4775
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
4776 // Signal to load path that the function cache is invalid
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
4777 octave::load_path::signal_clear_fcn_cache ();
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
4778
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
4779 m_autoload_map[fcn] = file_name;
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4780 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4781
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4782 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4783 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
4784 const std::string& nm)
31809
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 check_autoload_file (nm);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4787
32593
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
4788 // Signal to load path that the function cache is invalid
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
4789 octave::load_path::signal_clear_fcn_cache ();
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
4790
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4791 // 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
4792 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
4793
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4794 symtab.clear_dld_function (fcn);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4795
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4796 m_autoload_map.erase (fcn);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4797 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4798
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4799 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4800 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
4801 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4802 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
4803 "whos_line_format");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4804 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4805
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4806 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4807 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
4808 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4809 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
4810 "silent_functions");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4811 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4812
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4813 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4814 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
4815 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4816 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
4817 "string_fill_char");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4818 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4819
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4820 // 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
4821 // 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
4822 // 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
4823
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4824 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4825 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
4826 const tree_expression *expr)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4827 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4828 std::string extra_message;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4829
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4830 if (is_variable (expr))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4831 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4832 std::string var = expr->name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4833
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4834 ie.set_var (var);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4835
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4836 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
4837
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4838 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
4839
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4840 if (fcn.is_function ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4841 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4842 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
4843
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4844 if (fp && fp->name () == var)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4845 extra_message
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4846 = " (note: variable '" + var + "' shadows function)";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4847 }
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 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
4851
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4852 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
4853 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4854
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4855 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4856 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
4857 bool return_list, bool verbose)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4858 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4859 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
4860 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4861
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4862 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4863 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
4864 const string_vector& arg_nm)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4865 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4866 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4867
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4868 if (args)
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<const std::list<octave_lvalue> *>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4871 upv (m_lvalue_list, nullptr);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4872
32936
0b5f3219b650 eliminate all uses of base_list<T> template
John W. Eaton <jwe@octave.org>
parents: 32905
diff changeset
4873 int len = args->size ();
31809
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 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
4876 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
4877
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4878 m_num_indices = len;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4879
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4880 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
4881
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4882 int k = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4883
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4884 for (auto elt : *args)
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 // 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
4887
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4888 if (! elt)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4889 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4890
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4891 m_index_position = k++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4892
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4893 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
4894
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4895 if (tmp.is_cs_list ())
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 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
4898
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4899 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
4900 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
4901 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4902 else if (tmp.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4903 arg_vals.push_back (tmp);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4904 }
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 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
4907 }
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 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
4910
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4911 if (n > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4912 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
4913
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4914 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4915 }
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 std::list<octave_lvalue>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4918 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
4919 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4920 std::list<octave_lvalue> 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 for (tree_expression *elt : *lhs)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4923 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
4924
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4925 return retval;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4928 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4929 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
4930 int pos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4931 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4932 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
4933
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4934 if (frame)
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 push_echo_state_cleanup (*frame);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4937
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4938 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
4939 }
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4942 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4943 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
4944 int 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 m_echo_state = echo_this_file (file_name, type);
32307
02faaad763d4 VM Add support for echo
Petter T.
parents: 32306
diff changeset
4947
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4948 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
4949 m_echo_file_pos = 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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4952 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4953 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
4954 int 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 m_echo_state = state;
32307
02faaad763d4 VM Add support for echo
Petter T.
parents: 32306
diff changeset
4957
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4958 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
4959 m_echo_file_pos = pos;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4960 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4963 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
4964 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4965 octave_function *caller = caller_function ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4966
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4967 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
4968 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4969 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
4970
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4971 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
4972
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4973 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
4974
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4975 // 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
4976 // 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
4977 // 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
4978
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4979 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
4980
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4981 if (pos < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4982 pos = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4983
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4984 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
4985 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4986 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4987
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4988 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4989 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
4990 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4991 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
4992 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
4993 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4994
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4995 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
4996 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
4997 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4998 // 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
4999 // 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
5000 // 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
5001 // elements to restore echo state.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5002
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5003 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
5004
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5005 if (frame)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5006 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5007 push_echo_state_cleanup (*frame);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5008 return true;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5011 return false;
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
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 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5016 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
5017 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5018 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
5019
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5020 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
5021
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5022 switch (args.length ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5023 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5024 case 0:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5025 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
5026 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5027 m_echo = ECHO_OFF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5028 m_echo_files.clear ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5029 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5030 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5031 m_echo = ECHO_SCRIPTS;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5032 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5033
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5034 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
5035 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5036 std::string arg0 = argv[0];
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5037
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5038 if (arg0 == "on")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5039 m_echo = ECHO_SCRIPTS;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5040 else if (arg0 == "off")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5041 m_echo = ECHO_OFF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5042 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
5043 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5044 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
5045 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
5046
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5047 if (file.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5048 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
5049
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5050 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
5051 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5052 // 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
5053 // for this one.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5054
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5055 m_echo_files[file] = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5056 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5057 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5058 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5059 // 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
5060
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5061 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
5062
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5063 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
5064 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5065 // 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
5066
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5067 m_echo |= ECHO_FUNCTIONS;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5068 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
5069 }
ea5a632b2553 improve error checking for undefined function outputs (bug #58686, #58695)
John W. Eaton <jwe@octave.org>
parents: 28532
diff changeset
5070 else
ea5a632b2553 improve error checking for undefined function outputs (bug #58686, #58695)
John W. Eaton <jwe@octave.org>
parents: 28532
diff changeset
5071 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5072 // 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
5073 // status for it.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5074
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5075 p->second = ! p->second;
23435
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
5076 }
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
5077 }
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
5078 }
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
5079 }
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5080 break;
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 case 2:
27873
020d0e8f7ac6 reafactor mlock, munlock, and mislocked functions
John W. Eaton <jwe@octave.org>
parents: 27844
diff changeset
5083 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5084 std::string arg0 = argv[0];
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5085 std::string arg1 = argv[1];
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5086
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5087 if (arg1 == "on" || arg1 == "off")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5088 std::swap (arg0, arg1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5089
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5090 if (arg0 == "on")
26065
2eb71b83d3e2 partially refactor function lookup in symbol table
John W. Eaton <jwe@octave.org>
parents: 26039
diff changeset
5091 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5092 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
5093 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5094 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
5095 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
5096 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22164
diff changeset
5097 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22164
diff changeset
5098 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5099 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
5100 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
5101
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5102 if (file.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5103 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
5104
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5105 m_echo |= ECHO_FUNCTIONS;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5106 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
5107 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22164
diff changeset
5108 }
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5109 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
5110 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5111 if (arg1 == "all")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5112 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5113 m_echo = ECHO_OFF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5114 m_echo_files.clear ();
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 else
28562
b0b80efecea1 error for functions called with too many inputs or outputs
John W. Eaton <jwe@octave.org>
parents: 28561
diff changeset
5117 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5118 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
5119 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
5120
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5121 if (file.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5122 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
5123
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5124 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
5125 }
b0b80efecea1 error for functions called with too many inputs or outputs
John W. Eaton <jwe@octave.org>
parents: 28561
diff changeset
5126 }
b0b80efecea1 error for functions called with too many inputs or outputs
John W. Eaton <jwe@octave.org>
parents: 28561
diff changeset
5127 else
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5128 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
5129 }
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5130 break;
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 default:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5133 print_usage ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5134 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5135 }
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 if (cleanup_pushed)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5138 maybe_set_echo_state ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5139
32593
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
5140 #if defined (OCTAVE_ENABLE_BYTECODE_EVALUATOR)
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
5141 // Since m_echo might have changed value we need to call this
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
5142 update_vm_dbgprofecho_flag ();
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
5143 #endif
60515d0cd023 maint: Merge default to bytecode-interpreter.
Rik <rik@octave.org>
parents: 32589
diff changeset
5144
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5145 return octave_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5146 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5147
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5148 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5149 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
5150 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5151 return (m_debugger_stack.empty ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5152 ? 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
5153 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5154
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5155 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5156 tree_evaluator::dbcont ()
31809
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 if (! m_debugger_stack.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5159 m_debugger_stack.top()->dbcont ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5160 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5161
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5162 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5163 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
5164 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5165 if (! m_debugger_stack.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5166 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
5167 }
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_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5170 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
5171 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5172 int nargin = args.length ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5173
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5174 if (nargin != 0 && nargin != 3)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5175 print_usage ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5176
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5177 if (nargin == 3)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5178 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5179 octave_idx_type index_position
33365
fb44a9db1bc6 Replace `xint_value` and related functions with stricter versions (bug #65538)
Arun Giridhar <arungiridhar@gmail.com>
parents: 33349
diff changeset
5180 = args(1).yidx_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
5181
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5182 if (index_position < 1)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5183 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
5184
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5185 octave_idx_type num_indices
33365
fb44a9db1bc6 Replace `xint_value` and related functions with stricter versions (bug #65538)
Arun Giridhar <arungiridhar@gmail.com>
parents: 33349
diff changeset
5186 = args(2).yidx_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
5187
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5188 if (num_indices < 1)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5189 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
5190
32147
8763a313ab91 new octave_value member function to compute end index for object
Petter T. <petter.vilhelm@gmail.com>
parents: 32146
diff changeset
5191 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
5192 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5193
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5194 // 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
5195 // 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
5196 // 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
5197 // 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
5198 // 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
5199
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5200 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
5201 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
5202
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5203 octave_value expr_result;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5204
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5205 if (m_index_list.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5206 expr_result = m_indexed_object;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5207 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5208 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5209 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5210 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5211 // 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
5212 // 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
5213 // 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
5214 // 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
5215 // 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
5216 // 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
5217
33034
49128bdb9eb2 use explicit lambda-expression captures (bug #65318)
John W. Eaton <jwe@octave.org>
parents: 33033
diff changeset
5218 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
5219 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5220 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
5221 }, m_call_stack.current_frame ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5222
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5223 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
5224 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
5225
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5226 // 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
5227 // 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
5228 // evaluates the argument 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 // Silently ignore extra output values.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5231
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5232 octave_value_list tmp
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5233 = 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
5234
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5235 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
5236
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5237 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
5238 err_indexed_cs_list ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5239 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5240 catch (const index_exception&)
31607
aac27ad79be6 maint: Re-indent code after switch to using namespace macros.
Rik <rik@octave.org>
parents: 31605
diff changeset
5241 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5242 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
5243 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5244 }
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 if (expr_result.isobject ())
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 // 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
5249 // 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
5250 // appropriately?
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 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
5253
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5254 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
5255
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5256 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
5257
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5258 if (meth.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5259 return m_interpreter.feval
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5260 (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
5261 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5262
32147
8763a313ab91 new octave_value member function to compute end index for object
Petter T. <petter.vilhelm@gmail.com>
parents: 32146
diff changeset
5263 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
5264 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5265
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5266 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5267 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
5268 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5269 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
5270 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5271
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5272 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5273 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
5274 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5275 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
5276 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5277 // 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
5278 return true;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5281 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
5282 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5283 // 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
5284 // Now, which ones?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5285
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5286 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
5287
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5288 if (m_echo & ECHO_ALL)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5289 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5290 // 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
5291 // file.
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 (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
5294 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5295 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5296 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5297 // 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
5298
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5299 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
5300 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5301 }
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 return false;
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
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5306 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5307 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
5308 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5309 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
5310
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5311 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
5312
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5313 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
5314 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5315 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
5316
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5317 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
5318
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5319 std::deque<std::string> lines
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5320 = 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
5321
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5322 for (auto& elt : lines)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5323 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
5324 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5325 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5326
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5327 // 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
5328 bool
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5329 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
5330 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5331 octave_quit ();
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 // Maybe handle 'continue N' someday...
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 if (m_continuing)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5336 m_continuing--;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5337
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5338 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
5339
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5340 if (m_breaking)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5341 m_breaking--;
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 return quit;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5344 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5345
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5346 void
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5347 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
5348 const Matrix& ignored_outputs,
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5349 int nargin, int nargout,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5350 bool takes_varargs,
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5351 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
5352 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5353 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
5354 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
5355 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
5356 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
5357 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
5358
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5359 if (takes_varargs)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5360 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
5361 }
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 std::string
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5364 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
5365 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5366 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
5367 return nm;
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 std::string full_name = nm;
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 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
5372
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5373 bool found = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5374
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5375 if (fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5376 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5377 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
5378
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5379 if (! fname.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5380 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5381 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
5382 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
5383
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5384 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
5385
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5386 if (fs.exists ())
31607
aac27ad79be6 maint: Re-indent code after switch to using namespace macros.
Rik <rik@octave.org>
parents: 31605
diff changeset
5387 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5388 full_name = fname + nm;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5389 found = true;
31607
aac27ad79be6 maint: Re-indent code after switch to using namespace macros.
Rik <rik@octave.org>
parents: 31605
diff changeset
5390 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros.
Rik <rik@octave.org>
parents: 31605
diff changeset
5391 }
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5392 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5393
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5394 if (! found)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5395 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
5396 "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
5397 nm.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5398
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5399 return full_name;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5400 }
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5401
23705
4c597585ff52 move Vmax_recursion_depth and Vsilent_functions to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23702
diff changeset
5402 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
5403 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
5404 @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
5405 @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
5406 @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
5407 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
5408 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
5409
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5410 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
5411 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
5412
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5413 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
5414 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
5415 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
5416
41f80b9af274 prevent stack overflow crash on deeply nested function calls (bug #47620)
John W. Eaton <jwe@octave.org>
parents: 24738
diff changeset
5417 @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
5418 @end deftypefn */)
10578
cb0883127251 limit on recursion via calls to source function
John W. Eaton <jwe@octave.org>
parents: 10315
diff changeset
5419 {
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5420 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
5421
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5422 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
5423 }
cb0883127251 limit on recursion via calls to source function
John W. Eaton <jwe@octave.org>
parents: 10315
diff changeset
5424
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 %!test
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5427 %! 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
5428 %! 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
5429 %! 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
5430 %! 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
5431 %! 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
5432 %! 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
5433
28930
2883b3d08b7e maint: Remove unnecessary parentheses bracketing %!error BIST tests.
Rik <rik@octave.org>
parents: 28857
diff changeset
5434 %!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
5435 */
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5436
26087
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5437 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
5438 doc: /* -*- texinfo -*-
26087
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5439 @deftypefn {} {@var{val} =} whos_line_format ()
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5440 @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
5441 @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
5442 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
5443
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5444 A full format string is:
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5445 @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
5446
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5447 @smallexample
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5448 %[modifier]<command>[:width[:left-min[:balance]]];
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5449 @end smallexample
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5450
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5451 The following command sequences are available:
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5452
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5453 @table @code
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5454 @item %a
29856
56b3e2af0298 Add 's'=sparse attribute for whos function (bug #60687)
Rik <rik@octave.org>
parents: 29848
diff changeset
5455 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
5456 g=global, p=persistent).
26087
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5457
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5458 @item %b
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5459 Prints number of bytes occupied by variables.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5460
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5461 @item %c
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5462 Prints class names of variables.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5463
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5464 @item %e
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5465 Prints elements held by variables.
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 @item %n
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5468 Prints variable names.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5469
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5470 @item %s
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5471 Prints dimensions of variables.
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 %t
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5474 Prints type names of variables.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5475 @end table
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5476
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5477 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
5478
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5479 @table @code
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5480 @item l
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5481 Left alignment.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5482
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5483 @item r
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5484 Right alignment (default).
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5485
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5486 @item c
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5487 Column-aligned (only applicable to command %s).
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5488 @end table
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5489
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5490 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
5491 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
5492 auto-expand as required.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5493
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5494 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
5495 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
5496 @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
5497 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
5498 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
5499 the left of the specified balance column.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5500
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5501 The default format is:
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5502
29856
56b3e2af0298 Add 's'=sparse attribute for whos function (bug #60687)
Rik <rik@octave.org>
parents: 29848
diff changeset
5503 @example
56b3e2af0298 Add 's'=sparse attribute for whos function (bug #60687)
Rik <rik@octave.org>
parents: 29848
diff changeset
5504 " %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
5505 @end example
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 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
5508 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
5509 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
5510 @seealso{whos}
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5511 @end deftypefn */)
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5512 {
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5513 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
5514
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5515 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
5516 }
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5517
23705
4c597585ff52 move Vmax_recursion_depth and Vsilent_functions to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23702
diff changeset
5518 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
5519 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
5520 @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
5521 @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
5522 @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
5523 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
5524 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
5525
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5526 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
5527 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
5528 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
5529
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5530 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
5531 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
5532 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
5533 @end deftypefn */)
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5534 {
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5535 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
5536
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5537 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
5538 }
12833
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5539
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5540 /*
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5541 %!test
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5542 %! orig_val = silent_functions ();
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5543 %! 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
5544 %! 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
5545 %! 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
5546 %! silent_functions (orig_val);
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5547 %! 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
5548
28930
2883b3d08b7e maint: Remove unnecessary parentheses bracketing %!error BIST tests.
Rik <rik@octave.org>
parents: 28857
diff changeset
5549 %!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
5550 */
23706
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5551
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5552 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
5553 doc: /* -*- texinfo -*-
23706
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5554 @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
5555 @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
5556 @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
5557 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
5558 matrix to the same length.
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5559
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5560 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
5561 single space). For 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 @example
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5564 @group
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5565 string_fill_char ("X");
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5566 [ "these"; "are"; "strings" ]
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5567 @result{} "theseXX"
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5568 "areXXXX"
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5569 "strings"
23706
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5570 @end group
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5571 @end example
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 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
5574 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
5575 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
5576 @end deftypefn */)
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5577 {
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5578 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
5579
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5580 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
5581 }
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5582
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5583 /*
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5584 ## 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
5585 ## 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
5586 %!shared orig_val, old_val
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5587 %! orig_val = string_fill_char ();
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5588 %! 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
5589 %!test
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5590 %! assert (orig_val, old_val);
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5591 %! assert (string_fill_char (), "X");
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5592 %! 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
5593 %! string_fill_char (orig_val);
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5594 %! 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
5595
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5596 %!assert ( [ [], {1} ], {1} )
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5597
28930
2883b3d08b7e maint: Remove unnecessary parentheses bracketing %!error BIST tests.
Rik <rik@octave.org>
parents: 28857
diff changeset
5598 %!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
5599 */
23723
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5600
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5601 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
5602 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
5603 @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
5604 @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
5605 @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
5606 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
5607 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
5608
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5609 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
5610 @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
5611
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5612 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
5613 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
5614 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
5615 @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
5616 @end deftypefn */)
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5617 {
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5618 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
5619 }
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5620
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5621 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
5622 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
5623 @deftypefn {} {} echo
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5624 @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
5625 @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
5626 @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
5627 @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
5628 @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
5629 @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
5630 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
5631
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5632 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
5633
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5634 @table @code
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5635 @item on
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5636 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
5637
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5638 @item off
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5639 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
5640
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5641 @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
5642 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
5643 functions.
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5644
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5645 @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
5646 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
5647 functions.
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 @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
5650 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
5651
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5652 @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
5653 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
5654 @end table
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 @noindent
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5657 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
5658
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5659 @seealso{PS4}
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5660 @end deftypefn */)
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5661 {
32589
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5662 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
5663
05b4479c29d8 maint: C++ style check for libinterp/ before 9.1 release.
Rik <rik@octave.org>
parents: 32546
diff changeset
5664 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
5665 }
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5666
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5667 /*
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5668 %!error echo ([])
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5669 %!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
5670 %!error echo ("")
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5671 %!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
5672 %!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
5673 %!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
5674 %!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
5675 */
29958
32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29956
diff changeset
5676
32690
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5677 /*
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5678 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
5679 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
5680
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5681 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
5682 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
5683 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
5684
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5685 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
5686 a = 1:4;
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5687 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
5688 % 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
5689 */
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5690 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
5691 doc: /* -*- texinfo -*-
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5692 @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
5693 @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
5694 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
5695
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5696 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
5697 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
5698 (@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
5699 @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
5700
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5701 @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
5702 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
5703
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5704 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
5705 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
5706 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
5707 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
5708 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
5709 @seealso{nargin, narginchk}
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5710 @end deftypefn */)
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5711 {
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5712 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
5713
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5714 if (nargin < 1)
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5715 print_usage ();
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5716
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5717 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
5718 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
5719 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
5720
33365
fb44a9db1bc6 Replace `xint_value` and related functions with stricter versions (bug #65538)
Arun Giridhar <arungiridhar@gmail.com>
parents: 33349
diff changeset
5721 int n = args(0).yint_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
5722
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5723 if (n < 1)
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5724 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
5725
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5726 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
5727
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5728 if (nargin == 2)
33365
fb44a9db1bc6 Replace `xint_value` and related functions with stricter versions (bug #65538)
Arun Giridhar <arungiridhar@gmail.com>
parents: 33349
diff changeset
5729 ids_only = args(1).ybool_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
5730
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5731 // 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
5732 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
5733 }
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5734
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5735 /*
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5736 %!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
5737 %! name = inputname (1);
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5738 %!endfunction
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5739
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5740 %!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
5741 %! 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
5742 %!endfunction
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5743
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5744 %!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
5745 %! name = inputname (2);
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5746 %!endfunction
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5747
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5748 %!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
5749 %! 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
5750 %! 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
5751 %! 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
5752 %! endfor
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5753 %!endfunction
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 %! assert (__iname1__ ('xvar'), "");
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5757 %! xvar = 1;
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5758 %! 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
5759
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5760 %!test
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5761 %! 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
5762 %! assert (__iname2__ (xvar), "");
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5763 %! 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
5764
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5765 %!test
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5766 %! 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
5767 %! 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
5768 %! 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
5769 %! 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
5770
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5771 ## 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
5772 %!test
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5773 %! 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
5774 %! x = 1;
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5775 %! 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
5776 %! assert (__iname1__ (Inf), "");
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 %!test
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5779 %! 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
5780 %! x = 1;
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5781 %! 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
5782 %! 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
5783
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5784 %!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
5785 %!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
5786 %!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
5787 */
a11d7442f9cd replace inputname.m with a built-in function (bug #65116)
John W. Eaton <jwe@octave.org>
parents: 32687
diff changeset
5788
31605
e88a07dec498 maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents: 30919
diff changeset
5789 OCTAVE_END_NAMESPACE(octave)