Mercurial > hg > octave-nkf

comparison libinterp/interpfcn/help.cc @ 16199:810a71122c25

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move more global variables to octave_lexical_feedback class * help.cc (raw_help_from_file): Don't protect and set reading_script_file. * octave.cc (likewise): * oct_parse.in.yy (parse_fcn_file): Don't protect reading_script_file. * input.cc (get_debug_input): Don't protect and set reading_fcn_file, reading_classdef_file, or reading_script_file. * lex.h, lex.ll, input.h, input.cc (reading_fcn_file, reading_classdef_file, reading_script_file): Declare as members of the lexical_feedback class. Change all uses. (lexical_feedback::lexical_feedback, lexical_feedback::reset): Initialize and set them.
author John W. Eaton <jwe@octave.org>
date Tue, 05 Mar 2013 17:50:37 -0500
parents 5a4a07a2ec73
children 2fd22fbaffa3
comparison
equal deleted inserted replaced
16198:2c5c538be353 16199:810a71122c25
900 raw_help_from_file (const std::string& nm, std::string& h, 900 raw_help_from_file (const std::string& nm, std::string& h,
901 std::string& file, bool& symbol_found) 901 std::string& file, bool& symbol_found)
902 { 902 {
903 bool retval = false; 903 bool retval = false;
904 904
905 // FIXME -- this is a bit of a kluge...
906 unwind_protect frame;
907 frame.protect_var (reading_script_file);
908 reading_script_file = true;
909
910 h = get_help_from_file (nm, symbol_found, file); 905 h = get_help_from_file (nm, symbol_found, file);
911 906
912 if (h.length () > 0) 907 if (h.length () > 0)
913 retval = true; 908 retval = true;
914 909