Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/lib/libc/regex Update for v1.10: use '(*)' instead of '#' as...
details: https://anonhg.NetBSD.org/src/rev/cf8c037d23fb
branches: trunk
changeset: 340091:cf8c037d23fb
user: wiz <wiz%NetBSD.org@localhost>
date: Sat Aug 22 14:04:54 2015 +0000
description:
Update for v1.10: use '(*)' instead of '#' as dagger replacement.
dholland finds the '#' unintuitive and hard to read.
diffstat:
lib/libc/regex/re_format.7 | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diffs (118 lines):
diff -r 3dabe3c0102e -r cf8c037d23fb lib/libc/regex/re_format.7
--- a/lib/libc/regex/re_format.7 Sat Aug 22 12:12:47 2015 +0000
+++ b/lib/libc/regex/re_format.7 Sat Aug 22 14:04:54 2015 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: re_format.7,v 1.10 2013/01/25 11:51:42 wiz Exp $
+.\" $NetBSD: re_format.7,v 1.11 2015/08/22 14:04:54 wiz Exp $
.\"
.\" Copyright (c) 1992, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -83,15 +83,15 @@
Obsolete REs mostly exist for backward compatibility in some old programs;
they will be discussed at the end.
1003.2 leaves some aspects of RE syntax and semantics open;
-`#' marks decisions on these aspects that
+`(*)' marks decisions on these aspects that
may not be fully portable to other 1003.2 implementations.
.Pp
-A (modern) RE is one# or more non-empty#
+A (modern) RE is one(*) or more non-empty(*)
.Em branches ,
separated by `|'.
It matches anything that matches one of the branches.
.Pp
-A branch is one# or more
+A branch is one(*) or more
.Em pieces ,
concatenated.
It matches a match for the first, followed by a match for the second, etc.
@@ -99,7 +99,7 @@
A piece is an
.Em atom
possibly followed
-by a single# `*', `+', `?', or
+by a single(*) `*', `+', `?', or
.Em bound .
An atom followed by `*' matches a sequence of 0 or more matches of the atom.
An atom followed by `+' matches a sequence of 1 or more matches of the atom.
@@ -110,7 +110,7 @@
is `{' followed by an unsigned decimal integer, possibly followed by `,'
possibly followed by another unsigned decimal integer,
always followed by `}'.
-The integers must lie between 0 and RE_DUP_MAX (255#) inclusive,
+The integers must lie between 0 and RE_DUP_MAX (255(*)) inclusive,
and if there are two of them, the first may not exceed the second.
An atom followed by a bound containing one integer
.Em i
@@ -133,19 +133,19 @@
(inclusive) matches of the atom.
.Pp
An atom is a regular expression enclosed in `()' (matching a match for the
-regular expression), an empty set of `()' (matching the null string)#, a
+regular expression), an empty set of `()' (matching the null string)(*), a
.Em bracket expression
(see below), `.' (matching any single character),
`^' (matching the null string at the beginning of a line),
`$' (matching the null string at the end of a line),
a `\e' followed by one of the characters `^.[$()|*+?{\e'
(matching that character taken as an ordinary character),
-a `\e' followed by any other character#
+a `\e' followed by any other character(*)
(matching that character taken as an ordinary character,
-as if the `\e' had not been present#),
+as if the `\e' had not been present(*)),
or a single character with no other significance (matching that character).
A `{' followed by a character other than a digit is an ordinary
-character, not the beginning of a bound#.
+character, not the beginning of a bound(*).
It is illegal to end an RE with `\e'.
.Pp
A
@@ -161,7 +161,7 @@
.Em range
of characters between those two (inclusive) in the collating sequence,
e.g. `[0-9]' in ASCII matches any decimal digit.
-It is illegal# for two ranges to share an endpoint, e.g. `a-c-e'.
+It is illegal(*) for two ranges to share an endpoint, e.g. `a-c-e'.
Ranges are very collating-sequence-dependent,
and portable programs should avoid relying on them.
.Pp
@@ -194,7 +194,7 @@
the treatment is as if the enclosing delimiters were `[.' and `.]'.)
For example, if o and '\(^o' are the members of an equivalence class,
then `[[=o=]]', `[[=\(^o'=]]', and `[o\(^o']' are all synonymous.
-An equivalence class may not# be an endpoint
+An equivalence class may not(*) be an endpoint
of a range.
.Pp
Within a bracket expression, the name of a
@@ -214,7 +214,7 @@
A locale may provide others.
A character class may not be used as an endpoint of a range.
.Pp
-There are two special cases# of bracket expressions:
+There are two special cases(*) of bracket expressions:
the bracket expressions `[[:\*[Lt]:]]' and `[[:\*[Gt]:]]' match
the null string at the beginning and end of a word respectively.
A word is defined as a sequence of word characters
@@ -260,7 +260,7 @@
of it are added to the bracket expression, so that (e.g.) `[x]'
becomes `[xX]' and `[^x]' becomes `[^xX]'.
.Pp
-No particular limit is imposed on the length of REs#.
+No particular limit is imposed on the length of REs(*).
Programs intended to be portable should not employ REs longer
than 256 bytes,
as an implementation can refuse to accept such REs and remain
@@ -274,9 +274,9 @@
The parentheses for nested subexpressions are `\e(' and `\e)',
with `(' and `)' by themselves ordinary characters.
`^' is an ordinary character except at the beginning of the
-RE or# the beginning of a parenthesized subexpression,
+RE or(*) the beginning of a parenthesized subexpression,
`$' is an ordinary character except at the end of the
-RE or# the end of a parenthesized subexpression,
+RE or(*) the end of a parenthesized subexpression,
and `*' is an ordinary character if it appears at the beginning of the
RE or the beginning of a parenthesized subexpression
(after a possible leading `^').
Home |
Main Index |
Thread Index |
Old Index