Mercurial > hg > octave-lyh
annotate libinterp/parse-tree/pt-id.h @ 15574:d20cbfec6df7
Fix off-by-1 error when executing 'dbstep N'
* pt-eval.cc(do_breakpoint): Decrement dbstep_flag only after it has been
determined that 'dbstep N' is being run and N > 1 and it is not the end
of the frame.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 01 Nov 2012 11:42:21 -0700 |
| parents | 44d6ffdf9479 |
| children | 6ea536cb7360 1785493171ac |
| rev | line source |
|---|---|
| 2887 | 1 /* |
| 2 | |
|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
11586
diff
changeset
|
3 Copyright (C) 1996-2012 John W. Eaton |
| 2887 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 2887 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 7016 | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | |
| 2887 | 20 |
| 21 */ | |
| 22 | |
| 23 #if !defined (octave_tree_identifier_h) | |
| 24 #define octave_tree_identifier_h 1 | |
| 25 | |
|
8950
d865363208d6
include <iosfwd> instead of <iostream> in header files
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
26 #include <iosfwd> |
| 2887 | 27 #include <string> |
| 28 | |
| 2943 | 29 class octave_value; |
| 30 class octave_value_list; | |
| 2887 | 31 class octave_function; |
| 32 | |
| 33 class tree_walker; | |
| 34 | |
|
7677
db02cc0ba8f2
handle breakpoints in tree_identifier::do_lookup
John W. Eaton <jwe@octave.org>
parents:
7336
diff
changeset
|
35 #include "pt-bp.h" |
| 2980 | 36 #include "pt-exp.h" |
| 7336 | 37 #include "symtab.h" |
| 2887 | 38 |
| 39 // Symbols from the symbol table. | |
| 40 | |
| 41 class | |
| 2971 | 42 tree_identifier : public tree_expression |
| 2887 | 43 { |
| 44 friend class tree_index_expression; | |
| 45 | |
| 46 public: | |
| 47 | |
| 48 tree_identifier (int l = -1, int c = -1) | |
|
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14544
diff
changeset
|
49 : tree_expression (l, c) { } |
| 2887 | 50 |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7677
diff
changeset
|
51 tree_identifier (const symbol_table::symbol_record& s, |
| 10313 | 52 int l = -1, int c = -1, |
| 53 symbol_table::scope_id sc = symbol_table::current_scope ()) | |
|
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14544
diff
changeset
|
54 : tree_expression (l, c), sym (s, sc) { } |
| 2887 | 55 |
| 56 ~tree_identifier (void) { } | |
| 57 | |
| 4267 | 58 bool has_magic_end (void) const { return (name () == "__end__"); } |
| 59 | |
| 3933 | 60 bool is_identifier (void) const { return true; } |
| 2887 | 61 |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7677
diff
changeset
|
62 // The name doesn't change with scope, so use sym instead of |
|
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7677
diff
changeset
|
63 // accessing it through sym so that this function may remain const. |
| 7336 | 64 std::string name (void) const { return sym.name (); } |
| 2887 | 65 |
|
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14544
diff
changeset
|
66 bool is_defined (void) { return sym->is_defined (); } |
| 7336 | 67 |
|
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14544
diff
changeset
|
68 virtual bool is_variable (void) { return sym->is_variable (); } |
|
10206
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
69 |
|
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
70 virtual bool is_black_hole (void) { return false; } |
| 2887 | 71 |
| 7336 | 72 // Try to find a definition for an identifier. Here's how: |
| 73 // | |
| 74 // * If the identifier is already defined and is a function defined | |
|
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
75 // in an function file that has been modified since the last time |
| 7336 | 76 // we parsed it, parse it again. |
| 77 // | |
| 78 // * If the identifier is not defined, try to find a builtin | |
| 79 // variable or an already compiled function with the same name. | |
| 80 // | |
| 81 // * If the identifier is still undefined, try looking for an | |
| 82 // function file to parse. | |
| 83 // | |
| 84 // * On systems that support dynamic linking, we prefer .oct files, | |
| 85 // then .mex files, then .m files. | |
| 2971 | 86 |
| 87 octave_value | |
|
9445
c5f03874ea2a
simplify symbol_table::find and associated functions
Jaroslav Hajek <highegg@gmail.com>
parents:
8950
diff
changeset
|
88 do_lookup (const octave_value_list& args = octave_value_list ()) |
| 7336 | 89 { |
|
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14544
diff
changeset
|
90 return sym->find (args); |
| 7336 | 91 } |
| 2887 | 92 |
|
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14544
diff
changeset
|
93 void mark_global (void) { sym->mark_global (); } |
| 7336 | 94 |
|
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14544
diff
changeset
|
95 void mark_as_static (void) { sym->init_persistent (); } |
| 7336 | 96 |
|
14912
3d3c002ccc60
Add symbol_table::symbol_record_ref
Max Brister <max@2bass.com>
parents:
14544
diff
changeset
|
97 void mark_as_formal_parameter (void) { sym->mark_formal (); } |
| 2887 | 98 |
| 3010 | 99 // We really need to know whether this symbol referst to a variable |
| 100 // or a function, but we may not know that yet. | |
| 101 | |
| 3933 | 102 bool lvalue_ok (void) const { return true; } |
| 3010 | 103 |
|
8658
73c4516fae10
New evaluator and debugger derived from tree-walker class
John W. Eaton <jwe@octave.org>
parents:
7767
diff
changeset
|
104 octave_value rvalue1 (int nargout = 1); |
| 2887 | 105 |
| 2971 | 106 octave_value_list rvalue (int nargout); |
| 2887 | 107 |
| 2979 | 108 octave_lvalue lvalue (void); |
| 2887 | 109 |
| 110 void eval_undefined_error (void); | |
| 111 | |
|
15236
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
112 void static_workspace_error (void) |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
113 { |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
114 ::error ("can not add variable \"%s\" to a static workspace", |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
115 name ().c_str ()); |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
116 } |
|
44d6ffdf9479
Disallow new variables in nested functions (bug #36271)
Max Brister <max@2bass.com>
parents:
15195
diff
changeset
|
117 |
|
7767
71f068b22fcc
scope and context fixes for function handles
John W. Eaton <jwe@octave.org>
parents:
7753
diff
changeset
|
118 tree_identifier *dup (symbol_table::scope_id scope, |
| 10313 | 119 symbol_table::context_id context) const; |
| 5861 | 120 |
| 2887 | 121 void accept (tree_walker& tw); |
| 122 | |
|
14930
7d44ed216b98
Rename symbol_table::symbol_record_ref to symbol_table::symbol_reference
Max Brister <max@2bass.com>
parents:
14913
diff
changeset
|
123 symbol_table::symbol_reference symbol (void) const |
|
14913
c7071907a641
Use symbol_record_ref instead of names in JIT
Max Brister <max@2bass.com>
parents:
14912
diff
changeset
|
124 { |
|
c7071907a641
Use symbol_record_ref instead of names in JIT
Max Brister <max@2bass.com>
parents:
14912
diff
changeset
|
125 return sym; |
|
c7071907a641
Use symbol_record_ref instead of names in JIT
Max Brister <max@2bass.com>
parents:
14912
diff
changeset
|
126 } |
| 2887 | 127 private: |
| 128 | |
| 129 // The symbol record that this identifier references. | |
|
14930
7d44ed216b98
Rename symbol_table::symbol_record_ref to symbol_table::symbol_reference
Max Brister <max@2bass.com>
parents:
14913
diff
changeset
|
130 symbol_table::symbol_reference sym; |
|
7752
40c428ea3408
initial implementation of dbup and dbdown
John W. Eaton <jwe@octave.org>
parents:
7677
diff
changeset
|
131 |
| 2988 | 132 // No copying! |
| 133 | |
| 134 tree_identifier (const tree_identifier&); | |
| 135 | |
| 136 tree_identifier& operator = (const tree_identifier&); | |
| 2887 | 137 }; |
| 138 | |
|
10206
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
139 class tree_black_hole : public tree_identifier |
|
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
140 { |
|
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
141 public: |
|
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
142 |
|
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
143 tree_black_hole (int l = -1, int c = -1) |
|
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
144 : tree_identifier (l, c) { } |
|
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
145 |
|
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
146 std::string name (void) const { return "~"; } |
|
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
147 |
|
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
148 bool is_variable (void) { return false; } |
|
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
149 |
|
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
150 bool is_black_hole (void) { return true; } |
|
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
151 |
|
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
152 tree_black_hole *dup (void) const |
|
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
153 { return new tree_black_hole; } |
|
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
154 |
|
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
155 octave_lvalue lvalue (void) |
|
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
156 { |
|
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
157 return octave_lvalue (0); // black hole lvalue |
|
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
158 } |
|
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
159 }; |
|
37a08e0ce2dc
support Matlab-style empty output/input arguments
Jaroslav Hajek <highegg@gmail.com>
parents:
10160
diff
changeset
|
160 |
| 2887 | 161 #endif |