Mercurial > hg > octave-nkf
diff src/lex.ll @ 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 | 1bfca2bbea8b |
children | 0c69a564f2be |
line wrap: on
line diff
--- a/src/lex.ll +++ b/src/lex.ll @@ -1496,6 +1496,11 @@ lexer_flags.at_beginning_of_statement = true; break; + case end_parfor_kw: + yylval.tok_val = new token (token::parfor_end, l, c); + lexer_flags.at_beginning_of_statement = true; + break; + case end_try_catch_kw: yylval.tok_val = new token (token::try_catch_end, l, c); lexer_flags.at_beginning_of_statement = true; @@ -1551,7 +1556,9 @@ lexer_flags.at_beginning_of_statement = true; break; + case for_kw: + case parfor_kw: case while_kw: promptflag--; lexer_flags.looping++;