Mercurial > octave

annotate libinterp/parse-tree/pt-eval.cc @ 32095:28ef2991fb5a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Emit warning about infinite loop if for loop range starts with infinite value. * pt-eval.cc (execute_range_loop): Check base of range, in addition to limit of range, for infinite value and emit warning if found. * for.tst: Add tests for new behavior. Recode tests so that they don't emit warnings if file 'for.tst' is tested outside of test suite.
author Rik <rik@octave.org>
date Wed, 17 May 2023 20:29:17 -0700
parents c8dd3da44e83
children fc5a9a9e5cea
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 //
31706
597f3ee61a48 update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents: 31607
diff changeset
3 // Copyright (C) 2009-2023 The Octave Project Developers
27923
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
4 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
7 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
9 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
14 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
19 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
23 //
bd51beb6205e update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents: 27919
diff changeset
24 ////////////////////////////////////////////////////////////////////////
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
25
21724
aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents: 21542
diff changeset
26 #if defined (HAVE_CONFIG_H)
21301
40de9f8f23a6 Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents: 21211
diff changeset
27 # include "config.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
28 #endif
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
29
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
30 #include <cctype>
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
31
29619
5cf985f5760a move get_line_and_eval to parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 29572
diff changeset
32 #include <condition_variable>
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
33 #include <iostream>
25438
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible
John W. Eaton <jwe@octave.org>
parents: 25407
diff changeset
34 #include <list>
29619
5cf985f5760a move get_line_and_eval to parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 29572
diff changeset
35 #include <mutex>
25438
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible
John W. Eaton <jwe@octave.org>
parents: 25407
diff changeset
36 #include <string>
29619
5cf985f5760a move get_line_and_eval to parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 29572
diff changeset
37 #include <thread>
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
38
23723
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
39 #include "cmd-edit.h"
25360
bc5f225bc578 eliminate some global accesses to the breakpoint table
John W. Eaton <jwe@octave.org>
parents: 25337
diff changeset
40 #include "file-ops.h"
27016
9b261300a001 move file-scope static autoload map variable and functions to evaluator
John W. Eaton <jwe@octave.org>
parents: 27015
diff changeset
41 #include "file-stat.h"
28804
3719f5d452d4 refactor implementation of END indexing in interpreter (bug #58953)
John W. Eaton <jwe@octave.org> and Fernando Alvarruiz
parents: 28726
diff changeset
42 #include "lo-array-errwarn.h"
27100
b453b586da16 improve error message when indexing undefined object with "end" (bug #33637)
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
43 #include "lo-ieee.h"
23723
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
44 #include "oct-env.h"
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
45
23137
334119c390b3 move bp_table class to separate file
John W. Eaton <jwe@octave.org>
parents: 23110
diff changeset
46 #include "bp-table.h"
22091
0f6fc2ec3b1a move call_stack class to a separate file
John W. Eaton <jwe@octave.org>
parents: 21966
diff changeset
47 #include "call-stack.h"
26975
de826e69a5ea make breakpoints in classdef methods work (bug #45404, bug #46451)
John W. Eaton <jwe@octave.org>
parents: 26924
diff changeset
48 #include "cdef-manager.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
49 #include "defun.h"
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
50 #include "error.h"
21100
e39e05d90788 Switch gripe_XXX to either err_XXX or warn_XXX naming scheme.
Rik <rik@octave.org>
parents: 20962
diff changeset
51 #include "errwarn.h"
27263
99aa1bcb8848 rename octave_link and octave_link_events classes, move inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27261
diff changeset
52 #include "event-manager.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
53 #include "input.h"
23599
5cb3a2bb5e1e don't use singleton for symbol_table
John W. Eaton <jwe@octave.org>
parents: 23587
diff changeset
54 #include "interpreter-private.h"
22094
9203833cab7d move new interpreter class to separate file
John W. Eaton <jwe@octave.org>
parents: 22091
diff changeset
55 #include "interpreter.h"
30919
4ed7dfe28584 move eval of anon fcn handles and built-in and mex functions to pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 30896
diff changeset
56 #include "mex-private.h"
27037
8408acb7ca4f make dbup/dbdown work again (bug #56020)
John W. Eaton <jwe@octave.org>
parents: 27019
diff changeset
57 #include "octave.h"
26769
2f847e3e8d6b split classdef into multiple smaller source files
John W. Eaton <jwe@octave.org>
parents: 26718
diff changeset
58 #include "ov-classdef.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
59 #include "ov-fcn-handle.h"
30919
4ed7dfe28584 move eval of anon fcn handles and built-in and mex functions to pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 30896
diff changeset
60 #include "ov-mex-fcn.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
61 #include "ov-usr-fcn.h"
23435
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
62 #include "ov-re-sparse.h"
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
63 #include "ov-cx-sparse.h"
26686
581d01526b34 eliminate unnecessary tree_funcall class
John W. Eaton <jwe@octave.org>
parents: 26662
diff changeset
64 #include "parse.h"
23435
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
65 #include "profiler.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
66 #include "pt-all.h"
26661
cf9e10ce3351 move variable values from symbol_record objects to stack_frame objects
John W. Eaton <jwe@octave.org>
parents: 26512
diff changeset
67 #include "pt-anon-scopes.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
68 #include "pt-eval.h"
23435
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
69 #include "pt-tm-const.h"
28430
5bfa8e018704 store local init vars for anonymous functions in handle, not function object
John W. Eaton <jwe@octave.org>
parents: 28429
diff changeset
70 #include "stack-frame.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
71 #include "symtab.h"
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
72 #include "unwind-prot.h"
23723
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
73 #include "utils.h"
23435
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
74 #include "variables.h"
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
75
31605
e88a07dec498 maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents: 30919
diff changeset
76 OCTAVE_BEGIN_NAMESPACE(octave)
29960
939bef0b66e0 merge "namespace octave" and OCTAVE_NAMESPACE_BEGIN/END blocks
John W. Eaton <jwe@octave.org>
parents: 29958
diff changeset
77
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
78 // Normal evaluator.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
79
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
80 class quit_debug_exception
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
81 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
82 public:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
83
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
84 quit_debug_exception (bool all = false) : m_all (all) { }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
85
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
86 quit_debug_exception (const quit_debug_exception&) = default;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
87
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
88 quit_debug_exception& operator = (const quit_debug_exception&) = default;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
89
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
90 ~quit_debug_exception () = default;
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 bool all () const { return m_all; }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
93
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
94 private:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
95
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
96 bool m_all;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
97 };
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
98
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
99 class debugger
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 public:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
102
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
103 enum execution_mode
31607
aac27ad79be6 maint: Re-indent code after switch to using namespace macros.
Rik <rik@octave.org>
parents: 31605
diff changeset
104 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
105 EX_NORMAL = 0,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
106 EX_CONTINUE = 1,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
107 EX_QUIT = 2,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
108 EX_QUIT_ALL = 3
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
109 };
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 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
112 : 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
113 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
114 { }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
115
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
116 int server_loop ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
117
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
118 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
119
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
120 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
121
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
122 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
123
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
124 void dbquit (bool all = false)
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
125 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
126 if (all)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
127 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
128 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
129 m_execution_mode = EX_QUIT;
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
130 }
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
131
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
132 bool quitting_debugger () const;
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 private:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
135
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
136 interpreter& m_interpreter;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
137
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
138 std::size_t m_level;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
139 execution_mode m_execution_mode;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
140 bool m_in_debug_repl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
141 };
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
142
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
143 // 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
144 // 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
145 // 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
146
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
147 int debugger::server_loop ()
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 // 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
150
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
151 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
152
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
153 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
154 = &tree_evaluator::server_mode;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
155 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
156
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
157 int exit_status = 0;
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 do
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 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
162 break;
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 if (quitting_debugger ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
165 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
166
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
167 try
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: 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
170 // 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
171
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
172 octave_quit ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
173
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
174 // 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
175 // the command_editor.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
176
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
177 // 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
178 // 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
179 // 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
180 // 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
181 // 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
182 // 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
183 // 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
184 // 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
185 // is met?
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 // 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
188 // 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
189 // 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
190
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
191 command_editor::run_event_hooks ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
192
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
193 release_unreferenced_dynamic_libraries ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
194
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
195 sleep (0.1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
196 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
197 catch (const interrupt_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
198 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
199 octave_interrupt_state = 1;
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 // 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
203 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
204 octave_stdout << "\n";
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 index_exception& e)
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 m_interpreter.recover_from_exception ();
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 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
211 << 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
212 << std::endl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
213 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
214 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
215 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
216 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
217
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
218 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
219 es.display_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
220
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
221 if (m_interpreter.interactive ())
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 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
224 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
225 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
226 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
227 // 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
228 exit_status = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
229 break;
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
232 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
233 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
234 if (qde.all ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
235 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
236
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
237 // Continue in this debug level.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
238 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
239 catch (const std::bad_alloc&)
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 m_interpreter.recover_from_exception ();
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 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
244 << std::endl;
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
247 while (exit_status == 0);
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 if (exit_status == EOF)
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 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
252 octave_stdout << "\n";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
253
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
254 exit_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
255 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
256
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
257 return exit_status;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
258 }
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 void debugger::repl (const std::string& prompt_arg)
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 unwind_protect frame;
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 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
265 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
266
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
267 m_in_debug_repl = true;
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 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
270
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
271 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
272
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
273 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
274 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
275
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
276 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
277
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
278 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
279 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
280
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
281 if (caller)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
282 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
283 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
284 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
285 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
286
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
287 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
288
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
289 std::ostringstream buf;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
290
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
291 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
292
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
293 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
294
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
295 if (! fcn_nm.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
296 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
297 if (input_sys.gud_mode ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
298 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
299 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
300
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
301 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
302 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
303 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
304 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
305 // 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
306 // 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
307 // 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
308
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
309 if (! silent)
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 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
312
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
313 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
314 }
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 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
317
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
318 evmgr.set_workspace ();
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 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
321 fcn_nm, 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 (! silent)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
324 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
325 std::string line_buf;
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 if (caller)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
328 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
329
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
330 if (! line_buf.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
331 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
332 }
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 }
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 (silent)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
337 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
338
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
339 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
340
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
341 if (m_interpreter.server_mode ())
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 if (! stopped_in_msg.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
344 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
345
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
346 evmgr.push_event_queue ();
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 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
349
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
350 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
351
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
352 std::shared_ptr<push_parser>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
353 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
354
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
355 tw.set_parser (debug_parser);
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 server_loop ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
358 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
359 else
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 if (! stopped_in_msg.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
362 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
363
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
364 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
365 if (m_level > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
366 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
367
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
368 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
369 m_interpreter.PS1 (tmp_prompt);
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 if (! m_interpreter.interactive ())
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 void (interpreter::*interactive_fptr) (bool)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
374 = &interpreter::interactive;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
375 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
376 m_interpreter.interactive ());
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 m_interpreter.interactive (true);
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 // 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
381 // interpreter?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
382
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
383 application *app = application::app ();
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 if (app)
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 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
388 = &application::forced_interactive;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
389 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
390 app->forced_interactive ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
391
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
392 app->forced_interactive (true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
393 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
394 }
27533
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
395
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
396 #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
397
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
398 input_reader reader (m_interpreter);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
399
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
400 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
401
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
402 #else
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
403
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
404 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
405
0abe70896e34 use push parser in debug repl if enabled
John W. Eaton <jwe@octave.org>
parents: 27519
diff changeset
406 #endif
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
407
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
408 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
409
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
410 while (m_in_debug_repl)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
411 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
412 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
413 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
414
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
415 if (quitting_debugger ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
416 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
417
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
418 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
419 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
420 debug_parser.reset ();
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
421
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
422 #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
423
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
424 int retval = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
425
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
426 std::string prompt
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
427 = 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
428
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
429 do
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
430 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
431 bool eof = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
432 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
433
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
434 if (eof)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
435 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
436 retval = EOF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
437 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
438 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
439
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
440 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
441
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
442 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
443 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
444 while (retval < 0);
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
445
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
446 #else
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
447
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
448 int retval = debug_parser.run ();
29282
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
449
0280fd549502 make debugging possible in server mode
John W. Eaton <jwe@octave.org>
parents: 29281
diff changeset
450 #endif
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
451 if (command_editor::interrupt (false))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
452 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
453 // 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
454
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
455 quitting_debugger ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
456
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
457 break;
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 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
460 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
461 if (retval == 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
462 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
463 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
464 = debug_parser.statement_list ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
465
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
466 if (stmt_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
467 stmt_list->accept (tw);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
468
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
469 if (octave_completion_matches_called)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
470 octave_completion_matches_called = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
471
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
472 // 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
473 // 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
474 // 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
475 // 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
476 // 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
477 // 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
478 // 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
479 // 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
480 // fix this problem?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
481 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
482 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
483
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
484 octave_quit ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
485 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
486 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
487 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
488 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
489 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
490 es.display_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
491
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
492 // 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
493 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
494 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
495 catch (const quit_debug_exception& qde)
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 if (qde.all ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
498 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
499
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
500 // Continue in this debug level.
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 }
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
505
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
506 bool debugger::quitting_debugger () const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
507 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
508 if (m_execution_mode == EX_QUIT)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
509 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
510 // If 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
511 // 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
512
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
513 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
514 || 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
515 throw quit_debug_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
516 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
517 return true;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
520 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
521 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
522 // 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
523 // the same as dbcont.
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 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
526 throw quit_debug_exception (true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
527 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
528 return true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
529 }
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 false;
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 bool tree_evaluator::at_top_level () const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
535 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
536 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
537 }
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 std::string
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
540 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
541 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
542 std::string fname;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
543
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
544 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
545
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
546 if (fcn)
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 fname = fcn->fcn_file_name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
549
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
550 if (fname.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
551 fname = fcn->name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
552 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
553
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
554 if (opt == "fullpathext")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
555 return fname;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
556
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
557 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
558 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
559
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
560 if (epos <= dpos+1)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
561 epos = std::string::npos;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
562
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
563 if (epos != std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
564 fname = fname.substr (0, epos);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
565
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
566 if (opt == "fullpath")
27015
4d9e1a832a55 move core of mfilename function to evaluator
John W. Eaton <jwe@octave.org>
parents: 27014
diff changeset
567 return fname;
31809
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 if (dpos != std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
570 fname = fname.substr (dpos+1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
571
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
572 return fname;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
575 void tree_evaluator::parse_and_execute (const std::string& input,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
576 bool& incomplete_parse)
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 incomplete_parse = false;
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 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
581
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
582 if (at_top_level ())
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 dbstep_flag (0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
585 reset_debug_state ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
588 // 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
589 // that do the actual prompting?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
590
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
591 // 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
592 // 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
593 // 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
594 // 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
595 // 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
596
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
597 Vlast_prompt_time.stamp ();
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 bool eof = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
600
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
601 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
602
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
603 if (command_history::add (input))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
604 evmgr.append_history (input);
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 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
607
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
608 if (m_exit_status == 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
609 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
610 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
611 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
612
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
613 if (stmt_list)
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 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
616
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
617 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
618
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
619 evmgr.set_workspace ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
620 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
621 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
622 m_exit_status = EOF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
623 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
624 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
625 incomplete_parse = true;
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 // 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
628 // 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
629 // 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
630
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
631 if (m_exit_status == -1)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
632 m_exit_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
633 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
634 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
635
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
636 evmgr.pre_input_event ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
639 void tree_evaluator::get_line_and_eval ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
640 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
641 std::mutex mtx;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
642 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
643 std::condition_variable cv;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
644 bool incomplete_parse = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
645 bool evaluation_pending = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
646 bool exiting = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
647
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
648 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
649
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
650 while (true)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
651 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
652 // 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
653 // 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
654 // execution.
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::string ps
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
657 = 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
658
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
659 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
660
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
661 std::string input;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
662 std::getline (std::cin, input);
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 if (input.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
665 continue;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
666
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
667 incomplete_parse = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
668 evaluation_pending = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
669 exiting = false;
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 evmgr.post_event
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
672 ([&] (interpreter& interp)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
673 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
674 // INTERPRETER THREAD
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
675
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
676 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
677
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
678 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
679 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
680 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
681 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
682 catch (const exit_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
683 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
684 evaluation_pending = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
685 exiting = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
686 cv.notify_all ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
687 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
688 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
689 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
690 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
691 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
692
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
693 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
694 es.display_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
695
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
696 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
697 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
698 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
699 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
700 evaluation_pending = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
701 cv.notify_all ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
702 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
703 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
704 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
705 evaluation_pending = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
706 cv.notify_all ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
707 throw exit_exception (1);
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
710 catch (...)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
711 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
712 evaluation_pending = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
713 cv.notify_all ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
714 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
715 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
716
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
717 evaluation_pending = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
718 cv.notify_all ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
719 });
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
720
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
721 // 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
722 // again.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
723
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
724 cv.wait (lock, [&] { return ! evaluation_pending; });
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
725
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
726 if (exiting)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
727 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
728 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
729 }
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 int tree_evaluator::repl ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
732 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
733 // 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
734 // 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
735 // 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
736 // 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
737
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
738 int exit_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
739
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
740 // 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
741 // 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
742 // interactive sessions.
29846
78cb255c78a4 move top-level REPL from interpreter to evaluator
John W. Eaton <jwe@octave.org>
parents: 29832
diff changeset
743
78cb255c78a4 move top-level REPL from interpreter to evaluator
John W. Eaton <jwe@octave.org>
parents: 29832
diff changeset
744 #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
745 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
746 #else
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
747 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
748 #endif
78cb255c78a4 move top-level REPL from interpreter to evaluator
John W. Eaton <jwe@octave.org>
parents: 29832
diff changeset
749
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
750 // 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
751 // 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
752 // 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
753 // 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
754
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
755 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
756
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
757 if (m_interpreter.interactive ())
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 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
760 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
761 push_parser *pp
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
762 = new push_parser (m_interpreter,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
763 new input_reader (m_interpreter));
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 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
766 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
767 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
768 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
769 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
770 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
771 }
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 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
774 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
775 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
776 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
777 }
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 do
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 try
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 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
784
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
785 repl_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
786
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
787 if (at_top_level ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
788 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
789 dbstep_flag (0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
790 reset_debug_state ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
791 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
792
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
793 exit_status = repl_parser->run ();
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 if (exit_status == 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
796 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
797 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
798 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
799
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
800 if (stmt_list)
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 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
803
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
804 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
805 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
806 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
807 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
808 exit_status = EOF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
809 break;
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
812 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
813 catch (const interrupt_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 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
816
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
817 // 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
818 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
819 octave_stdout << "\n";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
820 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
821 catch (const index_exception& ie)
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 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
824
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
825 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
826 << 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
827 << std::endl;
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 catch (const execution_exception& ee)
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 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
832
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
833 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
834 es.display_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
835
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
836 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
837 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
838 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
839 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
840 // 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
841 exit_status = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
842 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
843 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
844 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
845 catch (const quit_debug_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 m_interpreter.recover_from_exception ();
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 // 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
850 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
851 catch (const std::bad_alloc&)
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 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
854
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
855 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
856 << std::endl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
857 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
858 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
859 while (exit_status == 0);
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 (exit_status == EOF)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
862 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
863 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
864 octave_stdout << "\n";
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 exit_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
867 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
868
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
869 return exit_status;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
870 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
871
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
872 int tree_evaluator::server_loop ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
873 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
874 // 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
875
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
876 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
877
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
878 m_exit_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
879
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
880 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
881 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
882
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
883 // 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
884 // 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
885 // 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
886 // 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
887 // segfaults in the test suite.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
888
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
889 do
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
890 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
891 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
892 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
893 // 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
894 // 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
895
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
896 octave_quit ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
897
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
898 // 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
899 // 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
900 // 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
901 // 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
902
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
903 command_editor::run_event_hooks ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
904
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
905 release_unreferenced_dynamic_libraries ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
906
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
907 sleep (0.1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
908 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
909 catch (const interrupt_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
910 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
911 octave_interrupt_state = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
912 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
913 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
914
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
915 // 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
916 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
917 octave_stdout << "\n";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
918 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
919 catch (const index_exception& e)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
920 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
921 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
922 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
923
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
924 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
925 << 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
926 << std::endl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
927 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
928 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
929 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
930 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
931
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
932 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
933 es.display_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
934
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
935 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
936 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
937 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
938 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
939 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
940 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
941 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
942 // 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
943 m_exit_status = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
944 break;
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
947 catch (const quit_debug_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
948 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
949 octave_interrupt_state = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
950 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
951 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
952 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
953 catch (const exit_exception& xe)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
954 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
955 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
956 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
957 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
958 catch (const std::bad_alloc&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
959 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
960 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
961 m_parser->reset ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
962
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
963 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
964 << std::endl;
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
967 while (m_exit_status == 0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
968
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
969 if (m_exit_status == EOF)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
970 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
971 if (m_interpreter.interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
972 octave_stdout << "\n";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
973
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
974 m_exit_status = 0;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
977 return m_exit_status;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
978 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
979
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
980 void tree_evaluator::eval (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
981 bool interactive)
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1044 if (stmt_list->length () == 1
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1085 octave_value tree_evaluator::eval_string (const std::string& eval_str,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1086 bool silent, int& parse_status)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1087 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1088 octave_value retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1089
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1090 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
1091
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1092 if (! tmp.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1093 retval = tmp(0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1094
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1095 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1096 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1097
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1098 octave_value_list tree_evaluator::eval_string (const octave_value& arg,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1099 bool silent, int& parse_status,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1100 int nargout)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1101 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1102 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
1103
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1104 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
1105 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1106
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1107 octave_value_list tree_evaluator::eval (const std::string& try_code,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1108 int nargout)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1109 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1110 int parse_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1111
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1112 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
1113 }
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 octave_value_list tree_evaluator::eval (const std::string& try_code,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1116 const std::string& catch_code,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1117 int nargout)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1118 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1119 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1120
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1121 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
1122
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1123 int parse_status = 0;
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 bool execution_error = false;
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 octave_value_list tmp;
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 try
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 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
1132 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1133 catch (const execution_exception& ee)
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 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1136 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1137
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1138 execution_error = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1139 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1140
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1141 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
1142 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1143 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
1144
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1145 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
1146 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1147 else
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 if (nargout > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1150 retval = tmp;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1151
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1152 // 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
1153 // 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
1154 // execution exception.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1155 if (execution_error)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1156 throw execution_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1157 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1158
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1159 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1160 }
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 octave_value_list tree_evaluator::evalin (const std::string& context,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1163 const std::string& try_code,
27019
6cb675912f2b move core of eval function to evaluator
John W. Eaton <jwe@octave.org>
parents: 27018
diff changeset
1164 int nargout)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1165 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1166 unwind_action act ([=] (std::size_t frm)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1167 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1168 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
1169 }, m_call_stack.current_frame ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1170
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1171 if (context == "caller")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1172 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
1173 else if (context == "base")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1174 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
1175 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1176 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
1177
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1178 int parse_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1179
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1180 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
1181 }
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 octave_value_list tree_evaluator::evalin (const std::string& context,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1184 const std::string& try_code,
27019
6cb675912f2b move core of eval function to evaluator
John W. Eaton <jwe@octave.org>
parents: 27018
diff changeset
1185 const std::string& catch_code,
6cb675912f2b move core of eval function to evaluator
John W. Eaton <jwe@octave.org>
parents: 27018
diff changeset
1186 int nargout)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1187 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1188 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1189
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1190 unwind_action act1 ([=] (std::size_t frm)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1191 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1192 m_call_stack.restore_frame (frm);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1193 }, m_call_stack.current_frame ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1194
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1195 if (context == "caller")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1196 m_call_stack.goto_caller_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1197 else if (context == "base")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1198 m_call_stack.goto_base_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1199 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1200 error (R"(evalin: CONTEXT must be "caller" or "base")");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1201
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1202 error_system& es = m_interpreter.get_error_system ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1203
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1204 int parse_status = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1205
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1206 bool execution_error = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1207
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1208 octave_value_list tmp;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1209
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1210 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1211 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1212 tmp = eval_string (try_code, nargout > 0, parse_status, nargout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1213 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1214 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1215 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1216 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1217 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1218
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1219 execution_error = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1220 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1221
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1222 if (parse_status != 0 || execution_error)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1223 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1224 tmp = eval_string (catch_code, nargout > 0, parse_status, nargout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1225
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1226 retval = (nargout > 0) ? tmp : octave_value_list ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1227 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1228 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1229 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1230 if (nargout > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1231 retval = tmp;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1232
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1233 // FIXME: we should really be rethrowing whatever
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1234 // exception occurred, not just throwing an
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1235 // execution exception.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1236 if (execution_error)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1237 throw execution_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1238 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1239
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1240 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1241 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1242
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1243 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1244 tree_evaluator::visit_anon_fcn_handle (tree_anon_fcn_handle&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1245 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1246 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1247 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1248
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1249 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1250 tree_evaluator::visit_argument_list (tree_argument_list&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1251 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1252 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1253 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1254
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1255 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1256 tree_evaluator::visit_arguments_block (tree_arguments_block&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1257 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1258 warning ("function arguments validation blocks are not supported; INCORRECT RESULTS ARE POSSIBLE");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1259 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1260
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1261 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1262 tree_evaluator::visit_args_block_attribute_list (tree_args_block_attribute_list&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1263 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1264 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1265 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1266
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1267 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1268 tree_evaluator::visit_args_block_validation_list (tree_args_block_validation_list&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1269 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1270 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1271 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1272
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1273 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1274 tree_evaluator::visit_arg_validation (tree_arg_validation&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1275 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1276 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1277 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1278
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1279 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1280 tree_evaluator::visit_arg_size_spec (tree_arg_size_spec&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1281 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1282 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1283 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1284
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1285 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1286 tree_evaluator::visit_arg_validation_fcns (tree_arg_validation_fcns&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1287 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1288 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1289 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1290
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1291 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1292 tree_evaluator::visit_binary_expression (tree_binary_expression&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1293 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1294 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1295 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1296
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1297 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1298 tree_evaluator::visit_boolean_expression (tree_boolean_expression&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1299 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1300 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1301 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1302
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1303 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1304 tree_evaluator::visit_compound_binary_expression (tree_compound_binary_expression&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1305 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1306 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1307 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1308
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1309 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1310 tree_evaluator::visit_break_command (tree_break_command& cmd)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1311 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1312 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1313 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1314 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1315 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1316 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1317 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1318 m_echo_file_pos = line + 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1319 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1320
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1321 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1322 do_breakpoint (cmd.is_active_breakpoint (*this));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1323
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1324 if (m_in_loop_command)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1325 m_breaking = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1326 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1327 error ("break must appear in a loop in the same file as loop command");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1328 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1329
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1330 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1331 tree_evaluator::visit_colon_expression (tree_colon_expression&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1332 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1333 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1334 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1335
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1336 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1337 tree_evaluator::visit_continue_command (tree_continue_command& cmd)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1338 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1339 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1340 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1341 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1342 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1343 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1344 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1345 m_echo_file_pos = line + 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1346 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1347
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1348 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1349 do_breakpoint (cmd.is_active_breakpoint (*this));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1350
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1351 if (m_in_loop_command)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1352 m_continuing = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1353 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1354
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1355 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1356 tree_evaluator::statement_printing_enabled ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1357 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1358 return ! (m_silent_functions && (m_statement_context == SC_FUNCTION
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1359 || m_statement_context == SC_SCRIPT));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1360 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1361
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1362 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1363 tree_evaluator::reset_debug_state ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1364 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1365 m_debug_mode = (m_bp_table.have_breakpoints ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1366 || m_dbstep_flag != 0
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1367 || m_break_on_next_stmt
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1368 || in_debug_repl ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1369 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1372 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
1373 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1374 m_debug_mode = mode;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1375 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1376
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1377 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1378 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
1379 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1380 unwind_protect frame;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1381
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1382 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
1383 command_history::ignoring_entries ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1384
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1385 command_history::ignore_entries (false);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1386
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1387 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
1388 m_call_stack.current_frame ());
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 // 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
1391 // into deeper levels of debugging.
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 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
1394
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1395 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
1396
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1397 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
1398 es.debug_on_warning ());
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 es.debug_on_error (false);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1401 es.debug_on_warning (false);
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 // 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
1404
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1405 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
1406
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1407 // 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
1408 // 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
1409 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1410 // 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
1411 // stmt.accept (tpc);
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 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
1414
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1415 m_debugger_stack.push (dbgr);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1416
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1417 frame.add ([=] ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1418 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1419 delete m_debugger_stack.top ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1420 m_debugger_stack.pop ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1421 reset_debug_state ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1422 });
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1423
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1424 dbgr->repl (prompt);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1425 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1426
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1427 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1428 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
1429 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1430 enter_debugger (prompt);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1431 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1432
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1433 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1434 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
1435 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1436 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
1437 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1438
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1439 Matrix
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1440 tree_evaluator::ignored_fcn_outputs () const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1441 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1442 Matrix retval;
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 const std::list<octave_lvalue> *lvalues = m_lvalue_list;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1445
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1446 if (! lvalues)
23481
73558a835b64 eliminate lvalue list arguments from evaluator functions
John W. Eaton <jwe@octave.org>
parents: 23470
diff changeset
1447 return retval;
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1448
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1449 octave_idx_type nbh = 0;
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 for (const auto& lval : *lvalues)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1452 nbh += lval.is_black_hole ();
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 if (nbh > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1455 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1456 retval.resize (1, nbh);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1457
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1458 octave_idx_type k = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1459 octave_idx_type l = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1460
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1461 for (const auto& lval : *lvalues)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1462 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1463 if (lval.is_black_hole ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1464 retval(l++) = k+1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1465
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1466 k += lval.numel ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1467 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1468 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1469
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1470 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1471 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1472
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1473 // 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
1474 // corresponding function name ("plus", "minus", ...).
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1475
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1476 static std::string
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1477 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
1478 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1479 // 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
1480
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1481 // 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
1482 // 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
1483 // 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
1484 // string compares.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1485
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1486 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
1487
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1488 if (len == 2)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1489 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1490 if (name[0] == '.')
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1491 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1492 switch (name[1])
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1493 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1494 case '\'':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1495 return "transpose";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1496
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1497 case '*':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1498 return "times";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1499
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1500 case '/':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1501 return "rdivide";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1502
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1503 case '^':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1504 return "power";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1505
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1506 case '\\':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1507 return "ldivide";
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 default:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1510 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1511 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1512 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1513 else if (name[1] == '=')
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1514 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1515 switch (name[0])
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1516 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1517 case '<':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1518 return "le";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1519
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1520 case '=':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1521 return "eq";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1522
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1523 case '>':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1524 return "ge";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1525
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1526 case '~':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1527 case '!':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1528 return "ne";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1529
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1530 default:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1531 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1532 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1533 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1534 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1535 else if (len == 1)
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 switch (name[0])
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1538 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1539 case '~':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1540 case '!':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1541 return "not";
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 case '\'':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1544 return "ctranspose";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1545
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1546 case '+':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1547 return "plus";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1548
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1549 case '-':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1550 return "minus";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1551
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1552 case '*':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1553 return "mtimes";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1554
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 "mrdivide";
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 case '^':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1559 return "mpower";
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 case '\\':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1562 return "mldivide";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1563
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1564 case '<':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1565 return "lt";
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 return "gt";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1569
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1570 case '&':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1571 return "and";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1572
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1573 case '|':
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1574 return "or";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1575
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1576 default:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1577 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1578 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1579 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1580
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1581 return name;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1584 // 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
1585 // 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
1586
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1587 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1588 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
1589 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1590 octave_value retval;
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 // 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
1593 // 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
1594 // 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
1595 // 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
1596
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1597 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
1598
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1599 // 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
1600 // 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
1601 // 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
1602 // 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
1603
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1604 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
1605
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1606 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
1607
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1608 if (pos != std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1609 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1610 // 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
1611 // 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
1612 // 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
1613 // 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
1614 // 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
1615 // exactly two elements?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1616 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1617 // object . method
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1618 // object . static-method
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 // 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
1621
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1622 // 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
1623
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1624 // 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
1625 // way to simplify it?
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 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
1628
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1629 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
1630 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1631 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
1632
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1633 // 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
1634 // 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
1635
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1636 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
1637
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1638 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
1639 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1640 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
1641
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1642 if (cdef)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1643 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1644 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
1645
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1646 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
1647
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1648 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
1649
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1650 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
1651
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1652 if (meth.ok ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1653 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1654 // 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
1655 // 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
1656 // 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
1657 // 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
1658 // simple function handle.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1659
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1660 if (meth.is_static ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1661 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
1662 else
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 meth_fcn = meth.get_function ();
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 octave_fcn_handle *fh
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1667 = 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
1668 class_nm, meth_nm);
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 return octave_value (fh);
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 }
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 }
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1677 // 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
1678 // 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
1679 // 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
1680
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1681 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
1682 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1683
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1684 // 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
1685 // 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
1686 // 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
1687 // 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
1688 // functions:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1689 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1690 // nested functions (and subfunctions)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1691 // 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
1692 // private function
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1693 // class method
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1694 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1695 // 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
1696 // 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
1697
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1698 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
1699
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1700 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
1701
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1702 if (curr_scope)
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 octave_value ov_fcn
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1705 = 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
1706
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1707 // 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
1708 // frame for that function.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1709
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1710 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
1711 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
1712
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1713 if (ov_fcn.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1714 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1715 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
1716
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1717 if (fcn->is_nested_function ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1718 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1719 if (! name_is_operator)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1720 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1721 // 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
1722 // function.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1723
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1724 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
1725 = 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
1726
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1727 // 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
1728 // 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
1729 // 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
1730 // 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
1731 // the current stack frame.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1732
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1733 // 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
1734 // 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
1735 // 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
1736 // 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
1737 // 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
1738
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1739 if (curr_fcn
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1740 && (fcn_name == curr_fcn->name ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1741 || 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
1742 frame = frame->access_link ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1743
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1744 octave_fcn_handle *fh
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1745 = 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
1746
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1747 return octave_value (fh);
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1750 else if (fcn->is_subfunction ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1751 /* || fcn->is_localfunction () */
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1752 || fcn->is_private_function ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1753 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1754 // 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
1755 // or private function).
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1756
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1757 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
1758
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1759 octave_fcn_handle *fh
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1760 = 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
1761
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1762 return octave_value (fh);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1763 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1764 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1765
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1766 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
1767 || curr_fcn->is_class_constructor ()))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1768 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1769 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
1770
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1771 octave_value ov_meth
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1772 = 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
1773
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1774 if (ov_meth.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1775 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1776 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
1777
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1778 // 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
1779 // 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
1780 // that it is a method?
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 if (fcn->is_class_method ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1783 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1784 // 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
1785 // 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
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 (dispatch_class, fcn_name);
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1795
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1796 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
1797
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1798 // 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
1799 // 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
1800
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1801 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
1802 }
28433
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1803
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1804 /*
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1805 %!test
31464
344e1152ed88 remove operators deprecated in version 7
John W. Eaton <jwe@octave.org>
parents: 30919
diff changeset
1806 %! x = {".'", "transpose";
28433
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1807 %! ".*", "times";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1808 %! "./", "rdivide";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1809 %! ".^", "power";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1810 %! ".\\", "ldivide";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1811 %! "<=", "le";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1812 %! "==", "eq";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1813 %! ">=", "ge";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1814 %! "!=", "ne";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1815 %! "~=", "ne";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1816 %! "~", "not";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1817 %! "!", "not";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1818 %! "\'", "ctranspose";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1819 %! "+", "plus";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1820 %! "-", "minus";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1821 %! "*", "mtimes";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1822 %! "/", "mrdivide";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1823 %! "^", "mpower";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1824 %! "\\", "mldivide";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1825 %! "<", "lt";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1826 %! ">", "gt";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1827 %! "&", "and";
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1828 %! "|", "or"};
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1829 %! for i = 1:rows (x)
d05a4194f1ad move make_fcn_handle to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 28430
diff changeset
1830 %! 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
1831 %! endfor
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
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1834 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1835 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
1836 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1837 // 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
1838
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1839 tree_identifier *id = elt->ident ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1840
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1841 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
1842 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1843
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1844 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1845 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
1846 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1847 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
1848 = 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
1849
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1850 return frame->is_variable (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1851 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1852
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1853 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1854 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
1855 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1856 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
1857 = 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
1858
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1859 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
1860 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1861
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1862 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1863 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
1864 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1865 if (expr->is_identifier ())
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 const tree_identifier *id
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1868 = 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
1869
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1870 if (id->is_black_hole ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1871 return false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1872
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1873 return is_variable (id->symbol ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1874 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1875
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1876 return false;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1879 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1880 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
1881 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1882 if (expr->is_identifier ())
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 const tree_identifier *id
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1885 = 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
1886
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1887 return is_defined (id->symbol ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1888 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1889
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1890 return false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1891 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1892
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1893 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1894 tree_evaluator::is_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
1895 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1896 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
1897 = 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
1898
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1899 return frame->is_variable (sym);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1902 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1903 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
1904 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1905 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
1906 = 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
1907
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1908 return frame->is_defined (sym);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1911 bool tree_evaluator::is_global (const std::string& name) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1912 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1913 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
1914 = 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
1915
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1916 return frame->is_global (name);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1919 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1920 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
1921 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1922 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
1923 = 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
1924
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1925 return frame->varval (sym);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1928 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1929 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
1930 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1931 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
1932 = 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
1933
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1934 return frame->varval (name);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1937 void tree_evaluator::install_variable (const std::string& name,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1938 const octave_value& value,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1939 bool global)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1940 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1941 std::shared_ptr<stack_frame> frame
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1942 = m_call_stack.get_current_stack_frame ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1943
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1944 return frame->install_variable (name, value, global);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1945 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1946
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1947 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1948 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
1949 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1950 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
1951 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1952
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1953 octave_value&
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1954 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
1955 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1956 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
1957 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1958
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1959 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1960 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
1961 const octave_value& val)
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 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
1964 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1965
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1966 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1967 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
1968 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1969 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
1970 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1971
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1972 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1973 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
1974 const octave_value& val)
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 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
1977 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1978
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1979 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1980 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
1981 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1982 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
1983 = 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
1984
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1985 frame->assign (name, val);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1986 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1987
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1988 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1989 tree_evaluator::assignin (const std::string& context,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1990 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
1991 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1992 // 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
1993 // 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
1994 // calling assign on that?
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 unwind_action act ([=] (std::size_t frm)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1997 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
1998 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
1999 }, m_call_stack.current_frame ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2000
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2001 if (context == "caller")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2002 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
2003 else if (context == "base")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2004 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
2005 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2006 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
2007
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2008 if (valid_identifier (name))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2009 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2010 // 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
2011 // 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
2012 // already been checked.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2013
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2014 if (iskeyword (name))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2015 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
2016 name.c_str ());
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 assign (name, val);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2019 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2020 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2021 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
2022 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2023
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2024 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2025 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
2026 const std::string& context,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2027 bool verbose, bool require_file)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2028 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2029 // 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
2030 // 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
2031 // 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
2032 // written as
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2033 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2034 // foo1.m:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2035 // ------
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2036 // foo2
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 // foo2.m:
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 // foo1
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2041 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2042 // and called with
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 // foo1
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2045 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2046 // (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
2047 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2048 // foo1.m:
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 // source ("foo2.m")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2051 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2052 // foo2.m:
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 // source ("foo1.m")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2055 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2056 // and called with
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2057 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2058 // source ("foo1.m")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2059 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2060 // (for example).
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2061
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2062 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
2063
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2064 std::string file_full_name
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2065 = 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
2066
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2067 std::size_t pos
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2068 = 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
2069
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2070 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
2071
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2072 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
2073
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2074 unwind_protect frame;
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 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
2077 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
2078
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2079 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
2080
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2081 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
2082
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2083 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
2084 error ("max_recursion_depth exceeded");
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 if (! context.empty ())
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 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
2089 m_call_stack.current_frame ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2090
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2091 if (context == "caller")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2092 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
2093 else if (context == "base")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2094 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
2095 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2096 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
2097 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2098
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2099 // 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
2100 std::size_t dir_end
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2101 = 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
2102 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
2103
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2104 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
2105 if (extension == std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2106 extension = file_name.length ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2107
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2108 std::string 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
2109 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
2110
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2111 // 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
2112 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
2113 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
2114
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2115 // 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
2116 // functions.
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 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
2119 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2120 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
2121
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2122 if (! code
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2123 || (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
2124 != full_name))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2125 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2126 // 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
2127 ov_code = octave_value ();
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2130 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2131 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2132 // 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
2133 ov_code = octave_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2134 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2135
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2136 // 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
2137 // file, load.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2138
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2139 if (ov_code.is_undefined ())
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 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2142 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2143 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
2144 file_name, dir_name, "", "",
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2145 require_file, true, false, false);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2146 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2147 catch (execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2148 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2149 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
2150 file_full_name.c_str ());
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2153
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2154 // 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
2155
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2156 if (ov_code.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2157 return;
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 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
2160 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
2161
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2162 if (verbose)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2163 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2164 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
2165 octave_stdout.flush ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2166 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2167
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2168 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
2169
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2170 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
2171
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2172 if (verbose)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2173 octave_stdout << "done." << std::endl;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2174 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2175
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2176 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2177 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
2178 const octave_value& val)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2179 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2180 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
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 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2184 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
2185 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2186 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
2187 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2190 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
2191 (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
2192 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2193 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
2194 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2195
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2196 int i = -1;
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 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
2199 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2200 i++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2201
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2202 octave_lvalue ref = elt->lvalue (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2203
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2204 if (i < args.length ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2205 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2206 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
2207 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2208 if (! eval_decl_elt (elt))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2209 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
2210 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2211 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2212 ref.define (args(i));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2213 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2214 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2215 eval_decl_elt (elt);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2216 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2217 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2218
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2219 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2220 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
2221 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2222 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
2223 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2224 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
2225
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2226 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
2227 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2228 }
25382
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2229
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2230 // END is documented in op-kw-docs.
29968
7aa4d8c049e5 eliminate obsolete DEFCONSTFUN and DEFCONSTMETHOD macros
John W. Eaton <jwe@octave.org>
parents: 29961
diff changeset
2231 DEFMETHOD (end, interp, args, ,
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2232 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
2233 @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
2234 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
2235 @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
2236 @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
2237
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2238 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
2239 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
2240
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2241 Example:
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2242
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2243 @example
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2244 @group
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2245 @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
2246 @var{x}(1,end)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2247 @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
2248 @var{x}(end,1)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2249 @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
2250 @var{x}(end,end)
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2251 @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
2252 @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
2253 @end example
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2254 @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
2255 @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
2256 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2257 tree_evaluator& tw = interp.get_evaluator ();
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 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
2260 }
749d9e858553 move convert_to_const_vector from tree_argument_list to tree_evaluator
John W. Eaton <jwe@octave.org>
parents: 25381
diff changeset
2261
27100
b453b586da16 improve error message when indexing undefined object with "end" (bug #33637)
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
2262 /*
28617
0bac488f17fa throw error if 'end' is applied to undefined symbol (bug #58830)
John W. Eaton <jwe@octave.org>
parents: 28560
diff changeset
2263 %!test <*58830>
0bac488f17fa throw error if 'end' is applied to undefined symbol (bug #58830)
John W. Eaton <jwe@octave.org>
parents: 28560
diff changeset
2264 %! 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
2265 %! "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
2266
30322
552239d43c18 update bug status
John W. Eaton <jwe@octave.org>
parents: 29847
diff changeset
2267 %!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
2268 %! 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
2269 %! 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
2270 %! 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
2271 %! 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
2272 */
b453b586da16 improve error message when indexing undefined object with "end" (bug #33637)
John W. Eaton <jwe@octave.org>
parents: 27037
diff changeset
2273
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2274 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2275 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
2276 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2277 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
2278
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2279 for (auto elt : *args)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2280 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2281 // 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
2282
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2283 if (! elt)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2284 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2285
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2286 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
2287
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2288 if (tmp.is_cs_list ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2289 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2290 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
2291
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2292 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
2293 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
2294 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2295 else if (tmp.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2296 arg_vals.push_back (tmp);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2297 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2298
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2299 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
2300 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2301
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2302 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2303 tree_evaluator::convert_return_list_to_const_vector
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2304 (tree_parameter_list *ret_list, int nargout, const Matrix& ignored_outputs,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2305 const Cell& varargout)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2306 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2307 octave_idx_type vlen = varargout.numel ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2308 int len = ret_list->length ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2309
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2310 // 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
2311 if (len == 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2312 return varargout;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2313 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2314 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2315 int i = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2316 int k = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2317 int num_ignored = ignored_outputs.numel ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2318 int ignored = num_ignored > 0 ? ignored_outputs(k) - 1 : -1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2319
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2320 if (nargout <= len)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2321 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2322 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
2323 octave_value_list retval (nout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2324
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2325 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
2326 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2327 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
2328 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2329
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2330 if (ignored >= 0 && i == ignored)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2331 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2332 i++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2333 k++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2334 ignored = k < num_ignored ? ignored_outputs(k) - 1 : -1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2335 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2336 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2337 retval(i++) = evaluate (elt);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2338
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2339 if (i == nout)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2340 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2341 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2342
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2343 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2344 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2345 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2346 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2347 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
2348
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2349 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
2350 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2351 if (ignored >= 0 && i == ignored)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2352 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2353 i++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2354 k++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2355 ignored = k < num_ignored ? ignored_outputs(k) - 1 : -1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2356 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2357 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2358 retval(i++) = evaluate (elt);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2359 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2360
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2361 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
2362 retval(i++) = varargout(j);
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 return retval;
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 }
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2369 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2370 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
2371 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2372 bool retval = false;
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 tree_identifier *id = elt->ident ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2375 tree_expression *expr = elt->expression ();
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 if (id && expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2378 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2379 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
2380
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2381 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
2382
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2383 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
2384
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2385 retval = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2386 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2387
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2388 return retval;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2391 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2392 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
2393 const octave_value& val)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2394 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2395 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
2396
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2397 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
2398
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2399 if (label_value.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2400 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2401 if (label_value.iscell ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2402 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2403 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
2404
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2405 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
2406 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2407 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
2408 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2409 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
2410
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2411 if (match)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2412 return true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2413 }
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2416 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2417 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
2418 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2419
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2420 return false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2421 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2422
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2423 void tree_evaluator::push_stack_frame (const symbol_scope& scope)
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 m_call_stack.push (scope);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2426 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2427
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2428 void tree_evaluator::push_stack_frame (octave_user_function *fcn,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2429 const std::shared_ptr<stack_frame>& closure_frames)
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 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
2432 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2433
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2434 void tree_evaluator::push_stack_frame (octave_user_function *fcn,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2435 const 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
2436 const std::shared_ptr<stack_frame>& closure_frames)
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 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
2439 }
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 void tree_evaluator::push_stack_frame (octave_user_script *script)
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 m_call_stack.push (script);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2446 void tree_evaluator::push_stack_frame (octave_function *fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2447 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2448 m_call_stack.push (fcn);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2449 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2450
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2451 void tree_evaluator::pop_stack_frame ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2452 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2453 m_call_stack.pop ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2456 int tree_evaluator::current_line () const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2457 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2458 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
2459 }
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 int tree_evaluator::current_column () const
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 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
2464 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2465
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2466 int tree_evaluator::debug_user_code_line () const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2467 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2468 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
2469 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2470
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2471 int tree_evaluator::debug_user_code_column () const
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 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
2474 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2475
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2476 void tree_evaluator::debug_where (std::ostream& os) const
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 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
2479
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2480 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
2481 }
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 octave_user_code * tree_evaluator::current_user_code () const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2484 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2485 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
2486 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2487
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2488 unwind_protect * tree_evaluator::curr_fcn_unwind_protect_frame ()
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 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
2491 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2492
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2493 octave_user_code * tree_evaluator::debug_user_code () const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2494 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2495 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
2496 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2497
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2498 octave_function * tree_evaluator::current_function (bool skip_first) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2499 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2500 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
2501 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2502
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2503 octave_function * tree_evaluator::caller_function () const
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 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
2506 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2507
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2508 bool tree_evaluator::goto_frame (std::size_t n, bool verbose)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2509 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2510 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
2511 }
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 void tree_evaluator::goto_caller_frame ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2514 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2515 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
2516 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2517
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2518 void tree_evaluator::goto_base_frame ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2519 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2520 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
2521 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2522
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2523 void tree_evaluator::restore_frame (std::size_t n)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2524 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2525 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
2526 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2527
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2528 std::string tree_evaluator::get_dispatch_class () const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2529 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2530 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
2531 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2532
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2533 void tree_evaluator::set_dispatch_class (const std::string& class_name)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2534 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2535 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
2536 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2537
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2538 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2539 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
2540 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2541 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
2542 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2543
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2544 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2545 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
2546 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2547 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
2548 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2549
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2550 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
2551 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
2552 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2553 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
2554 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2555
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2556 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
2557 tree_evaluator::backtrace_frames () const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2558 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2559 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
2560 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2561
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2562 std::list<frame_info>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2563 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
2564 bool print_subfn) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2565 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2566 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
2567 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2568
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2569 std::list<frame_info> tree_evaluator::backtrace_info () const
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.backtrace_info ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2574 octave_map
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2575 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
2576 bool print_subfn) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2577 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2578 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
2579 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2580
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2581 octave_map tree_evaluator::backtrace () const
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.backtrace ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2586 octave_map tree_evaluator::empty_backtrace () const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2587 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2588 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
2589 }
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 std::string tree_evaluator::backtrace_message () const
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 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
2594
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2595 std::ostringstream buf;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2596
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2597 for (const auto& frm : frames)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2598 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2599 buf << " " << frm.fcn_name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2600
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2601 int line = frm.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2602
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2603 if (line > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2604 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2605 buf << " at line " << line;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2606
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2607 int column = frm.column ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2608
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2609 if (column > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2610 buf << " column " << column;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2611
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2612 buf << "\n";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2613 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2614 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2615
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2616 return buf.str ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2617 }
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 void tree_evaluator::push_dummy_scope (const std::string& name)
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 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
2622
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2623 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
2624 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2625
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2626 void tree_evaluator::pop_scope ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2627 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2628 m_call_stack.pop ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2629 }
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 symbol_scope tree_evaluator::get_top_scope () const
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 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
2634 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2635
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2636 symbol_scope tree_evaluator::get_current_scope () const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2637 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2638 return m_call_stack.current_scope ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2639 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2640
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2641 void tree_evaluator::mlock (bool skip_first) const
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 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
2644
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2645 if (! fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2646 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
2647
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2648 if (fcn->is_builtin_function ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2649 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2650 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
2651 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2652 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2653
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2654 fcn->lock ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2655 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2656
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2657 void tree_evaluator::munlock (bool skip_first) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2658 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2659 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
2660
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2661 if (! fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2662 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
2663
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2664 if (fcn->is_builtin_function ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2665 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2666 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
2667 return;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2670 fcn->unlock ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2671 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2672
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2673 bool tree_evaluator::mislocked (bool skip_first) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2674 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2675 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
2676
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2677 if (! fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2678 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
2679
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2680 return fcn->islocked ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2683 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2684 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
2685 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2686 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
2687 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2688
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2689 void tree_evaluator::display_call_stack () 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 m_call_stack.display ();
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 octave_value tree_evaluator::find (const std::string& name)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2695 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2696 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
2697 = 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
2698
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2699 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
2700
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2701 if (val.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2702 return val;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2703
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2704 // 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
2705 // 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
2706 // from a .m file.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2707
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2708 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
2709
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2710 if (fcn.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2711 return fcn;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2712
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2713 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
2714
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2715 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
2716 }
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 void tree_evaluator::clear_objects ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2719 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2720 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
2721 = 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
2722
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2723 frame->clear_objects ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2726 void tree_evaluator::clear_variable (const std::string& name)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2727 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2728 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
2729 = 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
2730
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2731 frame->clear_variable (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2732 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2733
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2734 void tree_evaluator::clear_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
2735 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2736 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
2737 = 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
2738
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2739 frame->clear_variable_pattern (pattern);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2742 void tree_evaluator::clear_variable_regexp (const std::string& pattern)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2743 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2744 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
2745 = 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
2746
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2747 frame->clear_variable_regexp (pattern);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2750 void tree_evaluator::clear_variables ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2751 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2752 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
2753 = 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
2754
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2755 frame->clear_variables ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2758 void tree_evaluator::clear_global_variable (const std::string& name)
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 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
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2764 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
2765 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2766 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
2767 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2768
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2769 void tree_evaluator::clear_global_variable_regexp(const std::string& pattern)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2770 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2771 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
2772 }
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 void tree_evaluator::clear_global_variables ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2775 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2776 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
2777 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2778
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2779 void tree_evaluator::clear_all (bool force)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2780 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2781 // 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
2782
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2783 clear_variables ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2784 clear_global_variables ();
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 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
2787
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2788 symtab.clear_functions (force);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2791 void tree_evaluator::clear_symbol (const std::string& name)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2792 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2793 // 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
2794
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2795 clear_variable (name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2796
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2797 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
2798
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2799 symtab.clear_function (name);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2802 void tree_evaluator::clear_symbol_pattern (const std::string& pattern)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2803 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2804 // 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
2805
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2806 clear_variable_pattern (pattern);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2807
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2808 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
2809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2810 symtab.clear_function_pattern (pattern);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2811 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2812
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2813 void tree_evaluator::clear_symbol_regexp (const std::string& pattern)
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 // 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
2816
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2817 clear_variable_regexp (pattern);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2818
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2819 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
2820
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2821 symtab.clear_function_regexp (pattern);
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 std::list<std::string> tree_evaluator::global_variable_names () const
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 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
2827 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2828
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2829 std::list<std::string> tree_evaluator::top_level_variable_names () const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2830 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2831 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
2832 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2833
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2834 std::list<std::string> tree_evaluator::variable_names () const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2835 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2836 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
2837 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2838
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2839 // 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
2840 // 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
2841 // current call stack.
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 octave_user_code *
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2844 tree_evaluator::get_user_code (const std::string& fname,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2845 const std::string& class_name)
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 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
2848
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2849 if (fname.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2850 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
2851 else
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::string name = fname;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2854
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2855 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
2856 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2857 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
2858 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
2859 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
2860 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2861
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2862 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
2863
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2864 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
2865 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
2866
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2867 if (name.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2868 return nullptr;
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 octave_value fcn;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2873 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
2874
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2875 if (name[0] == '@')
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2876 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2877 std::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
2878
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2879 if (p1 == std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2880 return nullptr;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2881
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2882 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
2883
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2884 p2 = name.find ('>', p1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2885
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2886 std::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
2887
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2888 fcn = symtab.find_method (method, dispatch_type);
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 else if (! class_name.empty ())
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 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
2893
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2894 fcn = cdm.find_method (class_name, name);
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 // 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
2897 if (fcn.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2898 fcn = symtab.find_method (name, class_name);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2899 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2900 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2901 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2902 p2 = name.find ('>');
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2903
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2904 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
2905
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2906 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
2907 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2908
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2909 // 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
2910 std::string subfuns;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2911
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2912 if (p2 != std::string::npos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2913 subfuns = name.substr (p2+1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2914
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2915 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
2916 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
2917
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2918 if (! user_code || subfuns.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2919 return user_code;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2920
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2921 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
2922
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2923 if (fcn.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2924 return nullptr;
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 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
2927 }
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 return user_code;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2932 std::string
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2933 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
2934 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2935 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
2936
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2937 if (curfcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2938 return curfcn->name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2939
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2940 return "";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2941 }
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 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2944 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
2945 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2946 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
2947 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2950 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
2951 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2952 if (m_echo_state)
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 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2955 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2956 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2957 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2958 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
2959 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2960
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2961 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2962 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
2963
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2964 // 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
2965 // really have an accept method?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2966
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2967 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
2968
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2969 if (init_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2970 init_list->accept (*this);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2973 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2974 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
2975 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2976 tree_identifier *id = elt.ident ();
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 if (id)
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 if (elt.is_global ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2981 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
2982 else if (elt.is_persistent ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2983 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
2984 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2985 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
2986
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2987 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
2988
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2989 if (ult.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2990 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2991 tree_expression *expr = elt.expression ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2992
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2993 octave_value init_val;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2994
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2995 if (expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2996 init_val = expr->evaluate (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2997 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2998 init_val = Matrix ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
2999
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3000 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
3001 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3002 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3003 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3004
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3005 template <typename T>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3006 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3007 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
3008 octave_lvalue& ult,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3009 tree_statement_list *loop_body)
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 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
3012
32095
28ef2991fb5a Emit warning about infinite loop if for loop range starts with infinite value.
Rik <rik@octave.org>
parents: 31827
diff changeset
3013 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
3014 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
3015 "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
3016 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
3017
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3018 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
3019 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3020 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3021 m_echo_file_pos = line;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3022
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3023 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
3024
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3025 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
3026
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3027 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3028 loop_body->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3029
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3030 if (quit_loop_now ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3031 break;
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 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3036 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
3037 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3038 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3039 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3040 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3041
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3042 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3043 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3044 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3045 line++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3046 }
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 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3049 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
3050
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3051 // 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
3052 // and cmd.maxproc_expr ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3053
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3054 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
3055
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3056 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
3057
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3058 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
3059
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3060 if (rhs.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3061 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3062
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3063 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
3064
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3065 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
3066
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3067 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
3068
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3069 if (rhs.is_range ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3070 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3071 // 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
3072
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3073 if (rhs.is_double_type ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3074 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3075 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
3076 return;
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
31827
c8dd3da44e83 maint: Remove `#if 0` commented-out code from the codebase.
Arun Giridhar <arungiridhar@gmail.com>
parents: 31809
diff changeset
3079 // 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
3080 }
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 if (rhs.is_scalar_type ())
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 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3085 m_echo_file_pos = line;
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 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
3088
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3089 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3090 loop_body->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3091
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3092 // 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
3093 quit_loop_now ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3094
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3095 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3096 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3097
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3098 // 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
3099 // 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
3100
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3101 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
3102 || rhs.is_string () || rhs.isstruct ())
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 // 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
3105 // columns.
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 dim_vector dv = rhs.dims ().redim (2);
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 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
3110 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
3111
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3112 octave_value arg = rhs;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3113 if (rhs.ndims () > 2)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3114 arg = arg.reshape (dv);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3115
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3116 if (nrows > 0 && steps > 0)
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 octave_value_list idx;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3119 octave_idx_type iidx;
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 // 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
3122 if (nrows == 1)
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 idx.resize (1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3125 iidx = 0;
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 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3128 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3129 idx.resize (2);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3130 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
3131 iidx = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3132 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3133
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3134 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
3135 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3136 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3137 m_echo_file_pos = line;
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 // 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
3140 idx(iidx) = i;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3141 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
3142
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3143 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
3144
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3145 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3146 loop_body->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3147
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3148 if (quit_loop_now ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3149 break;
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3152 else
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 // 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
3155 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
3156 }
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 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3159 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3160
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3161 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
3162 cmd.line (), cmd.column ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3163 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3164
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3165 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3166 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
3167 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3168 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3169 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3170 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3171
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3172 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3173 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3174 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3175 line++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3176 }
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 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3179 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
3180
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3181 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
3182
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3183 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
3184
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3185 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
3186
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3187 if (rhs.is_undefined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3188 return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3189
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3190 if (! rhs.isstruct ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3191 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
3192
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3193 // 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
3194 // 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
3195 // structure element.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3196
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3197 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
3198
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3199 auto p = lhs->begin ();
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 tree_expression *elt = *p++;
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 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
3204
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3205 elt = *p;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3206
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3207 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
3208
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3209 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
3210
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3211 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
3212
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3213 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
3214
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3215 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
3216
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3217 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
3218 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3219 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3220 m_echo_file_pos = line;
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 std::string key = keys[i];
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3223
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3224 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
3225
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3226 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
3227
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3228 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
3229
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3230 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
3231 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
3232
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3233 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3234 loop_body->accept (*this);
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 if (quit_loop_now ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3237 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3238 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3239 }
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 void tree_evaluator::visit_spmd_command (tree_spmd_command& cmd)
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 // 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
3244
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3245 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
3246
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3247 if (body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3248 body->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3249 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3250
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3251 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3252 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
3253 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3254 // 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
3255 // 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
3256
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3257 symbol_scope new_scope;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3258 symbol_scope scope = afh.scope ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3259 if (scope)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3260 new_scope = scope.dup ();
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 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
3263 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
3264 = 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
3265
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3266 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
3267
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3268 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
3269
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3270 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
3271
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3272 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
3273 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
3274
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3275 tree_expression *expr = afh.expression ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3276 if (expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3277 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3278 tree_expression *expr_dup = expr->dup (new_scope);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3279 tree_statement *stmt = new tree_statement (expr_dup, nullptr);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3280 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
3281 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3282
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3283 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
3284
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3285 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
3286
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3287 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
3288
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3289 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
3290 = 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
3291
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3292 for (auto& name : free_vars)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3293 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3294 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
3295
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3296 if (val.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3297 local_vars[name] = val;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3300 octave_user_function *af
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3301 = new octave_user_function (new_scope, param_list_dup, ret_list,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3302 stmt_list);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3303
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3304 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
3305
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3306 bool is_nested = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3307
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3308 if (curr_fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3309 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3310 // 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
3311 // 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
3312
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3313 // 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
3314 // 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
3315 // function.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3316
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3317 if (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
3318 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3319 is_nested = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3320 af->mark_as_nested_function ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3321 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
3322 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3323
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3324 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
3325
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3326 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
3327 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
3328
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3329 // 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
3330 // 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
3331
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3332 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
3333 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
3334
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3335 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
3336 }
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 af->mark_as_anonymous_function ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3339
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3340 octave_value ov_fcn (af);
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 return (is_nested
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3343 ? 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
3344 : 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
3345 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3346
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3347 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3348 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
3349 int nargout,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3350 const octave_value_list& args)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3351 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3352 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3353
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3354 if (args.has_magic_colon ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3355 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
3356
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3357 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
3358
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3359 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
3360
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3361 if (fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3362 retval = (*fcn) (args, nargout);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3363 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3364 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3365 octave_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
3366
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3367 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
3368 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3369
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3370 // 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
3371 // 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
3372
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3373 retval.make_storable_values ();
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 // 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
3376 // 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
3377 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3378 // octave_value retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3379 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3380 // instead of
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3381 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3382 // octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3383 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3384 // 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
3385
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3386 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
3387 retval.clear ();
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 return retval;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3392 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3393 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
3394 int nargout,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3395 const octave_value_list& args)
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 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3398
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3399 if (args.has_magic_colon ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3400 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
3401
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3402 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
3403
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3404 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
3405
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3406 return retval;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3409 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3410 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
3411 int nargout,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3412 const octave_value_list& args)
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 octave_value_list retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3415
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3416 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
3417
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3418 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
3419 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
3420
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3421 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
3422
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3423 if (! cmd_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3424 return retval;
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 // 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
3427 // 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
3428
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3429 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
3430 error ("max_recursion_depth exceeded");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3431
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3432 unwind_protect_var<stmt_list_type> upv (m_statement_context, SC_SCRIPT);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3433
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3434 profiler::enter<octave_user_script> block (m_profiler, user_script);
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 if (echo ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3437 push_echo_state (tree_evaluator::ECHO_SCRIPTS, file_name);
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 // FIXME: Should we be using tree_evaluator::eval here?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3440
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3441 cmd_list->accept (*this);
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 if (m_returning)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3444 m_returning = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3445
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3446 if (m_breaking)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3447 m_breaking--;
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 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3450 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3453 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
3454 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3455 // ??
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3456 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3457 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3458
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3459 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3460 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
3461 int nargout,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3462 const octave_value_list& xargs)
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 octave_value_list retval;
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 // 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
3467 // 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
3468
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3469 octave_value_list args (xargs);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3470 octave_value_list ret_args;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3471
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3472 int nargin = args.length ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3473
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3474 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
3475 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3476 if (nargin > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3477 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3478 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
3479 --nargin;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3480 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
3481 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3482 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3483 panic_impossible ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3486 // FIXME: this probably shouldn't be a double-precision matrix.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3487 Matrix ignored_outputs = ignored_fcn_outputs ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3488
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3489 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
3490
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3491 bool takes_varargs = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3492 int max_inputs = 0;
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 if (param_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3495 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3496 takes_varargs = param_list->takes_varargs ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3497 max_inputs = param_list->length ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3500 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
3501 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3502 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
3503
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3504 if (name.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3505 name = "@<anonymous>";
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 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
3508 "%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
3509 name.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3510 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3511
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3512 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
3513
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3514 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
3515
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3516 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
3517 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3518 int max_outputs = ret_list->length ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3519
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3520 if (nargout > max_outputs)
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 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
3523
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3524 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
3525 "%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
3526 name.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3527 }
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3530 bind_auto_fcn_vars (xargs.name_tags (), ignored_outputs, nargin,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3531 nargout, user_function.takes_varargs (),
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3532 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
3533
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3534 // 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
3535 // 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
3536
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3537 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
3538 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3539 if (! ret_list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3540 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
3541 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
3542
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3543 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
3544 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3545
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3546 // 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
3547 // 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
3548
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3549 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
3550 error ("max_recursion_depth exceeded");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3551
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3552 unwind_action act2 ([&user_function] () {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3553 user_function.restore_warning_states ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3556 // 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
3557
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3558 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
3559
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3560 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
3561
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3562 if (cmd_list)
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 profiler::enter<octave_user_function>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3565 block (m_profiler, user_function);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3566
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3567 if (echo ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3568 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
3569 user_function.fcn_file_name ());
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 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
3572 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3573 panic_if (cmd_list->length () != 1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3574
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3575 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
3576
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3577 tree_expression *expr = stmt->expression ();
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 (expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3580 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3581 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
3582
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3583 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
3584 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3585 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3586 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3587 cmd_list->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3588
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3589 if (m_returning)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3590 m_returning = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3591
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3592 if (m_breaking)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3593 m_breaking--;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3594 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3595
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3596 // Copy return values out.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3597
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3598 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
3599 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3600 Cell varargout;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3601
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3602 if (ret_list->takes_varargs ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3603 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3604 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
3605
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3606 if (varargout_varval.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3607 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
3608 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3609
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3610 retval = convert_return_list_to_const_vector (ret_list, nargout,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3611 ignored_outputs,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3612 varargout);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3615 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3616 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3617
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3618 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3619 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
3620 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3621 // ??
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3622 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3623 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3624
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3625 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3626 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
3627 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3628 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3629 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3630
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3631 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3632 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
3633 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3634 panic_impossible ();
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_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
3639 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3640 octave_value fcn = cmd.function ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3641
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3642 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
3643
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3644 if (f)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3645 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3646 std::string nm = f->name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3647
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3648 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
3649
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3650 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
3651
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3652 // 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
3653 // function is cleared.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3654
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3655 assign (nm);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3656 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3657 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3658
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3659 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3660 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
3661 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3662 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3663 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3664
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3665 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3666 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
3667 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3668 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3669 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3670
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3671 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3672 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
3673 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3674 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3675 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3676 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3677 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3678 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3679 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3680 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
3681 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3682
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3683 // 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
3684 // really have an accept method?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3685
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3686 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
3687
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3688 if (lst)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3689 lst->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3690 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3691
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3692 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3693 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
3694 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3695 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
3696 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3697 tree_expression *expr = tic->condition ();
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 (! (in_debug_repl ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3700 && 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
3701 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
3702
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3703 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
3704 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
3705
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3706 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
3707 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3708 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
3709
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3710 if (stmt_lst)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3711 stmt_lst->accept (*this);
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 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3714 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3715 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3716 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3717
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3718 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3719 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
3720 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3721 panic_impossible ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3724 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3725 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
3726 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3727 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3728 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3729
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3730 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3731 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
3732 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3733 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3734 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3735
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3736 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3737 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
3738 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3739 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3740 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3741
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3742 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3743 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
3744 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3745 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3746 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3747 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3748 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3749 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3750 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3751 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
3752 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3753
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3754 if (m_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
3755 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
3756 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3757
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3758 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3759 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
3760 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3761 panic_impossible ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3764 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3765 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
3766 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3767 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3768 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3769
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3770 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3771 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
3772 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3773 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3774 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3777 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
3778 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3779 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3780 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3781
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3782 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3783 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
3784 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3785 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3786 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3787
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3788 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3789 tree_evaluator::visit_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
3790 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3791 if (m_echo_state)
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 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3794 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3795 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3796 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3797 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
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 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3801 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
3802
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3803 // Act like dbcont.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3804
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3805 if (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
3806 dbcont ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3807 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
3808 || m_statement_context == SC_SCRIPT
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3809 || m_in_loop_command)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3810 m_returning = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3811 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3814 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
3815 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3816 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3817 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3818
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3819 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3820 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
3821 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3822 tree_command *cmd = stmt.command ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3823 tree_expression *expr = stmt.expression ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3824
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3825 if (cmd || expr)
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 if (! (in_debug_repl ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3828 && 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
3829 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
3830
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3831 try
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 if (cmd)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3834 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3835 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
3836 upv (m_lvalue_list, nullptr);
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 cmd->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3839 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3840 else
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 if (m_echo_state)
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 int line = stmt.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3845 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3846 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3847 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3848 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
3849 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3850
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3851 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3852 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
3853
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3854 // 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
3855 // 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
3856 // 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
3857 // printing the result.
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 // 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
3860 // 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
3861 // everything, binding ans as necessary?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3862
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3863 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
3864
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3865 if (tmp_result.is_defined ())
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 bool do_bind_ans = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3868
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3869 if (expr->is_identifier ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3870 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
3871 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3872 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
3873
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3874 if (do_bind_ans)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3875 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
3876 && statement_printing_enabled ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3877 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3878 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3879 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3880 catch (const std::bad_alloc&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3881 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3882 // 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
3883 // 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
3884 // 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
3885 // 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
3886
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3887 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
3888 "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
3889 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3890 catch (const interrupt_exception&)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3891 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3892 // 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
3893 // Otherwise, jump out of here.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3894
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3895 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3896 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3897 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3898 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3899 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3900 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3901 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3902 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
3903
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3904 if ((m_interpreter.interactive ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3905 || application::forced_interactive ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3906 && ((es.debug_on_error ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3907 && 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
3908 || (es.debug_on_caught ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3909 && 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
3910 && in_user_code ())
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 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3913 es.display_exception (ee);
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 enter_debugger ();
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 // 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
3918 // 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
3919 // 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
3920
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3921 throw quit_debug_exception (true);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3922 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3923 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3924 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3925 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3926 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3927 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3928
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3929 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3930 tree_evaluator::visit_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
3931 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3932 // 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
3933 // 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
3934
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3935 auto p = lst.begin ();
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 if (p != lst.end ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3938 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3939 while (true)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3940 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3941 tree_statement *elt = *p++;
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 if (! elt)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3944 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
3945
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3946 octave_quit ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3947
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3948 elt->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3949
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3950 if (m_breaking || m_continuing)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3951 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3952
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3953 if (m_returning)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3954 break;
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 (p == lst.end ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3957 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3958 else
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 // 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
3961 // 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
3962 // 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
3963 // example, in code like this:
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 // 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
3966 // # after this statement
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3967 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3968 // 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
3969 // # 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
3970 // # 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
3971 // # between statements here
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3972
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3973 // result_values = empty_list;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3974 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3975 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3976 }
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3979 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3980 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
3981 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3982 panic_impossible ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3985 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3986 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
3987 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3988 panic_impossible ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3991 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3992 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
3993 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3994 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3995 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3996 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3997 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3998 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
3999 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4000 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
4001 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4002
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4003 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4004 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
4005
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4006 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
4007
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4008 if (! expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4009 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
4010 cmd.line (), cmd.column ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4011
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4012 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
4013
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4014 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
4015
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4016 if (lst)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4017 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4018 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
4019 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4020 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
4021 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4022 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
4023
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4024 if (stmt_lst)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4025 stmt_lst->accept (*this);
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 break;
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4030 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4031 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4032
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4033 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4034 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
4035 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4036 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4037 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4038 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4039 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4040 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4041 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4042 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
4043 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4044
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4045 bool execution_error = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4046 octave_scalar_map err_map;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4047
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4048 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
4049
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4050 if (try_code)
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 // unwind frame before catch block
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4053
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4054 unwind_protect frame;
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 interpreter_try (frame);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4057
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4058 // 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
4059 // 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
4060
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4061 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4062 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4063 try_code->accept (*this);
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 catch (const execution_exception& ee)
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 execution_error = true;
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 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
4070
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4071 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4072
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4073 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
4074 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
4075 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
4076
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4077 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4078 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4079
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4080 // 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
4081 // to executing the catch block.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4082 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4083
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4084 if (execution_error)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4085 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4086 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
4087
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4088 if (catch_code)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4089 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4090 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
4091
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4092 if (expr_id)
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 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
4095
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4096 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
4097 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4098
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4099 // perform actual "catch" block
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4100 catch_code->accept (*this);
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 }
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4105 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4106 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
4107 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4108 unwind_protect frame;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4109
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4110 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
4111 octave_interrupt_state = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4112
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4113 // 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
4114 // backtracking.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4115
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4116 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
4117 m_call_stack.current_line ());
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 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
4120 m_call_stack.current_column ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4121
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4122 // 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
4123 // 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
4124 // 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
4125 // only occur in loops.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4126
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4127 frame.protect_var (m_returning);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4128 m_returning = 0;
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 frame.protect_var (m_breaking);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4131 m_breaking = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4132
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4133 try
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4134 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4135 if (list)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4136 list->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4137 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4138 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4139 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4140 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
4141
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4142 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4143 m_interpreter.recover_from_exception ();
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 (m_breaking || m_returning)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4146 frame.discard (2);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4147 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4148 frame.run (2);
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 frame.discard (2);
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 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4153 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4154
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4155 // 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
4156 // 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
4157
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4158 // 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
4159 // 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
4160 // 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
4161 // 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
4162 // Consider the case of
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4163 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4164 // function foo ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4165 // unwind_protect
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4166 // 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
4167 // break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4168 // 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
4169 // unwind_protect_cleanup
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4170 // 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
4171 // return;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4172 // 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
4173 // end_unwind_protect
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4174 // endfunction
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4175 //
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4176 // 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
4177 // 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
4178 // 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
4179 // 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
4180 // 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
4181
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4182 if (m_breaking || m_returning)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4183 frame.discard (2);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4184 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4185 frame.run (2);
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4188 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4189 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
4190 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4191 if (m_echo_state)
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 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4194 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4195 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4196 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4197 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
4198 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4199
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4200 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
4201
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4202 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
4203
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4204 if (unwind_protect_code)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4205 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4206 try
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 unwind_protect_code->accept (*this);
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 catch (const execution_exception& ee)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4211 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4212 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
4213
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4214 // 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
4215 // 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
4216 // 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
4217 // here?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4218 es.save_exception (ee);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4219 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4220
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4221 // 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
4222 // 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
4223 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
4224
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4225 // 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
4226 // 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
4227 throw;
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 catch (const interrupt_exception&)
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 // 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
4232 m_interpreter.recover_from_exception ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4233 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
4234 throw;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4235 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4236
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4237 // 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
4238 // 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
4239 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
4240 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4241 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4242
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4243 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4244 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
4245 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4246 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4247 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4248 line = 1;
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 if (m_echo_state)
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 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4253 line++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4254 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4255
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4256 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
4257
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4258 tree_expression *expr = cmd.condition ();
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 if (! expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4261 panic_impossible ();
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 for (;;)
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 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4266 m_echo_file_pos = line;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4267
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4268 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4269 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
4270
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4271 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
4272 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4273 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
4274
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4275 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4276 loop_body->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4277
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4278 if (quit_loop_now ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4279 break;
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 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4282 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4283 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4284 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4285
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4286 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4287 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
4288 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4289 int line = cmd.line ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4290 if (line < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4291 line = 1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4292
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4293 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4294 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4295 echo_code (line);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4296 line++;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4299 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
4300
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4301 tree_expression *expr = cmd.condition ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4302
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4303 if (! expr)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4304 panic_impossible ();
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 for (;;)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4307 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4308 if (m_echo_state)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4309 m_echo_file_pos = line;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4310
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4311 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
4312
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4313 if (loop_body)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4314 loop_body->accept (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4315
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4316 if (quit_loop_now ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4317 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4318
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4319 if (m_debug_mode)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4320 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
4321
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4322 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
4323 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4324 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4325 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4326
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4327 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4328 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
4329 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4330 panic_impossible ();
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4333 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4334 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
4335 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4336 panic_impossible ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4337 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4338
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4339 void tree_evaluator::bind_ans (const octave_value& val, bool print)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4340 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4341 static std::string ans = "ans";
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4342
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4343 if (val.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4344 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4345 if (val.is_cs_list ())
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 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
4348
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4349 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
4350 bind_ans (lst(i), print);
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 else
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 // 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
4355 // just for convenience?
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 assign (ans, val);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4358
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4359 if (print)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4360 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4361 // 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
4362 // 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
4363 // 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
4364
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4365 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
4366 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
4367 m_interpreter.feval ("display", args);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4368 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4369 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4370 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4371 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4372
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4373 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4374 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
4375 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4376 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
4377 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
4378 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4379
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4380 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4381 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
4382 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
4383 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4384 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
4385
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4386 if (is_breakpoint)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4387 break_on_this_statement = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4388 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
4389 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4390 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
4391 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4392 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
4393 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4394 // 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
4395 // 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
4396 // 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
4397 // 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
4398 // line and return to prompt.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4399
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4400 break_on_this_statement = true;
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 else
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 // 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
4405
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4406 m_dbstep_flag--;
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
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 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
4411 && 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
4412 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4413 // 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
4414
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4415 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
4416
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4417 break_on_this_statement = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4418 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4419 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4420 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
4421 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4422 // 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
4423
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4424 break_on_this_statement = true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4425
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4426 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
4427 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4428 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
4429 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4430 // 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
4431 // 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
4432 // 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
4433 // "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
4434 // that frame.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4435
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4436 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
4437 && 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
4438 m_dbstep_flag = -1;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4439 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4440
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4441 if (! break_on_this_statement)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4442 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
4443
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4444 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
4445
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4446 if (break_on_this_statement)
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 m_dbstep_flag = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4449
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4450 enter_debugger ();
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 }
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 bool
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4455 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
4456 const char *warn_for)
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 bool expr_value = false;
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 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
4461
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4462 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
4463
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4464 if (t1.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4465 return t1.is_true ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4466 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4467 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
4468
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4469 return expr_value;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4470 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4471
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4472 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4473 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
4474 int nargout)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4475 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4476 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
4477 "max_recursion_depth", 0);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4478 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4479
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4480 symbol_info_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4481 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
4482 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4483 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
4484 }
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 symbol_info_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4487 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
4488 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4489 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
4490 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4491
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4492 symbol_info_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4493 tree_evaluator::get_symbol_info ()
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 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
4496 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4497
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4498 symbol_info_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4499 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
4500 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4501 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
4502 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4503
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4504 octave_map tree_evaluator::get_autoload_map () const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4505 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4506 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
4507 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
4508
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4509 octave_idx_type i = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4510 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
4511 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4512 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
4513 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
4514
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4515 i++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4516 }
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 octave_map m;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4519
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4520 m.assign ("function", fcn_names);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4521 m.assign ("file", file_names);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4522
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4523 return m;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4524 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4525
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4526 std::string tree_evaluator::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
4527 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4528 std::string retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4529
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4530 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
4531
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4532 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
4533 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4534 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
4535
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4536 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
4537 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4538
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4539 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4540 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4541
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4542 std::list<std::string> tree_evaluator::autoloaded_functions () const
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 std::list<std::string> names;
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 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
4547 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
4548
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4549 return names;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4550 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4551
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4552 std::list<std::string>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4553 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
4554 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4555 std::list<std::string> names;
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 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
4558 if (nm == fcn_fname.second)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4559 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
4560
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4561 return names;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4562 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4563
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4564 void tree_evaluator::add_autoload (const std::string& fcn,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4565 const std::string& nm)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4566 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4567 std::string file_name = check_autoload_file (nm);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4568
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4569 m_autoload_map[fcn] = file_name;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4570 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4571
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4572 void tree_evaluator::remove_autoload (const std::string& fcn,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4573 const std::string& nm)
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 check_autoload_file (nm);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4576
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4577 // 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
4578 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
4579
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4580 symtab.clear_dld_function (fcn);
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 m_autoload_map.erase (fcn);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4583 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4584
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4585 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4586 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
4587 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4588 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
4589 "whos_line_format");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4590 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4591
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4592 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4593 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
4594 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4595 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
4596 "silent_functions");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4597 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4598
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4599 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4600 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
4601 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4602 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
4603 "string_fill_char");
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4606 // 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
4607 // 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
4608 // 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
4609
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4610 void tree_evaluator::final_index_error (index_exception& ie,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4611 const tree_expression *expr)
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 std::string extra_message;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4614
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4615 if (is_variable (expr))
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4616 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4617 std::string var = expr->name ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4618
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4619 ie.set_var (var);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4620
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4621 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
4622
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4623 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
4624
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4625 if (fcn.is_function ())
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 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
4628
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4629 if (fp && fp->name () == var)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4630 extra_message
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4631 = " (note: variable '" + var + "' shadows function)";
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 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4634
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4635 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
4636
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4637 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
4638 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4639
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4640 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4641 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
4642 bool return_list, bool verbose)
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 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
4645 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4646
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4647 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4648 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
4649 const string_vector& arg_nm)
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 octave_value_list retval;
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 if (args)
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 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
4656 upv (m_lvalue_list, nullptr);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4657
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4658 int len = args->length ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4659
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4660 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
4661 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
4662
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4663 m_num_indices = len;
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 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
4666
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4667 int k = 0;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4668
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4669 for (auto elt : *args)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4670 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4671 // 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
4672
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4673 if (! elt)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4674 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4675
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4676 m_index_position = k++;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4677
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4678 octave_value tmp = elt->evaluate (*this);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4679
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4680 if (tmp.is_cs_list ())
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 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
4683
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4684 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
4685 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
4686 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4687 else if (tmp.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4688 arg_vals.push_back (tmp);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4689 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4690
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4691 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
4692 }
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 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
4695
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4696 if (n > 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4697 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
4698
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4699 return retval;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4702 std::list<octave_lvalue>
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4703 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
4704 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4705 std::list<octave_lvalue> retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4706
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4707 for (tree_expression *elt : *lhs)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4708 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
4709
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4710 return retval;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4711 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4714 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
4715 int pos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4716 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4717 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
4718
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4719 if (frame)
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 push_echo_state_cleanup (*frame);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4722
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4723 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
4724 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4725 }
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 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4728 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
4729 int pos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4730 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4731 m_echo_state = echo_this_file (file_name, type);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4732 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
4733 m_echo_file_pos = pos;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4736 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4737 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
4738 int pos)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4739 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4740 m_echo_state = state;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4741 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
4742 m_echo_file_pos = pos;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4745 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4746 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
4747 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4748 octave_function *caller = caller_function ();
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 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
4751 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4752 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
4753
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4754 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
4755
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4756 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
4757
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4758 // 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
4759 // 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
4760 // 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
4761
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4762 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
4763
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4764 if (pos < 0)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4765 pos = 1;
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 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
4768 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4769 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4770
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4771 void
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4772 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
4773 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4774 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
4775 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
4776 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4777
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4778 bool tree_evaluator::maybe_push_echo_state_cleanup ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4779 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4780 // 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
4781 // 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
4782 // 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
4783 // elements to restore echo state.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4784
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4785 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
4786
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4787 if (frame)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4788 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4789 push_echo_state_cleanup (*frame);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4790 return true;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4791 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4792
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4793 return false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4794 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4795
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4796
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4797 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4798 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
4799 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4800 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
4801
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4802 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
4803
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4804 switch (args.length ())
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 case 0:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4807 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
4808 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4809 m_echo = ECHO_OFF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4810 m_echo_files.clear ();
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 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4813 m_echo = ECHO_SCRIPTS;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4814 break;
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 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
4817 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4818 std::string arg0 = argv[0];
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 if (arg0 == "on")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4821 m_echo = ECHO_SCRIPTS;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4822 else if (arg0 == "off")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4823 m_echo = ECHO_OFF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4824 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
4825 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4826 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
4827 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
4828
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4829 if (file.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4830 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
4831
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4832 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
4833 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4834 // 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
4835 // for this one.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4836
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4837 m_echo_files[file] = false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4838 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4839 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4840 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4841 // 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
4842
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4843 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
4844
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4845 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
4846 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4847 // 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
4848
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4849 m_echo |= ECHO_FUNCTIONS;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4850 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
4851 }
ea5a632b2553 improve error checking for undefined function outputs (bug #58686, #58695)
John W. Eaton <jwe@octave.org>
parents: 28532
diff changeset
4852 else
ea5a632b2553 improve error checking for undefined function outputs (bug #58686, #58695)
John W. Eaton <jwe@octave.org>
parents: 28532
diff changeset
4853 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4854 // 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
4855 // status for it.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4856
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4857 p->second = ! p->second;
23435
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
4858 }
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
4859 }
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
4860 }
c452180ab672 begin refactoring parse tree evaluator
John W. Eaton <jwe@octave.org>
parents: 23398
diff changeset
4861 }
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4862 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4863
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4864 case 2:
27873
020d0e8f7ac6 reafactor mlock, munlock, and mislocked functions
John W. Eaton <jwe@octave.org>
parents: 27844
diff changeset
4865 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4866 std::string arg0 = argv[0];
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4867 std::string arg1 = argv[1];
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4868
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4869 if (arg1 == "on" || arg1 == "off")
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4870 std::swap (arg0, arg1);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4871
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4872 if (arg0 == "on")
26065
2eb71b83d3e2 partially refactor function lookup in symbol table
John W. Eaton <jwe@octave.org>
parents: 26039
diff changeset
4873 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4874 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
4875 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4876 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
4877 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
4878 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22164
diff changeset
4879 else
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22164
diff changeset
4880 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4881 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
4882 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
4883
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4884 if (file.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4885 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
4886
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4887 m_echo |= ECHO_FUNCTIONS;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4888 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
4889 }
dd992fd74fce put parser, lexer, and evaluator in namespace; interpreter now owns evaluator
John W. Eaton <jwe@octave.org>
parents: 22164
diff changeset
4890 }
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4891 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
4892 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4893 if (arg1 == "all")
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 m_echo = ECHO_OFF;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4896 m_echo_files.clear ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4897 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4898 else
28562
b0b80efecea1 error for functions called with too many inputs or outputs
John W. Eaton <jwe@octave.org>
parents: 28561
diff changeset
4899 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4900 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
4901 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
4902
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4903 if (file.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4904 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
4905
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4906 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
4907 }
b0b80efecea1 error for functions called with too many inputs or outputs
John W. Eaton <jwe@octave.org>
parents: 28561
diff changeset
4908 }
b0b80efecea1 error for functions called with too many inputs or outputs
John W. Eaton <jwe@octave.org>
parents: 28561
diff changeset
4909 else
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4910 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
4911 }
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4912 break;
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 default:
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4915 print_usage ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4916 break;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4917 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4918
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4919 if (cleanup_pushed)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4920 maybe_set_echo_state ();
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 return octave_value ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4923 }
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 bool tree_evaluator::in_debug_repl () const
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 return (m_debugger_stack.empty ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4928 ? 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
4929 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4930
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4931 void tree_evaluator::dbcont ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4932 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4933 if (! m_debugger_stack.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4934 m_debugger_stack.top()->dbcont ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4935 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4936
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4937 void tree_evaluator::dbquit (bool all)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4938 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4939 if (! m_debugger_stack.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4940 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
4941 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4942
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4943 static octave_value end_value (const octave_value& value,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4944 octave_idx_type index_position,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4945 octave_idx_type num_indices)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4946 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4947 dim_vector dv = value.dims ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4948 int ndims = dv.ndims ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4949
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4950 if (num_indices < ndims)
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 for (int i = num_indices; i < ndims; i++)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4953 dv(num_indices-1) *= dv(i);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4954
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4955 if (num_indices == 1)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4956 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4957 ndims = 2;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4958 dv.resize (ndims);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4959 dv(1) = 1;
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 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4962 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4963 ndims = num_indices;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4964 dv.resize (ndims);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4965 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4966 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4967
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4968 return (index_position < ndims
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4969 ? octave_value (dv(index_position)) : octave_value (1.0));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4970 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4971
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4972 octave_value_list
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4973 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
4974 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4975 int nargin = args.length ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4976
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4977 if (nargin != 0 && nargin != 3)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4978 print_usage ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4979
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4980 if (nargin == 3)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4981 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4982 octave_idx_type index_position
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4983 = args(1).xidx_type_value ("end: K must be integer value");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4984
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4985 if (index_position < 1)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4986 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
4987
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4988 octave_idx_type num_indices
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4989 = args(2).xidx_type_value ("end: N must be integer value");
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4990
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4991 if (num_indices < 1)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4992 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
4993
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4994 return end_value (args(0), index_position-1, num_indices);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4995 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4996
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
4997 // 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
4998 // 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
4999 // 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
5000 // 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
5001 // 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
5002
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5003 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
5004 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
5005
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5006 octave_value expr_result;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5007
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5008 if (m_index_list.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5009 expr_result = m_indexed_object;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5010 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5011 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5012 try
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 // 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
5015 // 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
5016 // 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
5017 // 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
5018 // 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
5019 // 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
5020
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5021 unwind_action act ([=] (std::size_t frm)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5022 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5023 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
5024 }, m_call_stack.current_frame ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5025
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5026 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
5027 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
5028
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5029 // 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
5030 // 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
5031 // evaluates the argument list.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5032
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5033 // Silently ignore extra output values.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5034
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5035 octave_value_list tmp
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5036 = 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
5037
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5038 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
5039
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5040 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
5041 err_indexed_cs_list ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5042 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5043 catch (const index_exception&)
31607
aac27ad79be6 maint: Re-indent code after switch to using namespace macros.
Rik <rik@octave.org>
parents: 31605
diff changeset
5044 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5045 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
5046 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5047 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5048
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5049 if (expr_result.isobject ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5050 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5051 // 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
5052 // 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
5053 // appropriately?
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 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
5056
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5057 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
5058
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5059 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
5060
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5061 if (meth.is_defined ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5062 return m_interpreter.feval
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5063 (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
5064 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5065
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5066 return end_value (expr_result, m_index_position, m_num_indices);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5067 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5068
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5069 octave_value
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5070 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
5071 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5072 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
5073 }
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 bool tree_evaluator::echo_this_file (const std::string& file, int type) const
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5076 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5077 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
5078 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5079 // 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
5080 return true;
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
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5083 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
5084 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5085 // 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
5086 // Now, which ones?
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5087
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5088 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
5089
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5090 if (m_echo & ECHO_ALL)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5091 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5092 // 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
5093 // file.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5094
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5095 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
5096 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5097 else
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5098 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5099 // 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
5100
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5101 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
5102 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5103 }
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 return false;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5106 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5107
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5108 void tree_evaluator::echo_code (int line)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5109 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5110 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
5111
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5112 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
5113
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5114 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
5115 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5116 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
5117
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5118 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
5119
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5120 std::deque<std::string> lines
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5121 = 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
5122
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5123 for (auto& elt : lines)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5124 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
5125 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5126 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5127
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5128 // Decide if it's time to quit a for or while loop.
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5129 bool tree_evaluator::quit_loop_now ()
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5130 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5131 octave_quit ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5132
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5133 // Maybe handle 'continue N' someday...
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5134
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5135 if (m_continuing)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5136 m_continuing--;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5137
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5138 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
5139
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5140 if (m_breaking)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5141 m_breaking--;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5142
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5143 return quit;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5144 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5145
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5146 void tree_evaluator::bind_auto_fcn_vars (const string_vector& arg_names,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5147 const Matrix& ignored_outputs,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5148 int nargin, int nargout,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5149 bool takes_varargs,
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5150 const octave_value_list& va_args)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5151 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5152 set_auto_fcn_var (stack_frame::ARG_NAMES, Cell (arg_names));
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5153 set_auto_fcn_var (stack_frame::IGNORED, ignored_outputs);
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5154 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
5155 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
5156 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
5157
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5158 if (takes_varargs)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5159 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
5160 }
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5161
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5162 std::string
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5163 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
5164 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5165 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
5166 return nm;
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 std::string full_name = nm;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5169
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5170 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
5171
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5172 bool found = false;
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 (fcn)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5175 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5176 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
5177
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5178 if (! fname.empty ())
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5179 {
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5180 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
5181 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
5182
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5183 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
5184
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5185 if (fs.exists ())
31607
aac27ad79be6 maint: Re-indent code after switch to using namespace macros.
Rik <rik@octave.org>
parents: 31605
diff changeset
5186 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5187 full_name = fname + nm;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5188 found = true;
31607
aac27ad79be6 maint: Re-indent code after switch to using namespace macros.
Rik <rik@octave.org>
parents: 31605
diff changeset
5189 }
aac27ad79be6 maint: Re-indent code after switch to using namespace macros.
Rik <rik@octave.org>
parents: 31605
diff changeset
5190 }
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5191 }
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 if (! found)
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5194 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
5195 "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
5196 nm.c_str ());
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5197
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5198 return full_name;
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5199 }
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5200
23705
4c597585ff52 move Vmax_recursion_depth and Vsilent_functions to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23702
diff changeset
5201 DEFMETHOD (max_recursion_depth, interp, args, nargout,
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5202 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
5203 @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
5204 @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
5205 @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
5206 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
5207 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
5208
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5209 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
5210 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
5211
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5212 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
5213 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
5214 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
5215
41f80b9af274 prevent stack overflow crash on deeply nested function calls (bug #47620)
John W. Eaton <jwe@octave.org>
parents: 24738
diff changeset
5216 @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
5217 @end deftypefn */)
10578
cb0883127251 limit on recursion via calls to source function
John W. Eaton <jwe@octave.org>
parents: 10315
diff changeset
5218 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5219 tree_evaluator& tw = interp.get_evaluator ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5220
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5221 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
5222 }
cb0883127251 limit on recursion via calls to source function
John W. Eaton <jwe@octave.org>
parents: 10315
diff changeset
5223
12833
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5224 /*
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5225 %!test
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5226 %! 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
5227 %! 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
5228 %! 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
5229 %! 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
5230 %! 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
5231 %! 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
5232
28930
2883b3d08b7e maint: Remove unnecessary parentheses bracketing %!error BIST tests.
Rik <rik@octave.org>
parents: 28857
diff changeset
5233 %!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
5234 */
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5235
26087
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5236 DEFMETHOD (whos_line_format, interp, args, nargout,
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5237 doc: /* -*- texinfo -*-
26087
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5238 @deftypefn {} {@var{val} =} whos_line_format ()
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5239 @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
5240 @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
5241 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
5242
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5243 A full format string is:
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5244 @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
5245
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5246 @smallexample
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5247 %[modifier]<command>[:width[:left-min[:balance]]];
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5248 @end smallexample
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5249
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5250 The following command sequences are available:
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5251
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5252 @table @code
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5253 @item %a
29856
56b3e2af0298 Add 's'=sparse attribute for whos function (bug #60687)
Rik <rik@octave.org>
parents: 29848
diff changeset
5254 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
5255 g=global, p=persistent).
26087
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5256
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5257 @item %b
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5258 Prints number of bytes occupied by variables.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5259
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5260 @item %c
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5261 Prints class names of variables.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5262
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5263 @item %e
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5264 Prints elements held by variables.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5265
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5266 @item %n
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5267 Prints variable names.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5268
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5269 @item %s
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5270 Prints dimensions of variables.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5271
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5272 @item %t
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5273 Prints type names of variables.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5274 @end table
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5275
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5276 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
5277
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5278 @table @code
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5279 @item l
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5280 Left alignment.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5281
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5282 @item r
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5283 Right alignment (default).
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5284
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5285 @item c
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5286 Column-aligned (only applicable to command %s).
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5287 @end table
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5288
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5289 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
5290 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
5291 auto-expand as required.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5292
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5293 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
5294 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
5295 @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
5296 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
5297 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
5298 the left of the specified balance column.
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5299
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5300 The default format is:
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5301
29856
56b3e2af0298 Add 's'=sparse attribute for whos function (bug #60687)
Rik <rik@octave.org>
parents: 29848
diff changeset
5302 @example
56b3e2af0298 Add 's'=sparse attribute for whos function (bug #60687)
Rik <rik@octave.org>
parents: 29848
diff changeset
5303 " %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
5304 @end example
26087
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5305
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5306 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
5307 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
5308 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
5309 @seealso{whos}
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5310 @end deftypefn */)
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5311 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5312 tree_evaluator& tw = interp.get_evaluator ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5313
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5314 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
5315 }
7656fcd0ff9f move whos_line_format to evaluator
John W. Eaton <jwe@octave.org>
parents: 26065
diff changeset
5316
23705
4c597585ff52 move Vmax_recursion_depth and Vsilent_functions to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23702
diff changeset
5317 DEFMETHOD (silent_functions, interp, args, nargout,
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5318 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
5319 @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
5320 @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
5321 @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
5322 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
5323 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
5324
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5325 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
5326 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
5327 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
5328
112b20240c87 move docstrings in C++ files out of C strings and into comments
John W. Eaton <jwe@octave.org>
parents: 21922
diff changeset
5329 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
5330 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
5331 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
5332 @end deftypefn */)
8658
73c4516fae10 New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5333 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5334 tree_evaluator& tw = interp.get_evaluator ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5335
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5336 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
5337 }
12833
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5338
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5339 /*
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5340 %!test
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5341 %! orig_val = silent_functions ();
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5342 %! 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
5343 %! 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
5344 %! 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
5345 %! silent_functions (orig_val);
9f0f2c226053 codesprint: new tests for functions in pt-eval.cc
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
5346 %! 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
5347
28930
2883b3d08b7e maint: Remove unnecessary parentheses bracketing %!error BIST tests.
Rik <rik@octave.org>
parents: 28857
diff changeset
5348 %!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
5349 */
23706
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5350
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5351 DEFMETHOD (string_fill_char, interp, args, nargout,
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5352 doc: /* -*- texinfo -*-
23706
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5353 @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
5354 @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
5355 @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
5356 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
5357 matrix to the same length.
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5358
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5359 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
5360 single space). For example:
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5361
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5362 @example
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5363 @group
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5364 string_fill_char ("X");
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5365 [ "these"; "are"; "strings" ]
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5366 @result{} "theseXX"
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5367 "areXXXX"
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5368 "strings"
23706
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5369 @end group
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5370 @end example
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5371
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5372 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
5373 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
5374 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
5375 @end deftypefn */)
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5376 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5377 tree_evaluator& tw = interp.get_evaluator ();
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 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
5380 }
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5381
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5382 /*
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5383 ## 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
5384 ## 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
5385 %!shared orig_val, old_val
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5386 %! orig_val = string_fill_char ();
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5387 %! 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
5388 %!test
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5389 %! assert (orig_val, old_val);
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5390 %! assert (string_fill_char (), "X");
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5391 %! 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
5392 %! string_fill_char (orig_val);
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5393 %! 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
5394
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5395 %!assert ( [ [], {1} ], {1} )
6683451b75b2 move Vstring_fill_char to tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23705
diff changeset
5396
28930
2883b3d08b7e maint: Remove unnecessary parentheses bracketing %!error BIST tests.
Rik <rik@octave.org>
parents: 28857
diff changeset
5397 %!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
5398 */
23723
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5399
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5400 DEFMETHOD (PS4, interp, args, nargout,
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5401 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
5402 @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
5403 @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
5404 @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
5405 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
5406 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
5407
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5408 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
5409 @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
5410
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5411 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
5412 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
5413 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
5414 @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
5415 @end deftypefn */)
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5416 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5417 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
5418 }
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5419
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5420 DEFMETHOD (echo, interp, args, nargout,
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5421 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
5422 @deftypefn {} {} echo
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5423 @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
5424 @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
5425 @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
5426 @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
5427 @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
5428 @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
5429 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
5430
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5431 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
5432
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5433 @table @code
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5434 @item on
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5435 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
5436
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5437 @item off
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5438 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
5439
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5440 @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
5441 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
5442 functions.
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5443
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5444 @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
5445 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
5446 functions.
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5447
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5448 @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
5449 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
5450
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5451 @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
5452 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
5453 @end table
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5454
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5455 @noindent
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5456 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
5457
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5458 @seealso{PS4}
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5459 @end deftypefn */)
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5460 {
31809
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5461 tree_evaluator& tw = interp.get_evaluator ();
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5462
32acdc376a36 maint: Remove unnecessary indent after OCTAVE_BEGIN_NAMESPACE in libinterp/
Rik <rik@octave.org>
parents: 31771
diff changeset
5463 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
5464 }
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5465
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5466 /*
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5467 %!error echo ([])
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5468 %!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
5469 %!error echo ("")
ab8831d346c1 revamp echo command and move related variables inside tree_evaluator class
John W. Eaton <jwe@octave.org>
parents: 23706
diff changeset
5470 %!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
5471 %!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
5472 %!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
5473 %!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
5474 */
29958
32c3a5805893 move DEFUN and DEFMETHOD functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 29956
diff changeset
5475
31605
e88a07dec498 maint: Use macros to begin/end C++ namespaces.
Rik <rik@octave.org>
parents: 30919
diff changeset
5476 OCTAVE_END_NAMESPACE(octave)