Mercurial > hg > octave-lyh
annotate src/load-save.h @ 13245:027a2186cd90
parfor keyword and infrastructure, but handle parfor as normal for loop for now
* octave.gperf (octave_kw_id): New keyword ids, parfor_kw and
end_parfor_kw.
(octave_kw): Add parfor and end_parfor to the struct.
* lex.ll (is_keyword_token): Handle parfor and end_parfor.
* token.h (token::parfor_end): New end_tok_type enum value.
* oct-parse.yy (PARFOR): New token.
(loop_command): Handle PARFOR statements.
(make_for_command): New args tok_id and maxproc. Handle PARFOR loops.
* pt-loop.h (tree_simple_for_command::parallel,
tree_simple_for_command:maxproc): New data members.
(tree_simple_for_command::tree_simple_for_command): New args
parallel_arg and maxproc_arg. Initialize new data members.
(tree_simple_for_command::parallel): New function.
(tree_simple_for_command::maxproc_expr): New function.
* pt-loop.cc (tree_simple_for_command::~tree_simple_for_command):
Delete maxproc.
(tree_simple_for_command::dup): Pass parallel and maxproc to
constructor for duplicate object.
* pt-pr-code.cc (tree_print_code::visit_simple_for_command):
Handle parallel form.
* pt-check.cc (tree_checker::visit_simple_for_command): Likewise.
* pt-eval.cc (tree_evaluator::visit_simple_for_command): Note that
this is where parallel loops need to be handled.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 29 Sep 2011 02:50:53 -0400 |
parents | 12df7854fa7c |
children | 58c4d02c8ba2 |
rev | line source |
---|---|
606 | 1 /* |
2 | |
11523 | 3 Copyright (C) 1994-2011 John W. Eaton |
606 | 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. | |
606 | 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/>. | |
606 | 20 |
21 */ | |
22 | |
23 #if !defined (octave_load_save_h) | |
24 #define octave_load_save_h 1 | |
25 | |
8950
d865363208d6
include <iosfwd> instead of <iostream> in header files
John W. Eaton <jwe@octave.org>
parents:
8920
diff
changeset
|
26 #include <iosfwd> |
3503 | 27 #include <string> |
1738 | 28 |
2086 | 29 class octave_value; |
606 | 30 |
8425
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
31 // FIXME: maybe MAT5 and MAT7 should be options to MAT_BINARY. |
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
32 // Similarly, save_as_floats may be an option for LS_BINARY, LS_HDF5 etc. |
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
33 enum load_save_format_type |
4329 | 34 { |
35 LS_ASCII, | |
36 LS_BINARY, | |
37 LS_MAT_ASCII, | |
38 LS_MAT_BINARY, | |
39 LS_MAT5_BINARY, | |
5269 | 40 LS_MAT7_BINARY, |
4329 | 41 #ifdef HAVE_HDF5 |
42 LS_HDF5, | |
43 #endif /* HAVE_HDF5 */ | |
44 LS_UNKNOWN | |
45 }; | |
46 | |
8425
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
47 enum load_save_format_options |
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
48 { |
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
49 // LS_MAT_ASCII options (not exclusive) |
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
50 LS_MAT_ASCII_LONG = 1, |
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
51 LS_MAT_ASCII_TABS = 2, |
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
52 // LS_MAT_BINARY options |
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
53 LS_MAT_BINARY_V5 = 1, |
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
54 LS_MAT_BINARY_V7, |
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
55 // zero means no option. |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
56 LS_NO_OPTION = 0 |
8425
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
57 }; |
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
58 |
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
59 class load_save_format |
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
60 { |
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
61 public: |
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
62 load_save_format (load_save_format_type t, |
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
63 load_save_format_options o = LS_NO_OPTION) |
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
64 : type (t), opts (o) { } |
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
65 operator int (void) const |
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
66 { return type; } |
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
67 int type, opts; |
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
68 }; |
2e777f5135a3
support -tabs option for save -ascii
Jaroslav Hajek <highegg@gmail.com>
parents:
7336
diff
changeset
|
69 |
4791 | 70 extern void dump_octave_core (void); |
4329 | 71 |
72 extern int | |
73 read_binary_file_header (std::istream& is, bool& swap, | |
10313 | 74 oct_mach_info::float_format& flt_fmt, |
75 bool quiet = false); | |
606 | 76 |
4329 | 77 extern octave_value |
78 do_load (std::istream& stream, const std::string& orig_fname, bool force, | |
10313 | 79 load_save_format format, oct_mach_info::float_format flt_fmt, |
80 bool list_only, bool swap, bool verbose, | |
81 const string_vector& argv, int argv_idx, int argc, int nargout); | |
4329 | 82 |
83 extern void | |
7336 | 84 do_save (std::ostream& os, const symbol_table::symbol_record& sr, |
10313 | 85 load_save_format fmt, bool save_as_floats); |
4329 | 86 |
87 extern void | |
88 write_header (std::ostream& os, load_save_format format); | |
1380 | 89 |
606 | 90 #endif |