Skip to content

Commit 0097fdc

Browse files
committed
[pcre] sync with en
1 parent 6f26d26 commit 0097fdc

File tree

8 files changed

+32
-18
lines changed

8 files changed

+32
-18
lines changed

reference/pcre/book.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 68c2c871505aadf983f16113c5b077b335ce8d76 Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: c1f37a6c270aadbbb3da56a3973ffd62197adf2b Maintainer: takagi Status: ready -->
44
<!-- CREDITS: haruki,hirokawa -->
55

6-
<book xml:id="book.pcre" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink">
6+
<book xml:id="book.pcre" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" annotations="interactive">
77
<?phpdoc extension-membership="core" ?>
88
<title>正規表現 (Perl 互換)</title>
99
<titleabbrev>PCRE</titleabbrev>

reference/pcre/constants.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 47551a95525f8e2ecc8f89f623c82c3962b5e4cf Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: e62b1e3989a5049c052bc547bb6bf175ada8e48d Maintainer: hirokawa Status: ready -->
44
<!-- Credits: haruki,mumumu -->
55
<appendix xml:id="pcre.constants" xmlns="http://docbook.org/ns/docbook">
66
&reftitle.constants;
@@ -48,7 +48,11 @@
4848
(<type>int</type>)
4949
</entry>
5050
<entry>
51-
<constant>PREG_SPLIT_OFFSET_CAPTURE</constant> の説明を参照ください。
51+
このフラグを設定した場合、各マッチに対応する文字列のオフセットも返されます。
52+
これにより、戻り値は配列の配列に変わることに注意してください。
53+
配列のすべての要素が、オフセット 0 に、マッチした文字列、
54+
オフセット 1 に、対象文字列におけるその文字列のオフセット
55+
からなる配列になります。
5256
</entry>
5357
<entry/>
5458
</row>
@@ -81,11 +85,7 @@
8185
(<type>int</type>)
8286
</entry>
8387
<entry>
84-
このフラグを設定した場合、各マッチに対応する文字列のオフセットも返されます。
85-
これにより、戻り値は配列の配列に変わることに注意してください。
86-
配列のすべての要素が、オフセット 0 に、マッチした文字列、
87-
オフセット 1 に、対象文字列におけるその文字列のオフセット
88-
からなる配列になります。
88+
<constant>PREG_OFFSET_CAPTURE</constant> の説明を参照ください。
8989
このフラグは、<function>preg_split</function> のみで使用されます。
9090
</entry>
9191
<entry/>

reference/pcre/functions/preg-grep.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 41c8533ff5a8f93ba9fdf0732d05dd5ab79864c9 Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: d6f54016d62904cfd8200604aadd5e3f0d9bad97 Maintainer: hirokawa Status: ready -->
44
<!-- Credits: haruki -->
55
<refentry xml:id="function.preg-grep" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -78,16 +78,19 @@
7878
<programlisting role="php">
7979
<![CDATA[
8080
<?php
81+
$array = [ "4", M_PI, "2.74", 42 ];
82+
8183
// すべての浮動小数点数を含む配列要素を返す
8284
$fl_array = preg_grep("/^(\d+)?\.\d+$/", $array);
85+
86+
var_dump($fl_array);
8387
?>
8488
]]>
8589
</programlisting>
8690
</example>
8791
</para>
8892
</refsect1>
8993

90-
9194
<refsect1 role="seealso">
9295
&reftitle.seealso;
9396
<para>

reference/pcre/functions/preg-match.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 41c8533ff5a8f93ba9fdf0732d05dd5ab79864c9 Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: d6f54016d62904cfd8200604aadd5e3f0d9bad97 Maintainer: hirokawa Status: ready -->
44
<!-- Credits: haruki,mumumu -->
55
<refentry xml:id="function.preg-match" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -320,6 +320,8 @@ if (preg_match("/\bweb\b/i", "PHP is the web scripting language of choice.")) {
320320
echo "A match was not found.";
321321
}
322322
323+
echo "\n";
324+
323325
if (preg_match("/\bweb\b/i", "PHP is the website scripting language of choice.")) {
324326
echo "A match was found.";
325327
} else {

reference/pcre/functions/preg-replace-callback.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 41c8533ff5a8f93ba9fdf0732d05dd5ab79864c9 Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: c1f37a6c270aadbbb3da56a3973ffd62197adf2b Maintainer: takagi Status: ready -->
44
<!-- Credits: hirokawa,haruki,mumumu -->
55
<refentry xml:id="function.preg-replace-callback" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -70,7 +70,7 @@
7070
<title>
7171
<function>preg_replace_callback</function> と無名関数
7272
</title>
73-
<programlisting role="php">
73+
<programlisting role="php" annotations="non-interactive">
7474
<![CDATA[
7575
<?php
7676
/* Unix 方式のコマンドラインフィルタです。

reference/pcre/functions/preg-replace.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 62126c55f1c6ed444043e7272c4f9e233818a44b Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: d6f54016d62904cfd8200604aadd5e3f0d9bad97 Maintainer: takagi Status: ready -->
44
<!-- Credits: hirokawa,haruki,shimooka,mumumu -->
55
<refentry xml:id="function.preg-replace" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -215,6 +215,15 @@ The bear black slow jumps over the lazy dog.
215215
<programlisting role="php">
216216
<![CDATA[
217217
<?php
218+
$string = 'The quick brown fox jumps over the lazy dog.';
219+
$patterns = array();
220+
$patterns[0] = '/quick/';
221+
$patterns[1] = '/brown/';
222+
$patterns[2] = '/fox/';
223+
$replacements = array();
224+
$replacements[2] = 'bear';
225+
$replacements[1] = 'black';
226+
$replacements[0] = 'slow';
218227
ksort($patterns);
219228
ksort($replacements);
220229
echo preg_replace($patterns, $replacements, $string);

reference/pcre/functions/preg-split.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: 41c8533ff5a8f93ba9fdf0732d05dd5ab79864c9 Maintainer: hirokawa Status: ready -->
3+
<!-- EN-Revision: bb66ce4d449049730d4967ce74fb68f15a138612 Maintainer: hirokawa Status: ready -->
44
<!-- CREDITS: haruki,elf,mumumu -->
55
<refentry xml:id="function.preg-split" xmlns="http://docbook.org/ns/docbook">
66
<refnamediv>
@@ -231,7 +231,7 @@ Array
231231
<simplelist>
232232
<member><link linkend="pcre.pattern">PCRE のパターン</link></member>
233233
<member><function>preg_quote</function></member>
234-
<member><function>implode</function></member>
234+
<member><function>explode</function></member>
235235
<member><function>preg_match</function></member>
236236
<member><function>preg_match_all</function></member>
237237
<member><function>preg_replace</function></member>

reference/pcre/pattern.modifiers.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<!-- $Revision$ -->
3-
<!-- EN-Revision: c43393d1b64a41be1b8c45f997062b0f645bc91e Maintainer: takagi Status: ready -->
3+
<!-- EN-Revision: b5aa3464c8817645633dc4364e1ac2d7b92c5b3f Maintainer: takagi Status: ready -->
44
<!-- Credits: hirokawa,haruki,mumumu -->
55
<article xml:id="reference.pcre.pattern.modifiers" xmlns="http://docbook.org/ns/docbook">
66
<title>パターン修飾子</title>

0 commit comments

Comments
 (0)