Mercurial > hg > octave-lyh
view test/error.tst @ 16228:e19b1632d7c1
revamp most comment handling
* comment-list.h (octave_comment_elt::comment_type): New value,
full_line.
* lex.h (lexical_feedback::comment_text): New member variable.
(lexical_feedback::finish_comment): New function.
(octave_lexer::grab_block_comment, octave_lexer::grab_comment_block,
octave_lexer::process_comment): Delete.
* lex.ll (BLOCK_COMMENT_START, LINE_COMMENT_START): New exclusive
start states.
(ANY_INCLUDING_NL): New pattern.
(<INPUT_FILE_START>{ANY_INCLUDING_NL}): Use it instead of ".".
(^{S}*{CCHAR}\{{S}*{NL}, <BLOCK_COMMENT_START>^{S}*{CCHAR}\{{S}*{NL},
<BLOCK_COMMENT_START>^{S}*{CCHAR}\}{S}*{NL},
<BLOCK_COMMENT_START>.*{NL}, {S}*{CCHAR}.*{NL},
<LINE_COMMENT_START>{S}*{CCHAR}.*{NL},
<LINE_COMMENT_START>{ANY_INCLUDING_NL}):
New patterns and rules for handling comments.
({CCHAR}, ^{S}*{CCHAR}\{{S}*{NL}): Delete old rules for comments.
(display_start_state): Also handle BLOCK_COMMENT_START and
LINE_COMMENT_START.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Fri, 08 Mar 2013 17:13:54 -0500 |
parents | 6fe6ac8bbfdb |
children | 57fad64de019 |
line wrap: on
line source
## Copyright (C) 2006-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/>. ## Test %!error usage %% test/octave.test/error/error-1.m %!function g () %! error ("foo"); %!endfunction %!function f () %! g (); %!endfunction %!error <foo> f () %% test/octave.test/error/error-2.m %!function g () %! error ("foo\n"); %!endfunction %!function f () %! g %!endfunction %!error <foo> f () %% test/octave.test/error/error-3.m %!error error () %% test/octave.test/error/error-4.m %!error <foo> error ("foo\n") ## Test %!warning usage %% test/octave.test/error/warning-1.m %!function g () %! warning ("foo"); %!endfunction %!function f () %! g; %!endfunction %!warning <foo> f () %% test/octave.test/error/warning-2.m %!test %! st.identifier = "backtrace"; %! ws = warning ("query", "backtrace"); %! warning ("on", "backtrace"); %! st.state = "on"; %! assert (warning ("query", "backtrace"), st); %! warning ("off", "backtrace"); %! st.state = "off"; %! assert (warning ("query", "backtrace"), st); %! warning (ws.state, "backtrace"); ## Test usage() function %% test/octave.test/error/usage-1.m %!function g () %! usage ("foo"); %!endfunction %!function f () %! g (); %!endfunction %!error <foo> f () %% test/octave.test/error/usage-2.m %!function g () %! usage ("foo"); %!endfunction %!function f () %! g %!endfunction %!error <foo> f () %% test/octave.test/error/usage-3.m %!error usage () %% test/octave.test/error/usage-4.m %!error <foo> usage ("foo\n")