Mercurial > hg > octave-nkf
annotate scripts/sparse/module.mk @ 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 | 9106fdfc03e8 |
children | ea9992fd9c89 |
rev | line source |
---|---|
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
1 FCN_FILE_DIRS += sparse |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
2 |
13197
6db186dfdeaa
Refactor sprandn/sprand code, move common code to common function (bug #34352)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13073
diff
changeset
|
3 sparse_PRIVATE_FCN_FILES = \ |
13200
9106fdfc03e8
Add missing path in sparse/module.mk
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13197
diff
changeset
|
4 sparse/private/__sprand_impl__.m |
13197
6db186dfdeaa
Refactor sprandn/sprand code, move common code to common function (bug #34352)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13073
diff
changeset
|
5 |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
6 sparse_FCN_FILES = \ |
13073
51bc892d5cf8
Move bicg.m to scripts/sparse for uniformity
Carlo de Falco <kingcrimson@tiscali.it>
parents:
12650
diff
changeset
|
7 sparse/bicg.m \ |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
8 sparse/bicgstab.m \ |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
9 sparse/cgs.m \ |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
10 sparse/colperm.m \ |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
11 sparse/etreeplot.m \ |
12650
b7f16997df4d
maint: Move gmres.m to sparse directory rather than linear-algebra directory.
Rik <octave@nomad.inbox5.com>
parents:
11390
diff
changeset
|
12 sparse/gmres.m \ |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
13 sparse/gplot.m \ |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
14 sparse/nonzeros.m \ |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
15 sparse/pcg.m \ |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
16 sparse/pcr.m \ |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
17 sparse/spaugment.m \ |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
18 sparse/spconvert.m \ |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
19 sparse/spdiags.m \ |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
20 sparse/speye.m \ |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
21 sparse/spfun.m \ |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
22 sparse/spones.m \ |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
23 sparse/sprand.m \ |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
24 sparse/sprandn.m \ |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
25 sparse/sprandsym.m \ |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
26 sparse/spstats.m \ |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
27 sparse/spy.m \ |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
28 sparse/svds.m \ |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
29 sparse/treelayout.m \ |
13197
6db186dfdeaa
Refactor sprandn/sprand code, move common code to common function (bug #34352)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13073
diff
changeset
|
30 sparse/treeplot.m \ |
6db186dfdeaa
Refactor sprandn/sprand code, move common code to common function (bug #34352)
Jordi Gutiérrez Hermoso <jordigh@octave.org>
parents:
13073
diff
changeset
|
31 $(sparse_PRIVATE_FCN_FILES) |
9794
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
32 |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
33 FCN_FILES += $(sparse_FCN_FILES) |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
34 |
0d4613a736e9
convert build system to use automake and libtool
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
35 PKG_ADD_FILES += sparse/PKG_ADD |
9906 | 36 |
37 DIRSTAMP_FILES += sparse/$(octave_dirstamp) |