Mercurial > octave

comparison libinterp/parse-tree/oct-parse.yy @ 28146:27c0b26e5a9f

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 Sun, 08 Mar 2020 17:54:55 -0400
parents 376ca9022b7e 9e983eb1749d
children a04cb1364af4
comparison
equal deleted inserted replaced
28142:908bdd05398a 28146:27c0b26e5a9f
4559 std::string curr_line; 4559 std::string curr_line;
4560 4560
4561 if (m_lexer.m_reading_fcn_file || m_lexer.m_reading_script_file 4561 if (m_lexer.m_reading_fcn_file || m_lexer.m_reading_script_file
4562 || m_lexer.m_reading_classdef_file) 4562 || m_lexer.m_reading_classdef_file)
4563 curr_line = get_file_line (m_lexer.m_fcn_file_full_name, err_line); 4563 curr_line = get_file_line (m_lexer.m_fcn_file_full_name, err_line);
4564 else
4565 curr_line = m_lexer.m_current_input_line;
4566
4567 // Adjust the error column for display because it is 1-based in the
4568 // lexer for easier reporting and it has already been advanced to
4569 // one past the end of the most recently read token.
4570 err_col -= 2;
4564 4571
4565 if (! curr_line.empty ()) 4572 if (! curr_line.empty ())
4566 { 4573 {
4567 // FIXME: we could do better if we just cached lines from the 4574 // FIXME: we could do better if we just cached lines from the
4568 // input file in a list. See also functions for managing input 4575 // input file in a list. See also functions for managing input