Mercurial > hg > octave-nkf
annotate libinterp/corefcn/oct-iostrm.cc @ 17731:f79bf671a493
eliminate global LEXER variable
* input.h, input.cc (octave_base_reader::lexer): New member variable.
(octave_base_reader::octave_base_reader): Initialize lexer.
(octave_base_reader::octave_base_reader (const octave_base_reader&)):
Also copy pflag and lexer.
(octave_base_reader::reading_fcn_file,
octave_base_reader::reading_classdef_file,
octave_base_reader::reading_script_file): New functions.
(octave_base_reader::do_input_echo): Call reading_script file instead
of using global LEXER variable.
(get_user_input): Don't user global LEXER variable. Only check
interactive and forced_interactive to decide whether to temporarily
set forced_interactive to true.
(octave_terminal_reader::octave_terminal_reader,
octave_file_reader::octave_file_reader,
octave_eval_string_reader::octave_eval_string_reader,
octave_input_reader::octave_input_reader):
New optional arg, lexer.
* toplev.cc (main_loop): Don't user global LEXER variable. Eliminate
unused unwind_protect frame.
* lex.h, lex.ll (octave_base_lexer::cleanup): Delete unused function.
(octave_lexer::octave_lexer): Pass this to input_reader initializer.
* parse.h, oct-parse.in.yy (octave_base_parser::init):
Delete unneded function.
(octave_base_parser::octave_base_parser, octave_push_parser::init, octave_push_parser::octave_push_parser):
Don't call octave_base_parser::init.
(eval_string): Don't use global LEXER variable. Eliminate unused
unwind_protect frame.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 22 Oct 2013 18:43:36 -0400 |
| parents | 68fc671a9339 |
| children | d63878346099 |
| rev | line source |
|---|---|
| 2081 | 1 /* |
| 2 | |
|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
3 Copyright (C) 1996-2012 John W. Eaton |
| 2081 | 4 |
| 5 This file is part of Octave. | |
| 6 | |
| 7 Octave is free software; you can redistribute it and/or modify it | |
| 8 under the terms of the GNU General Public License as published by the | |
| 7016 | 9 Free Software Foundation; either version 3 of the License, or (at your |
| 10 option) any later version. | |
| 2081 | 11 |
| 12 Octave is distributed in the hope that it will be useful, but WITHOUT | |
| 13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
| 15 for more details. | |
| 16 | |
| 17 You should have received a copy of the GNU General Public License | |
| 7016 | 18 along with Octave; see the file COPYING. If not, see |
| 19 <http://www.gnu.org/licenses/>. | |
| 2081 | 20 |
| 21 */ | |
| 22 | |
| 23 #ifdef HAVE_CONFIG_H | |
| 24 #include <config.h> | |
| 25 #endif | |
| 26 | |
| 27 #include "error.h" | |
| 28 #include "oct-iostrm.h" | |
| 29 | |
| 30 // Position a stream at OFFSET relative to ORIGIN. | |
| 31 | |
| 32 int | |
|
16011
8122286c69a9
initial large file support for 32-bit systems
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
33 octave_base_iostream::seek (off_t, int) |
| 2081 | 34 { |
| 35 invalid_operation (); | |
| 36 return -1; | |
| 37 } | |
| 38 | |
| 39 // Return current stream position. | |
| 40 | |
|
16011
8122286c69a9
initial large file support for 32-bit systems
John W. Eaton <jwe@octave.org>
parents:
15195
diff
changeset
|
41 off_t |
| 4797 | 42 octave_base_iostream::tell (void) |
| 2081 | 43 { |
| 44 invalid_operation (); | |
| 45 return -1; | |
| 46 } | |
| 47 | |
| 48 // Return non-zero if EOF has been reached on this stream. | |
| 49 | |
| 50 bool | |
| 51 octave_base_iostream::eof (void) const | |
| 52 { | |
| 53 invalid_operation (); | |
| 54 return false; | |
| 55 } | |
| 56 | |
| 57 void | |
| 58 octave_base_iostream::invalid_operation (void) const | |
| 59 { | |
| 60 ::error ("%s: invalid operation", stream_type ()); | |
| 61 } | |
| 62 | |
| 3342 | 63 // Return non-zero if EOF has been reached on this stream. |
| 64 | |
| 65 bool | |
| 66 octave_istream::eof (void) const | |
| 67 { | |
| 68 return is && is->eof (); | |
| 69 } | |
| 70 | |
| 3340 | 71 octave_stream |
| 4587 | 72 octave_istream::create (std::istream *arg, const std::string& n) |
| 3340 | 73 { |
| 4587 | 74 return octave_stream (new octave_istream (arg, n)); |
| 3340 | 75 } |
| 76 | |
| 3342 | 77 // Return non-zero if EOF has been reached on this stream. |
| 78 | |
| 79 bool | |
| 80 octave_ostream::eof (void) const | |
| 81 { | |
| 82 return os && os->eof (); | |
| 83 } | |
| 84 | |
| 3340 | 85 octave_stream |
| 4587 | 86 octave_ostream::create (std::ostream *arg, const std::string& n) |
| 3340 | 87 { |
| 4587 | 88 return octave_stream (new octave_ostream (arg, n)); |
| 3340 | 89 } |