Mercurial > hg > octave-lyh
view libinterp/parse-tree/pt-exp.cc @ 16253:a89cf57ba3a5
partial cleanup of continuation handling in lexer
* lex.h, lex.ll (octave_lexer::handle_continuation): New function.
(octave_lexer::finish_comment): Move to octave_lexer::finish_comment.
Don't return token. New argument, looking_at_continuation. If not
handling continuation, unput newline character.
(^{S}*{CCHAR}\{{S}*{NL}): Call yyless before finishing comment.
(^{S}*{CCHAR}\{{S}*{NL}, <BLOCK_COMMENT_START>^{S}*{CCHAR}\{{S}*{NL},
<LINE_COMMENT_START>{ANY_INCLUDING_NL},
<LINE_COMMENT_START>{S}*{CCHAR}.*{NL}): Don't return token.
(<LINE_COMMENT_START>{S}*{CCHAR}.*{NL}): Don't give COMMAND_START
start state special treatment.
({CONT}{S}*{NL}|{CONT}{S}*{COMMENT}):
Call octave_lexer::handle_continuation.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Sat, 09 Mar 2013 21:44:14 -0500 |
parents | 2fc554ffbc28 |
children |
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 (); }