From 1b3c969ac36221dc171b0b3f169237fa1507b1e6 Mon Sep 17 00:00:00 2001 From: Rob Pike Date: Mon, 11 Mar 2013 16:23:06 -0700 Subject: [PATCH] regexp: identify that submatch is also known as capturing group Mention the syntax is defined by the regexp/syntax package. Fixes #3953. R=golang-dev, dsymonds CC=golang-dev https://golang.org/cl/7702044 --- src/pkg/regexp/regexp.go | 12 +++++++----- src/pkg/regexp/syntax/doc.go | 6 +++--- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/pkg/regexp/regexp.go b/src/pkg/regexp/regexp.go index 3aa16dec60..6f6908a74f 100644 --- a/src/pkg/regexp/regexp.go +++ b/src/pkg/regexp/regexp.go @@ -8,6 +8,8 @@ // general syntax used by Perl, Python, and other languages. // More precisely, it is the syntax accepted by RE2 and described at // http://code.google.com/p/re2/wiki/Syntax, except for \C. +// For an overview of the syntax, run +// godoc regexp/syntax // // All characters are UTF-8-encoded code points. // @@ -27,11 +29,11 @@ // of bytes; return values are adjusted as appropriate. // // If 'Submatch' is present, the return value is a slice identifying the -// successive submatches of the expression. Submatches are matches of -// parenthesized subexpressions within the regular expression, numbered from -// left to right in order of opening parenthesis. Submatch 0 is the match of -// the entire expression, submatch 1 the match of the first parenthesized -// subexpression, and so on. +// successive submatches of the expression. Submatches are matches of +// parenthesized subexpressions (also known as capturing groups) within the +// regular expression, numbered from left to right in order of opening +// parenthesis. Submatch 0 is the match of the entire expression, submatch 1 +// the match of the first parenthesized subexpression, and so on. // // If 'Index' is present, matches and submatches are identified by byte index // pairs within the input string: result[2*n:2*n+1] identifies the indexes of diff --git a/src/pkg/regexp/syntax/doc.go b/src/pkg/regexp/syntax/doc.go index 843a6f6a42..bcb5d051bc 100644 --- a/src/pkg/regexp/syntax/doc.go +++ b/src/pkg/regexp/syntax/doc.go @@ -47,9 +47,9 @@ Repetitions: x{n}? exactly n x Grouping: - (re) numbered capturing group - (?Pre) named & numbered capturing group - (?:re) non-capturing group + (re) numbered capturing group (submatch) + (?Pre) named & numbered capturing group (submatch) + (?:re) non-capturing group (submatch) (?flags) set flags within current group; non-capturing (?flags:re) set flags during re; non-capturing -- 2.48.1