summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-01-23 21:21:51 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-01-23 21:21:51 (GMT)
commit23a8b5ab99c77ba24e4cb3b7b4ff95813316b66b (patch)
treeb7e1589d52846e09886eafba855aba2e9e9b3156
parent1525ab8bc15705c9c4ad8020f5767d7c8883ed4f (diff)
parent7d0fcc8ac4010c70dc7aa22cd9f183a50f362626 (diff)
downloadtcl-23a8b5ab99c77ba24e4cb3b7b4ff95813316b66b.zip
tcl-23a8b5ab99c77ba24e4cb3b7b4ff95813316b66b.tar.gz
tcl-23a8b5ab99c77ba24e4cb3b7b4ff95813316b66b.tar.bz2
Simplify the logic of setting the TCL_REG_NOTBOL flag.
-rw-r--r--generic/tclCmdMZ.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index e159f67..1ef6fa8 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -282,8 +282,11 @@ Tcl_RegexpObjCmd(
* start of the string unless the previous character is a newline.
*/
- if ((offset == 0) || ((offset > 0) && (offset < stringLength) &&
- (Tcl_GetUniChar(objPtr, offset-1) == (Tcl_UniChar) '\n'))) {
+ if (offset == 0) {
+ eflags = 0;
+ } else if (offset > stringLength) {
+ eflags = TCL_REG_NOTBOL;
+ } else if (Tcl_GetUniChar(objPtr, offset-1) == (Tcl_UniChar)'\n') {
eflags = 0;
} else {
eflags = TCL_REG_NOTBOL;