Mercurial > octave-nkf
comparison libinterp/parse-tree/lex.ll @ 19414:5db5619fe54e
maint: Periodic merge of gui-release to default.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 04 Dec 2014 16:22:26 -0500 |
parents | 86f50893acd8 c1ce43276b86 |
children | 0e1f5a750d00 |
comparison
equal
deleted
inserted
replaced
19411:9ef286208da1 | 19414:5db5619fe54e |
---|---|
3435 } | 3435 } |
3436 | 3436 |
3437 if (! input_buf.empty ()) | 3437 if (! input_buf.empty ()) |
3438 status = input_buf.copy_chunk (buf, max_size); | 3438 status = input_buf.copy_chunk (buf, max_size); |
3439 else | 3439 else |
3440 { | 3440 status = YY_NULL; |
3441 status = YY_NULL; | |
3442 | |
3443 if (! input_buf.at_eof ()) | |
3444 fatal_error ("octave_base_lexer::fill_flex_buffer failed"); | |
3445 } | |
3446 | 3441 |
3447 return status; | 3442 return status; |
3448 } | 3443 } |
3449 | 3444 |
3450 int | 3445 int |
3456 input_buf.fill (std::string (1, static_cast<char> (1)), false); | 3451 input_buf.fill (std::string (1, static_cast<char> (1)), false); |
3457 | 3452 |
3458 if (! input_buf.empty ()) | 3453 if (! input_buf.empty ()) |
3459 status = input_buf.copy_chunk (buf, max_size); | 3454 status = input_buf.copy_chunk (buf, max_size); |
3460 else | 3455 else |
3461 { | 3456 status = YY_NULL; |
3462 status = YY_NULL; | |
3463 | |
3464 if (! input_buf.at_eof ()) | |
3465 fatal_error ("octave_base_lexer::fill_flex_buffer failed"); | |
3466 } | |
3467 | 3457 |
3468 return status; | 3458 return status; |
3469 } | 3459 } |
3470 | 3460 |