Mercurial > octave

comparison libinterp/corefcn/stack-frame.cc @ 30200:3e419a830e90

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author John W. Eaton <jwe@octave.org>
date Tue, 21 Sep 2021 13:32:41 -0400
parents 2bb72743d3eb 37ddca7ad9cb
children 91c6288781ba 796f54d4ddbf
comparison
equal deleted inserted replaced
30198:a87e5f9d5446 30200:3e419a830e90
198 static std::size_t get_num_symbols (octave_user_script *script); 198 static std::size_t get_num_symbols (octave_user_script *script);
199 199
200 void set_script_offsets (void); 200 void set_script_offsets (void);
201 201
202 void set_script_offsets_internal (const std::map<std::string, 202 void set_script_offsets_internal (const std::map<std::string,
203 symbol_record>& symbols); 203 symbol_record>& symbols);
204 204
205 void resize_and_update_script_offsets (const symbol_record& sym); 205 void resize_and_update_script_offsets (const symbol_record& sym);
206 206
207 symbol_scope get_scope (void) const { return m_script->scope (); } 207 symbol_scope get_scope (void) const { return m_script->scope (); }
208 208
1864 // duplication? 1864 // duplication?
1865 1865
1866 std::map<std::string, symbol_record> tmp_symbols; 1866 std::map<std::string, symbol_record> tmp_symbols;
1867 tmp_symbols[sym.name ()] = sym; 1867 tmp_symbols[sym.name ()] = sym;
1868 set_script_offsets_internal (tmp_symbols); 1868 set_script_offsets_internal (tmp_symbols);
1869
1870 // set_script_offsets_internal may have modified
1871 // m_lexical_frame_offsets and m_value_offsets.
1872
1873 frame_offset = m_lexical_frame_offsets.at (data_offset);
1869 } 1874 }
1870 1875
1871 data_offset = m_value_offsets.at (data_offset); 1876 data_offset = m_value_offsets.at (data_offset);
1872 } 1877 }
1873 else 1878 else