From 14667a98380d999fb0f1133118c7b582cd8f86b7 Mon Sep 17 00:00:00 2001 From: tg Date: Tue, 10 Sep 2013 16:30:50 +0000 Subject: [PATCH] =?UTF-8?q?int=20=E2=86=92=20bool;=20commit=20as=20a=20TOD?= =?UTF-8?q?O=20comment=20a=20begun=20change=20attempt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- exec.c | 4 ++-- funcs.c | 3 ++- syn.c | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/exec.c b/exec.c index 50ec9ca..0b40337 100644 --- a/exec.c +++ b/exec.c @@ -23,7 +23,7 @@ #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 #define MKSH_DEFAULT_EXECSHELL "/bin/sh" @@ -1669,7 +1669,7 @@ static Test_op dbteste_isa(Test_env *te, Test_meta meta) { Test_op ret = TO_NONOP; - int uqword; + bool uqword; const char *p; if (!*te->pos.wp) diff --git a/funcs.c b/funcs.c index 6698f5e..e83bafd 100644 --- a/funcs.c +++ b/funcs.c @@ -38,7 +38,7 @@ #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 /* @@ -3243,6 +3243,7 @@ test_primary(Test_env *te, bool do_eval) * so that something like test \( -f = -f \) is accepted */ 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]))) { if ((op = (*te->isa)(te, TM_UNOP))) { /* unary expression */ diff --git a/syn.c b/syn.c index 5c07d51..58387d9 100644 --- a/syn.c +++ b/syn.c @@ -23,7 +23,7 @@ #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 { int start_token; /* token than began nesting (eg, FOR) */ @@ -976,7 +976,7 @@ static Test_op dbtestp_isa(Test_env *te, Test_meta meta) { int c = tpeek(ARRAYVAR | (meta == TM_BINOP ? 0 : CONTIN)); - int uqword; + bool uqword; char *save = NULL; Test_op ret = TO_NONOP;