Mercurial > octave-nkf
changeset 5783:2a9089b47dc2
[project @ 2006-05-03 00:02:22 by jwe]
| author | jwe |
|---|---|
| date | Wed, 03 May 2006 00:02:22 +0000 |
| parents | 96cd81ed579e |
| children | 70f7659d0fb9 |
| files | src/ChangeLog src/error.cc src/lex.l |
| diffstat | 3 files changed, 9 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue May 02 21:36:50 2006 +0000 +++ b/src/ChangeLog Wed May 03 00:02:22 2006 +0000 @@ -1,3 +1,7 @@ +2006-05-02 John W. Eaton <jwe@octave.org> + + * lex.l ({CCHAR}): Exit rawcommand mode if returning '\n' token. + 2006-05-02 David Bateman <dbateman@free.fr> * DLD-FUNCTIONS/rand.cc (do_rand): Require real scalar for seed.
--- a/src/error.cc Tue May 02 21:36:50 2006 +0000 +++ b/src/error.cc Wed May 03 00:02:22 2006 +0000 @@ -810,7 +810,7 @@ @var{id}. If the identifier is omitted, a value of @samp{\"all\"} is\n\ assumed. If you set the state of a warning to @samp{\"error\"}, the\n\ warning named by @var{id} is handled as if it were an error instead.\n\ -@seealso{warning_ids}.\n\ +@seealso{warning_ids}\n\ @end deftypefn") { octave_value retval;
--- a/src/lex.l Tue May 02 21:36:50 2006 +0000 +++ b/src/lex.l Wed May 03 00:02:22 2006 +0000 @@ -696,7 +696,10 @@ BEGIN (INITIAL); if (nesting_level.none ()) - COUNT_TOK_AND_RETURN ('\n'); + { + lexer_flags.doing_rawcommand = false; + COUNT_TOK_AND_RETURN ('\n'); + } else if (nesting_level.is_bracket_or_brace ()) COUNT_TOK_AND_RETURN (';'); }