Mercurial > hg > octave-nkf

comparison libinterp/parse-tree/lex.ll @ 17693:efbe746f8fa8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
eliminate octave_comment_buffer singleton * lex.h (octave_base_lexer::comment_buffer): New class adapted from octave_comment_buffer class. No longer a singleton class. (octave_base_lexer::comment_buffer::reset): New function. (octave_base_lexer::reset): Call comment_buf.reset. (octave_base_lexer::comment_buf): New data member. (octave_base_lexer::get_comment): New function. * comment-list.h, comment-list.cc (octave_comment_buffer): Delete. Change all uses of octave_comment_buffer to use local comment_buf object instead. * parse.h (octave_base_parser::make_statement): New member function. * oct-parse.in.yy (make_statement): Delete. Change all uses of make_statement to use the member function instead. (safe_fclose): Don't extract and delete comment list here.
author John W. Eaton <jwe@octave.org>
date Fri, 18 Oct 2013 21:00:33 -0400
parents f0edd6c752e9
children 5b0036d89d4a
comparison
equal deleted inserted replaced
17692:38cf56b77274 17693:efbe746f8fa8
2035 || reading_script_file 2035 || reading_script_file
2036 || input_from_eval_string ())) 2036 || input_from_eval_string ()))
2037 yyrestart (stdin, scanner); 2037 yyrestart (stdin, scanner);
2038 2038
2039 lexical_feedback::reset (); 2039 lexical_feedback::reset ();
2040
2041 comment_buf.reset ();
2040 } 2042 }
2041 2043
2042 void 2044 void
2043 octave_base_lexer::prep_for_file (void) 2045 octave_base_lexer::prep_for_file (void)
2044 { 2046 {
2535 help_text = comment_text; 2537 help_text = comment_text;
2536 2538
2537 if (copyright) 2539 if (copyright)
2538 typ = octave_comment_elt::copyright; 2540 typ = octave_comment_elt::copyright;
2539 2541
2540 octave_comment_buffer::append (comment_text, typ); 2542 comment_buf.append (comment_text, typ);
2541 2543
2542 comment_text = ""; 2544 comment_text = "";
2543 2545
2544 at_beginning_of_statement = true; 2546 at_beginning_of_statement = true;
2545 } 2547 }