grep branch, master, updated. v2.18-2-gbc4e030

[Jim Meyering]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "grep".

The branch, master has been updated
       via  bc4e0307da6fc43b897e7a16c56b36e7f5990832 (commit)
      from  edcd281c532d61e5f4cb36f34d6c866c9aec7766 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit/grep.git/commit/?id=bc4e0307da6fc43b897e7a16c56b36e7f5990832


commit bc4e0307da6fc43b897e7a16c56b36e7f5990832
Author: Stephane Chazelas <address@hidden>
Date:   Mon Feb 24 11:54:09 2014 -0800

    grep -P: fix it so backreferences now work with -w and -x
    
    To implement -w and -x, we bracket the search term with parentheses.
    However, that set of parentheses had the default semantics of
    "capturing", i.e., creating a backreferenceable matched quantity.
    Instead, use (?:...), to create a non-capturing group.
    * src/pcresearch.c (Pcompile): Use (?:...) rather than (...).
    * NEWS (Bug fixes): Mention it.
    * tests/pcre-wx-backref: New file.
    * tests/Makefile.am (TESTS): Add it.
    This addresses http://debbugs.gnu.org/16865

diff --git a/NEWS b/NEWS
index 771fd80..49fe984 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,12 @@ GNU grep NEWS                                    -*- outline 
-*-
 
 * Noteworthy changes in release ?.? (????-??-??) [?]
 
+** Bug fixes
+
+  grep -P now works with -w and -x and backreferences. Before,
+  echo aa|grep -Pw '(.)\1' would fail to match, yet
+  echo aa|grep -Pw '(.)\2' would match.
+
 
 * Noteworthy changes in release 2.18 (2014-02-20) [stable]
 
diff --git a/src/pcresearch.c b/src/pcresearch.c
index 5b5ba3e..d4a20ff 100644
--- a/src/pcresearch.c
+++ b/src/pcresearch.c
@@ -75,9 +75,9 @@ Pcompile (char const *pattern, size_t size)
 
   *n = '\0';
   if (match_lines)
-    strcpy (n, "^(");
+    strcpy (n, "^(?:");
   if (match_words)
-    strcpy (n, "\\b(");
+    strcpy (n, "\\b(?:");
   n += strlen (n);
 
   /* The PCRE interface doesn't allow NUL bytes in the pattern, so
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4ffea85..ecbe0e6 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -83,6 +83,7 @@ TESTS =                                               \
   pcre-abort                                   \
   pcre-invalid-utf8-input                      \
   pcre-utf8                                    \
+  pcre-wx-backref                              \
   pcre-z                                       \
   prefix-of-multibyte                          \
   r-dot                                                \
diff --git a/tests/pcre-wx-backref b/tests/pcre-wx-backref
new file mode 100755
index 0000000..643aa9b
--- /dev/null
+++ b/tests/pcre-wx-backref
@@ -0,0 +1,28 @@
+#! /bin/sh
+# Before grep-2.19, grep -P and -w/-x would not with a backreference.
+#
+# Copyright (C) 2014 Free Software Foundation, Inc.
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+
+. "${srcdir=.}/init.sh"; path_prepend_ ../src
+require_pcre_
+
+echo aa > in || framework_failure_
+echo 'grep: reference to non-existent subpattern' > exp-err \
+  || framework_failure_
+
+fail=0
+
+for xw in x w; do
+  grep -P$xw '(.)\1' in > out 2>&1 || fail=1
+  compare out in || fail=1
+
+  grep -P$xw '(.)\2' in > out 2> err && fail=1
+  compare /dev/null out || fail=1
+  compare exp-err err || fail=1
+done
+
+Exit $fail

-----------------------------------------------------------------------

Summary of changes:
 NEWS                  |    6 ++++++
 src/pcresearch.c      |    4 ++--
 tests/Makefile.am     |    1 +
 tests/pcre-wx-backref |   28 ++++++++++++++++++++++++++++
 4 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100755 tests/pcre-wx-backref


hooks/post-receive
-- 
grep