biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor for testing interactive selection input
[alexxy/gromacs.git]
/
src
/
gromacs
/
selection
/
scanner_internal.cpp
diff --git
a/src/gromacs/selection/scanner_internal.cpp
b/src/gromacs/selection/scanner_internal.cpp
index 1f3be505e5d192e406ce9824d30b916a1942ad54..d66d647b58dfb524cc635ae20429cea8ae68ccdc 100644
(file)
--- a/
src/gromacs/selection/scanner_internal.cpp
+++ b/
src/gromacs/selection/scanner_internal.cpp
@@
-384,8
+384,8
@@
_gmx_sel_lexer_add_token(YYLTYPE *yylloc, const char *str, int len,
void
_gmx_sel_init_lexer(yyscan_t *scannerp, struct gmx_ana_selcollection_t *sc,
void
_gmx_sel_init_lexer(yyscan_t *scannerp, struct gmx_ana_selcollection_t *sc,
-
bool bInteractive, int maxnr, bool bGroups
,
- struct gmx_ana_indexgrps_t *grps)
+
gmx::TextWriter *statusWriter, int maxnr
,
+
bool bGroups,
struct gmx_ana_indexgrps_t *grps)
{
int rc = _gmx_sel_yylex_init(scannerp);
if (rc != 0)
{
int rc = _gmx_sel_yylex_init(scannerp);
if (rc != 0)
@@
-401,7
+401,7
@@
_gmx_sel_init_lexer(yyscan_t *scannerp, struct gmx_ana_selcollection_t *sc,
state->grps = grps;
state->nexpsel = (maxnr > 0 ? static_cast<int>(sc->sel.size()) + maxnr : -1);
state->grps = grps;
state->nexpsel = (maxnr > 0 ? static_cast<int>(sc->sel.size()) + maxnr : -1);
- state->
bInteractive = bInteractive
;
+ state->
statusWriter = statusWriter
;
snew(state->pselstr, STRSTORE_ALLOCSTEP);
state->pselstr[0] = 0;
snew(state->pselstr, STRSTORE_ALLOCSTEP);
state->pselstr[0] = 0;
@@
-461,11
+461,11
@@
_gmx_sel_lexer_rethrow_exception_if_occurred(yyscan_t scanner)
}
}
}
}
-bool
-_gmx_sel_
is_lexer_interactive
(yyscan_t scanner)
+gmx::TextWriter *
+_gmx_sel_
lexer_get_status_writer
(yyscan_t scanner)
{
gmx_sel_lexer_t *state = _gmx_sel_yyget_extra(scanner);
{
gmx_sel_lexer_t *state = _gmx_sel_yyget_extra(scanner);
- return state->
bInteractive
;
+ return state->
statusWriter
;
}
struct gmx_ana_selcollection_t *
}
struct gmx_ana_selcollection_t *