Mercurial > octave
view libinterp/parse-tree/pt-exp.cc @ 17693:efbe746f8fa8
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 | 2fc554ffbc28 |
children | d63878346099 |
line wrap: on
line source
/* Copyright (C) 1996-2012 John W. Eaton This file is part of Octave. Octave is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. Octave is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with Octave; see the file COPYING. If not, see <http://www.gnu.org/licenses/>. */ #ifdef HAVE_CONFIG_H #include <config.h> #endif #include <iostream> #include <string> #include "error.h" #include "pager.h" #include "oct-lvalue.h" #include "ov.h" #include "pt-exp.h" // Expressions. bool tree_expression::is_logically_true (const char *warn_for) { bool expr_value = false; octave_value t1 = rvalue1 (); if (! error_state) { if (t1.is_defined ()) return t1.is_true (); else ::error ("%s: undefined value used in conditional expression", warn_for); } return expr_value; } octave_value tree_expression::rvalue1 (int) { ::error ("invalid rvalue function called in expression"); return octave_value (); } octave_value_list tree_expression::rvalue (int) { ::error ("invalid rvalue function called in expression"); return octave_value_list (); } octave_value_list tree_expression::rvalue (int nargout, const std::list<octave_lvalue> *) { return rvalue (nargout); } octave_lvalue tree_expression::lvalue (void) { ::error ("invalid lvalue function called in expression"); return octave_lvalue (); } std::string tree_expression::original_text (void) const { return std::string (); }