Mercurial > hg > octave-lyh
view libinterp/parse-tree/pt-jump.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 "error.h" #include "oct-obj.h" #include "pt-bp.h" #include "pt-jump.h" #include "pt-walk.h" class octave_value_list; // Break. // Nonzero means we're breaking out of a loop or function body. int tree_break_command::breaking = 0; tree_command * tree_break_command::dup (symbol_table::scope_id, symbol_table::context_id) const { return new tree_break_command (line (), column ()); } void tree_break_command::accept (tree_walker& tw) { tw.visit_break_command (*this); } // Continue. // Nonzero means we're jumping to the end of a loop. int tree_continue_command::continuing = 0; tree_command * tree_continue_command::dup (symbol_table::scope_id, symbol_table::context_id) const { return new tree_continue_command (line (), column ()); } void tree_continue_command::accept (tree_walker& tw) { tw.visit_continue_command (*this); } // Return. // Nonzero means we're returning from a function. int tree_return_command::returning = 0; tree_command * tree_return_command::dup (symbol_table::scope_id, symbol_table::context_id) const { return new tree_return_command (line (), column ()); } void tree_return_command::accept (tree_walker& tw) { tw.visit_return_command (*this); }