Mercurial > hg > octave-nkf
annotate examples/funcdemo.cc @ 16195:b52d2f9294b6
use class for reading lexer input
* input.h, input.cc (octave_base_input_reader, octave_terminal_reader,
octave_file_reader, octave_eval_string_reader): New classes.
(octave_gets): Now a member function of octave_base_reader.
(get_user_input): Delete function. Move actions to
octave_terminal_reader::get_input and
octave_eval_string_reader::get_input.
function. Call from octave_file_reader::get_input. Don't check
whether reading an eval string.
(current_eval_string, get_input_from_eval_string): Delete global
variables.
(get_debug_input): Check CURR_LEXER->input_from_eval_string instead of
global get_input_from_eval_string variable. Don't protect
get_input_from_eval_string.
* lex.h (octave_lexer::input_reader): New data member.
(octave_lexer::octave_lexer (void)): Initialize it.
(octave_lexer::octave_lexer (const std::string&),
octave_lexer::octave_lexer (FILE *)): New constructors.
* lex.h, lex.cc (octave_lexer::input_buffer::fill): New function.
(octave_lexer::input_buffer::read): Delete.
(octave_lexer::read): Rename from octave_read. Call reader to get
input, and then hand it to the input_buffer instead of asking the
input buffer to read input. Change all callers.
(octave_lexer::input_source, octave_lexer::input_from_eval_string):
New functions. Call octave_lexer::input_from_eval_string instead of
using get_input_from_eval_string.
* oct-parse.in.yy (octave_parser::octave_parser (FILE *),
octave_parser::octave_parser (const std::string&)): New constructors.
(parse_fcn_file): Pass FILE pointer to octave_parser constructor.
(eval_string): Pass string to octave_parser constructor instead of
setting global current_eval_string variable.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Tue, 05 Mar 2013 10:19:51 -0500 |
| parents | 460a3c6d8bf1 |
| children | be41c30bcb44 |
| rev | line source |
|---|---|
| 6572 | 1 #include <octave/oct.h> |
| 2 #include <octave/parse.h> | |
| 3 | |
| 4 DEFUN_DLD (funcdemo, args, nargout, "Function Demo") | |
| 5 { | |
|
14846
460a3c6d8bf1
maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists.
Rik <octave@nomad.inbox5.com>
parents:
9932
diff
changeset
|
6 int nargin = args.length (); |
| 6572 | 7 octave_value_list retval; |
| 8 | |
| 9 if (nargin < 2) | |
| 10 print_usage (); | |
| 11 else | |
| 12 { | |
| 13 octave_value_list newargs; | |
| 14 for (octave_idx_type i = nargin - 1; i > 0; i--) | |
| 15 newargs (i - 1) = args(i); | |
| 16 if (args(0).is_function_handle () | |
| 17 || args(0).is_inline_function ()) | |
| 18 { | |
| 19 octave_function *fcn = args(0).function_value (); | |
| 20 if (! error_state) | |
| 21 retval = feval (fcn, newargs, nargout); | |
| 22 } | |
| 23 else if (args(0).is_string ()) | |
| 24 { | |
| 25 std::string fcn = args (0).string_value (); | |
| 26 if (! error_state) | |
| 27 retval = feval (fcn, newargs, nargout); | |
| 28 } | |
| 29 else | |
| 7081 | 30 error ("funcdemo: expected string,", |
|
9932
6cb30a539481
untabify files in examples directory
John W. Eaton <jwe@octave.org>
parents:
9053
diff
changeset
|
31 " inline or function handle"); |
| 6572 | 32 } |
| 33 return retval; | |
| 34 } |