Redefine the default boolean type to gmx_bool.

[alexxy/gromacs.git] / src / gmxlib / selection / scanner_internal.c

diff --git a/src/gmxlib/selection/scanner_internal.c b/src/gmxlib/selection/scanner_internal.c
index ed6ac74b7ed797eee07ffa0d8193c4c828504662..1e7e4f74a54590bf38f55c65c87e8f1bcebb1178 100644 (file)
--- a/src/gmxlib/selection/scanner_internal.c
+++ b/src/gmxlib/selection/scanner_internal.c
@@ -72,7 +72,7 @@
 #undef yytext
 #undef yyleng
 
-static bool
+static gmx_bool
 read_stdin_line(gmx_sel_lexer_t *state)
 {
     char *ptr     = state->inputstr;
@@ -137,7 +137,7 @@ int
 _gmx_sel_yyblex(YYSTYPE *yylval, yyscan_t yyscanner)
 {
     gmx_sel_lexer_t *state = _gmx_sel_yyget_extra(yyscanner);
-    bool bCmdStart;
+    gmx_bool bCmdStart;
     int token;
 
     if (!state->bBuffer && !state->inputstr)
@@ -164,7 +164,7 @@ _gmx_sel_yyblex(YYSTYPE *yylval, yyscan_t yyscanner)
 }
 
 static int
-init_param_token(YYSTYPE *yylval, gmx_ana_selparam_t *param, bool bBoolNo)
+init_param_token(YYSTYPE *yylval, gmx_ana_selparam_t *param, gmx_bool bBoolNo)
 {
     if (bBoolNo)
     {
@@ -181,7 +181,7 @@ init_param_token(YYSTYPE *yylval, gmx_ana_selparam_t *param, bool bBoolNo)
 }
 
 static int
-init_method_token(YYSTYPE *yylval, gmx_ana_selmethod_t *method, bool bPosMod,
+init_method_token(YYSTYPE *yylval, gmx_ana_selmethod_t *method, gmx_bool bPosMod,
                   gmx_sel_lexer_t *state)
 {
     /* If the previous token was not KEYWORD_POS, return EMPTY_POSMOD
@@ -252,7 +252,7 @@ _gmx_sel_lexer_process_pending(YYSTYPE *yylval, gmx_sel_lexer_t *state)
     if (state->nextparam)
     {
         gmx_ana_selparam_t *param = state->nextparam;
-        bool                bBoolNo = state->bBoolNo;
+        gmx_bool                bBoolNo = state->bBoolNo;
 
         if (state->neom > 0)
         {
@@ -289,7 +289,7 @@ _gmx_sel_lexer_process_identifier(YYSTYPE *yylval, char *yytext, size_t yyleng,
     if (state->msp >= 0)
     {
         gmx_ana_selparam_t *param = NULL;
-        bool                bBoolNo = FALSE;
+        gmx_bool                bBoolNo = FALSE;
         int                 sp = state->msp;
         while (!param && sp >= 0)
         {
@@ -307,7 +307,7 @@ _gmx_sel_lexer_process_identifier(YYSTYPE *yylval, char *yytext, size_t yyleng,
                     param = &state->mstack[sp]->param[i];
                     break;
                 }
-                /* Check separately for a 'no' prefix on boolean parameters */
+                /* Check separately for a 'no' prefix on gmx_boolean parameters */
                 if (state->mstack[sp]->param[i].val.type == NO_VALUE
                     && yyleng > 2 && yytext[0] == 'n' && yytext[1] == 'o'
                     && !strncmp(state->mstack[sp]->param[i].name, yytext+2, yyleng-2))
@@ -441,7 +441,7 @@ _gmx_sel_lexer_add_token(const char *str, int len, gmx_sel_lexer_t *state)
 
 int
 _gmx_sel_init_lexer(yyscan_t *scannerp, struct gmx_ana_selcollection_t *sc,
-                    bool bInteractive, int maxnr,
+                    gmx_bool bInteractive, int maxnr,
                     struct gmx_ana_indexgrps_t *grps)
 {
     gmx_sel_lexer_t *state;
@@ -500,7 +500,7 @@ _gmx_sel_free_lexer(yyscan_t scanner)
     _gmx_sel_yylex_destroy(scanner);
 }
 
-bool
+gmx_bool
 _gmx_sel_is_lexer_interactive(yyscan_t scanner)
 {
     gmx_sel_lexer_t *state = _gmx_sel_yyget_extra(scanner);