int → bool; commit as a TODO comment a begun change attempt

This commit is contained in:
tg
2013-09-10 16:30:50 +00:00
parent fda010d8de
commit 14667a9838
3 changed files with 6 additions and 5 deletions

4
exec.c
View File

@ -23,7 +23,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/exec.c,v 1.125 2013/07/21 20:44:44 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/exec.c,v 1.126 2013/09/10 16:30:49 tg Exp $");
#ifndef MKSH_DEFAULT_EXECSHELL #ifndef MKSH_DEFAULT_EXECSHELL
#define MKSH_DEFAULT_EXECSHELL "/bin/sh" #define MKSH_DEFAULT_EXECSHELL "/bin/sh"
@ -1669,7 +1669,7 @@ static Test_op
dbteste_isa(Test_env *te, Test_meta meta) dbteste_isa(Test_env *te, Test_meta meta)
{ {
Test_op ret = TO_NONOP; Test_op ret = TO_NONOP;
int uqword; bool uqword;
const char *p; const char *p;
if (!*te->pos.wp) if (!*te->pos.wp)

View File

@ -38,7 +38,7 @@
#endif #endif
#endif #endif
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.244 2013/06/03 22:28:32 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.245 2013/09/10 16:30:49 tg Exp $");
#if HAVE_KILLPG #if HAVE_KILLPG
/* /*
@ -3243,6 +3243,7 @@ test_primary(Test_env *te, bool do_eval)
* so that something like test \( -f = -f \) is accepted * so that something like test \( -f = -f \) is accepted
*/ */
if ((te->flags & TEF_DBRACKET) || (&te->pos.wp[1] < te->wp_end && if ((te->flags & TEF_DBRACKET) || (&te->pos.wp[1] < te->wp_end &&
/*XXX TODO: !test_opin(b_ops_xsi, … */
!test_isop(TM_BINOP, te->pos.wp[1]))) { !test_isop(TM_BINOP, te->pos.wp[1]))) {
if ((op = (*te->isa)(te, TM_UNOP))) { if ((op = (*te->isa)(te, TM_UNOP))) {
/* unary expression */ /* unary expression */

4
syn.c
View File

@ -23,7 +23,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/syn.c,v 1.92 2013/06/03 22:28:17 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/syn.c,v 1.93 2013/09/10 16:30:50 tg Exp $");
struct nesting_state { struct nesting_state {
int start_token; /* token than began nesting (eg, FOR) */ int start_token; /* token than began nesting (eg, FOR) */
@ -976,7 +976,7 @@ static Test_op
dbtestp_isa(Test_env *te, Test_meta meta) dbtestp_isa(Test_env *te, Test_meta meta)
{ {
int c = tpeek(ARRAYVAR | (meta == TM_BINOP ? 0 : CONTIN)); int c = tpeek(ARRAYVAR | (meta == TM_BINOP ? 0 : CONTIN));
int uqword; bool uqword;
char *save = NULL; char *save = NULL;
Test_op ret = TO_NONOP; Test_op ret = TO_NONOP;