summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2012-01-23 21:17:02 (GMT)
committerdgp <dgp@users.sourceforge.net>2012-01-23 21:17:02 (GMT)
commit7fa090fbeed5a9719ed0b2d2d09d3447e2b3406e (patch)
tree827d267066cbaa8ddfa91edf3d89b7061d950bfd /generic
parent5af6e8ec4bfd688d0bfa411133f4b3d6a7b280c2 (diff)
downloadtcl-7fa090fbeed5a9719ed0b2d2d09d3447e2b3406e.zip
tcl-7fa090fbeed5a9719ed0b2d2d09d3447e2b3406e.tar.gz
tcl-7fa090fbeed5a9719ed0b2d2d09d3447e2b3406e.tar.bz2
Simplify the logic of setting the TCL_REG_NOTBOL flag.
Diffstat (limited to 'generic')
-rw-r--r--generic/tclCmdMZ.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/generic/tclCmdMZ.c b/generic/tclCmdMZ.c
index ab673d5..aed0022 100644
--- a/generic/tclCmdMZ.c
+++ b/generic/tclCmdMZ.c
@@ -264,8 +264,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;