diff options
| author | Patrik Nyblom <[email protected]> | 2011-05-19 16:57:26 +0200 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-05-19 16:57:26 +0200 |
| commit | 5f7fa62cbfa18b88fc254fe362b11367177d2673 (patch) | |
| tree | 63010bb1eb221db6d8e50403506968d34669cd51 /lib/stdlib | |
| parent | f85d382cd3f81cde9afedff2b777c08c8b68e07c (diff) | |
| parent | be7c883a4d53050e5b58e7e805c947c1244ac747 (diff) | |
| download | otp-5f7fa62cbfa18b88fc254fe362b11367177d2673.tar.gz otp-5f7fa62cbfa18b88fc254fe362b11367177d2673.tar.bz2 otp-5f7fa62cbfa18b88fc254fe362b11367177d2673.zip | |
Merge branch 'pan/stdlib_doc_fixes/OTP-9318' into dev
* pan/stdlib_doc_fixes/OTP-9318:
Fixup of re doc and specs
Diffstat (limited to 'lib/stdlib')
| -rw-r--r-- | lib/stdlib/doc/src/re.xml | 4 | ||||
| -rw-r--r-- | lib/stdlib/src/re.erl | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/stdlib/doc/src/re.xml b/lib/stdlib/doc/src/re.xml index 8c9e08ac3a..18867cfb68 100644 --- a/lib/stdlib/doc/src/re.xml +++ b/lib/stdlib/doc/src/re.xml @@ -94,7 +94,7 @@ <type> <v>Regexp = iodata() | <seealso marker="unicode#type-charlist">io:charlist()</seealso></v> <v>Options = [ Option ]</v> - <v>Option = unicode | anchored | caseless | dollar_endonly | dotall | extended | firstline | multiline | no_auto_capture | dupnames | ungreedy | {newline, NLSpec}| bsr_anycrlf | bsr_unicode</v> + <v>Option = <seealso marker="#type-compile_option">compile_option()</seealso></v> <v>NLSpec = <seealso marker="#type-nl_spec">nl_spec()</seealso></v> <v>MP = <seealso marker="#type-mp">mp()</seealso></v> <v>ErrSpec = {ErrString, Position}</v> @@ -170,7 +170,7 @@ This option makes it possible to include comments inside complicated patterns. N <fsummary>Match a subject against regular expression and capture subpatterns</fsummary> <type> <v>Subject = iodata() | <seealso marker="unicode#type-charlist">io:charlist()</seealso></v> - <v>RE = <seealso marker="#type-mp">mp()</seealso> | iodata() | <seealso marker="unicode#type-charlist">io:charlist()</seealso></v> + <v>RE = <seealso marker="#type-mp">mp()</seealso> | iodata()</v> <v>Captured = [ CaptureData ]</v> <v>CaptureData = {integer(),integer()}</v> </type> diff --git a/lib/stdlib/src/re.erl b/lib/stdlib/src/re.erl index 02dbe60741..e08258a535 100644 --- a/lib/stdlib/src/re.erl +++ b/lib/stdlib/src/re.erl @@ -46,7 +46,7 @@ split(Subject,RE) -> -spec split(Subject, RE, Options) -> SplitList when Subject :: iodata() | unicode:charlist(), - RE :: mp() | iodata(), + RE :: mp() | iodata() | unicode:charlist(), Options :: [ Option ], Option :: anchored | global | notbol | noteol | notempty | {offset, non_neg_integer()} | {newline, nl_spec()} @@ -238,7 +238,7 @@ replace(Subject,RE,Replacement) -> -spec replace(Subject, RE, Replacement, Options) -> iodata() | unicode:charlist() when Subject :: iodata() | unicode:charlist(), - RE :: mp() | iodata(), + RE :: mp() | iodata() | unicode:charlist(), Replacement :: iodata() | unicode:charlist(), Options :: [Option], Option :: anchored | global | notbol | noteol | notempty |