From 86cf380007b365c73f3605be7e36be168618a6a4 Mon Sep 17 00:00:00 2001 From: Vladimir Panteleev Date: Sat, 24 Oct 2015 05:56:45 +0000 Subject: [PATCH] HTML fixes --- etc/c/curl.d | 6 +- etc/c/sqlite3.d | 2 +- std/datetime.d | 14 +- .../allocator/building_blocks/package.d | 6 +- std/format.d | 282 +++++++++--------- std/internal/math/errorfunction.d | 2 +- std/internal/math/gammafunction.d | 2 +- std/math.d | 4 +- std/mathspecial.d | 2 +- std/net/curl.d | 2 +- std/net/isemail.d | 2 +- std/outbuffer.d | 4 +- std/random.d | 2 +- std/range/package.d | 2 +- std/regex/package.d | 27 +- std/stdint.d | 169 +++++------ std/stdio.d | 4 +- std/traits.d | 2 +- std/zlib.d | 2 +- 19 files changed, 269 insertions(+), 267 deletions(-) diff --git a/etc/c/curl.d b/etc/c/curl.d index df78399d8..766452423 100644 --- a/etc/c/curl.d +++ b/etc/c/curl.d @@ -711,8 +711,8 @@ enum CURLOPTTYPE_FUNCTIONPOINT = 20000; /// ditto enum CURLOPTTYPE_OFF_T = 30000; -/** name is uppercase CURLOPT_, - type is one of the defined CURLOPTTYPE_ +/** name is uppercase CURLOPT_$(LT)name$(GT), + type is one of the defined CURLOPTTYPE_$(LT)type$(GT) number is unique identifier */ /** The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */ @@ -1152,7 +1152,7 @@ enum CurlOption { opensocketdata = 10164, /// ditto /** POST volatile input fields. */ copypostfields, - /** set transfer mode (;type=) when doing FTP via an HTTP proxy */ + /** set transfer mode (;type=$(LT)a|i$(GT)) when doing FTP via an HTTP proxy */ proxy_transfer_mode = 166, /** Callback function for seeking in the input stream */ seekfunction = 20167, diff --git a/etc/c/sqlite3.d b/etc/c/sqlite3.d index 510ad3586..1f0ac849f 100644 --- a/etc/c/sqlite3.d +++ b/etc/c/sqlite3.d @@ -1858,7 +1858,7 @@ enum ** Register a geometry callback named zGeom that can be used as part of an ** R-Tree geometry query as follows: ** -** SELECT ... FROM WHERE MATCH $zGeom(... params ...) +** SELECT ... FROM $(LT)rtree$(GT) WHERE $(LT)rtree col$(GT) MATCH $zGeom(... params ...) */ int sqlite3_rtree_geometry_callback( sqlite3 *db, diff --git a/std/datetime.d b/std/datetime.d index 521206588..8dadbb818 100644 --- a/std/datetime.d +++ b/std/datetime.d @@ -28047,9 +28047,9 @@ private: Note: Unless your system's local time zone deals with leap seconds (which is highly unlikely), then the only way to get a time zone which - takes leap seconds into account is to use $(LREF PosixTimeZone) with a + takes leap seconds into account is to use $(D PosixTimeZone) with a time zone whose name starts with "right/". Those time zone files do - include leap seconds, and $(LREF PosixTimeZone) will take them into account + include leap seconds, and $(D PosixTimeZone) will take them into account (though posix systems which use a "right/" time zone as their local time zone will $(I not) take leap seconds into account even though they're in the file). @@ -28872,17 +28872,17 @@ version(StdDdoc) occur (especially for historical dates). Also, the TZ Database files include far more time zones than Windows does. So, for accurate time zone information, use the TZ Database files with - $(LREF PosixTimeZone) rather than $(LREF WindowsTimeZone). However, because - $(LREF WindowsTimeZone) uses Windows system calls to deal with the time, + $(LREF PosixTimeZone) rather than $(D WindowsTimeZone). However, because + $(D WindowsTimeZone) uses Windows system calls to deal with the time, it's far more likely to match the behavior of other Windows programs. Be aware of the differences when selecting a method. - $(LREF WindowsTimeZone) does not exist on Posix systems. + $(D WindowsTimeZone) does not exist on Posix systems. - To get a $(LREF WindowsTimeZone), either call + To get a $(D WindowsTimeZone), either call $(D WindowsTimeZone.getTimeZone) or call $(D TimeZone.getTimeZone) (which will give a $(LREF PosixTimeZone) on Posix systems and a - $(LREF WindowsTimeZone) on Windows systems). + $(D WindowsTimeZone) on Windows systems). See_Also: $(WEB www.iana.org/time-zones, Home of the TZ Database files) diff --git a/std/experimental/allocator/building_blocks/package.d b/std/experimental/allocator/building_blocks/package.d index 0ec813cf4..b1908592c 100644 --- a/std/experimental/allocator/building_blocks/package.d +++ b/std/experimental/allocator/building_blocks/package.d @@ -283,10 +283,10 @@ Macros: MYREF = $(LINK2 std_experimental_allocator_building_blocks_$2.html, $1)  MYREF2 = $(LINK2 std_experimental_allocator_building_blocks_$2.html#$1, $1)  MYREF3 = $(LINK2 std_experimental_allocator_$2.html#$1, $1)  -TDC = $(T td nowrap, $(D $1)$+) -TDC2 = $(T td nowrap, $(D $(MYREF2 $1,$+))$(BR)$(SMALL +TDC = $(TDNW $(D $1)$+) +TDC2 = $(TDNW $(D $(MYREF2 $1,$+))$(BR)$(SMALL $(D std.experimental.allocator.building_blocks.$2))) -TDC3 = $(T td nowrap, $(D $(MYREF3 $1,$+))$(BR)$(SMALL +TDC3 = $(TDNW $(D $(MYREF3 $1,$+))$(BR)$(SMALL $(D std.experimental.allocator.$2))) RES = $(I result) POST = $(BR)$(SMALL $(I Post:) $(BLUE $(D $0))) diff --git a/std/format.d b/std/format.d index a23c9f9dd..5089084ed 100644 --- a/std/format.d +++ b/std/format.d @@ -218,68 +218,68 @@ $(I FormatChar): $(TR $(TD $(B ' ')) $(TD numeric) $(TD Prefix positive numbers in a signed conversion with a space.))) -
-
$(I Width) -
+ $(DL + $(DT $(I Width)) + $(DD Specifies the minimum field width. If the width is a $(B *), an additional argument of type $(B int), preceding the actual argument, is taken as the width. If the width is negative, it is as if the $(B -) was given - as a $(I Flags) character. + as a $(I Flags) character.) -
$(I Precision) -
Gives the precision for numeric conversions. + $(DT $(I Precision)) + $(DD Gives the precision for numeric conversions. If the precision is a $(B *), an additional argument of type $(B int), preceding the actual argument, is taken as the precision. - If it is negative, it is as if there was no $(I Precision) specifier. + If it is negative, it is as if there was no $(I Precision) specifier.) -
$(I FormatChar) -
-
-
$(B 's') -
The corresponding argument is formatted in a manner consistent + $(DT $(I FormatChar)) + $(DD + $(DL + $(DT $(B 's')) + $(DD The corresponding argument is formatted in a manner consistent with its type: -
-
$(B bool) -
The result is 'true' or 'false'. -
integral types -
The $(B %d) format is used. -
floating point types -
The $(B %g) format is used. -
string types -
The result is the string converted to UTF-8. + $(DL + $(DT $(B bool)) + $(DD The result is $(D "true") or $(D "false").) + $(DT integral types) + $(DD The $(B %d) format is used.) + $(DT floating point types) + $(DD The $(B %g) format is used.) + $(DT string types) + $(DD The result is the string converted to UTF-8. A $(I Precision) specifies the maximum number of characters - to use in the result. -
structs -
If the struct defines a $(B toString()) method the result is + to use in the result.) + $(DT structs) + $(DD If the struct defines a $(B toString()) method the result is the string returned from this function. Otherwise the result is StructName(field0, field1, ...) where fieldn is the nth element formatted with the default - format. -
classes derived from $(B Object) -
The result is the string returned from the class instance's + format.) + $(DT classes derived from $(B Object)) + $(DD The result is the string returned from the class instance's $(B .toString()) method. A $(I Precision) specifies the maximum number of characters - to use in the result. -
unions -
If the union defines a $(B toString()) method the result is + to use in the result.) + $(DT unions) + $(DD If the union defines a $(B toString()) method the result is the string returned from this function. Otherwise the result is - the name of the union, without its contents. -
non-string static and dynamic arrays -
The result is [s0, s1, ...] + the name of the union, without its contents.) + $(DT non-string static and dynamic arrays) + $(DD The result is [s0, s1, ...] where sn is the nth element - formatted with the default format. -
associative arrays -
The result is the equivalent of what the initializer + formatted with the default format.) + $(DT associative arrays) + $(DD The result is the equivalent of what the initializer would look like for the contents of the associative array, - e.g.: ["red" : 10, "blue" : 20]. -
+ e.g.: ["red" : 10, "blue" : 20].) + )) -
$(B 'c') -
The corresponding argument must be a character type. + $(DT $(B 'c')) + $(DD The corresponding argument must be a character type.) -
$(B 'b','d','o','x','X') -
The corresponding argument must be an integral type + $(DT $(B 'b','d','o','x','X')) + $(DD The corresponding argument must be an integral type and is formatted as an integer. If the argument is a signed type and the $(I FormatChar) is $(B d) it is converted to a signed string of characters, otherwise it is treated as @@ -291,26 +291,26 @@ $(I FormatChar): If there are fewer resulting digits than the $(I Precision), leading zeros are used as necessary. If the $(I Precision) is 0 and the number is 0, no digits - result. + result.) -
$(B 'e','E') -
A floating point number is formatted as one digit before + $(DT $(B 'e','E')) + $(DD A floating point number is formatted as one digit before the decimal point, $(I Precision) digits after, the $(I FormatChar), ±, followed by at least a two digit exponent: $(I d.dddddd)e$(I ±dd). If there is no $(I Precision), six digits are generated after the decimal point. - If the $(I Precision) is 0, no decimal point is generated. + If the $(I Precision) is 0, no decimal point is generated.) -
$(B 'f','F') -
A floating point number is formatted in decimal notation. + $(DT $(B 'f','F')) + $(DD A floating point number is formatted in decimal notation. The $(I Precision) specifies the number of digits generated after the decimal point. It defaults to six. At least one digit is generated before the decimal point. If the $(I Precision) - is zero, no decimal point is generated. + is zero, no decimal point is generated.) -
$(B 'g','G') -
A floating point number is formatted in either $(B e) or + $(DT $(B 'g','G')) + $(DD A floating point number is formatted in either $(B e) or $(B f) format for $(B g); $(B E) or $(B F) format for $(B G). The $(B f) format is used if the exponent for an $(B e) format @@ -318,10 +318,10 @@ $(I FormatChar): The $(I Precision) specifies the number of significant digits, and defaults to six. Trailing zeros are elided after the decimal point, if the fractional - part is zero then no decimal point is generated. + part is zero then no decimal point is generated.) -
$(B 'a','A') -
A floating point number is formatted in hexadecimal + $(DT $(B 'a','A')) + $(DD A floating point number is formatted in hexadecimal exponential notation 0x$(I h.hhhhhh)p$(I ±d). There is one hexadecimal digit before the decimal point, and as many after as specified by the $(I Precision). @@ -333,9 +333,9 @@ $(I FormatChar): $(I h.hhhhhh)*2$(I ±d). The exponent for zero is zero. The hexadecimal digits, x and p are in upper case if the - $(I FormatChar) is upper case. -
-
+ $(I FormatChar) is upper case.) + )) + ) Floating point NaN's are formatted as $(B nan) if the $(I FormatChar) is lower case, or $(B NAN) if upper. @@ -376,10 +376,10 @@ $(I FormatChar): } ------------------------- The output is: -
+$(CONSOLE
 My items are 1 2 3.
 My items are 1, 2, 3.
-
+) The trailing end of the sub-format string following the specifier for each item is interpreted as the array delimiter, and is therefore omitted @@ -395,9 +395,9 @@ My items are 1, 2, 3. } ------------------------- which gives the output: -
+$(CONSOLE
 My items are -1-, -2-, -3-.
-
+) These compound format specifiers may be nested in the case of a nested array argument: @@ -419,7 +419,7 @@ My items are -1-, -2-, -3-. } ------------------------- The output is: -
+$(CONSOLE
 1 2 3
 4 5 6
 7 8 9
@@ -431,7 +431,7 @@ My items are -1-, -2-, -3-.
 [[1 2 3]
  [4 5 6]
  [7 8 9]]
-
+) Inside a compound format specifier, strings and characters are escaped automatically. To avoid this behavior, add $(B '-') flag to @@ -447,11 +447,11 @@ My items are -1-, -2-, -3-. } ------------------------- which gives the output: -
+$(CONSOLE
 My friends are ["John", "Nancy"].
 My friends are "John", "Nancy".
 My friends are John, Nancy.
-
+) */ uint formattedWrite(Writer, Char, A...)(Writer w, in Char[] fmt, A args) { @@ -1249,10 +1249,10 @@ unittest import std.array : appender; auto a = appender!(string)(); - auto f = FormatSpec!char("%-(%s%"); + auto f = FormatSpec!char("%-(%s%"); // %)") assertThrown(f.writeUpToNextSpec(a)); - f = FormatSpec!char("%(%-"); + f = FormatSpec!char("%(%-"); // %)") assertThrown(f.writeUpToNextSpec(a)); } @@ -5083,7 +5083,7 @@ private TypeInfo primitiveTypeInfo(Mangle m) * A $(I format specification) starts with a '%' character, * and has the following grammar: -
+$(CONSOLE
 $(I FormatSpecification):
     $(B '%%')
     $(B '%') $(I Flags) $(I Width) $(I Precision) $(I FormatChar)
@@ -5138,88 +5138,88 @@ $(I FormatChar):
     $(B 'G')
     $(B 'a')
     $(B 'A')
-
-
-
$(I Flags) -
-
$(B '-') -
+) + $(DL + $(DT $(I Flags)) + $(DL + $(DT $(B '-')) + $(DD Left justify the result in the field. - It overrides any $(B 0) flag. + It overrides any $(B 0) flag.) -
$(B '+') -
Prefix positive numbers in a signed conversion with a $(B +). - It overrides any $(I space) flag. + $(DT $(B '+')) + $(DD Prefix positive numbers in a signed conversion with a $(B +). + It overrides any $(I space) flag.) -
$(B '#') -
Use alternative formatting: -
-
For $(B 'o'): -
Add to precision as necessary so that the first digit + $(DT $(B '#')) + $(DD Use alternative formatting: + $(DL + $(DT For $(B 'o'):) + $(DD Add to precision as necessary so that the first digit of the octal formatting is a '0', even if both the argument - and the $(I Precision) are zero. -
For $(B 'x') ($(B 'X')): -
If non-zero, prefix result with $(B 0x) ($(B 0X)). -
For floating point formatting: -
Always insert the decimal point. -
For $(B 'g') ($(B 'G')): -
Do not elide trailing zeros. -
+ and the $(I Precision) are zero.) + $(DT For $(B 'x') ($(B 'X')):) + $(DD If non-zero, prefix result with $(B 0x) ($(B 0X)).) + $(DT For floating point formatting:) + $(DD Always insert the decimal point.) + $(DT For $(B 'g') ($(B 'G')):) + $(DD Do not elide trailing zeros.) + )) -
$(B '0') -
For integer and floating point formatting when not nan or + $(DT $(B '0')) + $(DD For integer and floating point formatting when not nan or infinity, use leading zeros to pad rather than spaces. - Ignore if there's a $(I Precision). + Ignore if there's a $(I Precision).) -
$(B ' ') -
Prefix positive numbers in a signed conversion with a space. -
+ $(DT $(B ' ')) + $(DD Prefix positive numbers in a signed conversion with a space.) + ) -
$(I Width) -
+ $(DT $(I Width)) + $(DD Specifies the minimum field width. If the width is a $(B *), the next argument, which must be of type $(B int), is taken as the width. If the width is negative, it is as if the $(B -) was given - as a $(I Flags) character. + as a $(I Flags) character.) -
$(I Precision) -
Gives the precision for numeric conversions. + $(DT $(I Precision)) + $(DD Gives the precision for numeric conversions. If the precision is a $(B *), the next argument, which must be of type $(B int), is taken as the precision. If it is negative, - it is as if there was no $(I Precision). + it is as if there was no $(I Precision).) -
$(I FormatChar) -
-
-
$(B 's') -
The corresponding argument is formatted in a manner consistent + $(DT $(I FormatChar)) + $(DD + $(DL + $(DT $(B 's')) + $(DD The corresponding argument is formatted in a manner consistent with its type: -
-
$(B bool) -
The result is 'true' or 'false'. -
integral types -
The $(B %d) format is used. -
floating point types -
The $(B %g) format is used. -
string types -
The result is the string converted to UTF-8. + $(DL + $(DT $(B bool)) + $(DD The result is 'true' or 'false'.) + $(DT integral types) + $(DD The $(B %d) format is used.) + $(DT floating point types) + $(DD The $(B %g) format is used.) + $(DT string types) + $(DD The result is the string converted to UTF-8.) A $(I Precision) specifies the maximum number of characters to use in the result. -
classes derived from $(B Object) -
The result is the string returned from the class instance's + $(DT classes derived from $(B Object)) + $(DD The result is the string returned from the class instance's $(B .toString()) method. A $(I Precision) specifies the maximum number of characters - to use in the result. -
non-string static and dynamic arrays -
The result is [s0, s1, ...] + to use in the result.) + $(DT non-string static and dynamic arrays) + $(DD The result is [s0, s1, ...] where sk is the kth element - formatted with the default format. -
+ formatted with the default format.) + )) -
$(B 'b','d','o','x','X') -
The corresponding argument must be an integral type + $(DT $(B 'b','d','o','x','X')) + $(DD The corresponding argument must be an integral type and is formatted as an integer. If the argument is a signed type and the $(I FormatChar) is $(B d) it is converted to a signed string of characters, otherwise it is treated as @@ -5231,25 +5231,25 @@ $(I FormatChar): If there are fewer resulting digits than the $(I Precision), leading zeros are used as necessary. If the $(I Precision) is 0 and the number is 0, no digits - result. + result.) -
$(B 'e','E') -
A floating point number is formatted as one digit before + $(DT $(B 'e','E')) + $(DD A floating point number is formatted as one digit before the decimal point, $(I Precision) digits after, the $(I FormatChar), ±, followed by at least a two digit exponent: $(I d.dddddd)e$(I ±dd). If there is no $(I Precision), six digits are generated after the decimal point. - If the $(I Precision) is 0, no decimal point is generated. + If the $(I Precision) is 0, no decimal point is generated.) -
$(B 'f','F') -
A floating point number is formatted in decimal notation. + $(DT $(B 'f','F')) + $(DD A floating point number is formatted in decimal notation. The $(I Precision) specifies the number of digits generated after the decimal point. It defaults to six. At least one digit is generated before the decimal point. If the $(I Precision) - is zero, no decimal point is generated. + is zero, no decimal point is generated.) -
$(B 'g','G') -
A floating point number is formatted in either $(B e) or + $(DT $(B 'g','G')) + $(DD A floating point number is formatted in either $(B e) or $(B f) format for $(B g); $(B E) or $(B F) format for $(B G). The $(B f) format is used if the exponent for an $(B e) format @@ -5257,10 +5257,10 @@ $(I FormatChar): The $(I Precision) specifies the number of significant digits, and defaults to six. Trailing zeros are elided after the decimal point, if the fractional - part is zero then no decimal point is generated. + part is zero then no decimal point is generated.) -
$(B 'a','A') -
A floating point number is formatted in hexadecimal + $(DT $(B 'a','A')) + $(DD A floating point number is formatted in hexadecimal exponential notation 0x$(I h.hhhhhh)p$(I ±d). There is one hexadecimal digit before the decimal point, and as many after as specified by the $(I Precision). @@ -5272,15 +5272,15 @@ $(I FormatChar): $(I h.hhhhhh)*2$(I ±d). The exponent for zero is zero. The hexadecimal digits, x and p are in upper case if the - $(I FormatChar) is upper case. -
+ $(I FormatChar) is upper case.) + ) Floating point NaN's are formatted as $(B nan) if the $(I FormatChar) is lower case, or $(B NAN) if upper. Floating point infinities are formatted as $(B inf) or $(B infinity) if the $(I FormatChar) is lower case, or $(B INF) or $(B INFINITY) if upper. -
+ )) Example: diff --git a/std/internal/math/errorfunction.d b/std/internal/math/errorfunction.d index 6c57a364d..efa53a184 100644 --- a/std/internal/math/errorfunction.d +++ b/std/internal/math/errorfunction.d @@ -16,7 +16,7 @@ * POWER = $1$2 * BIGSUM = $(BIG Σ $2$(SMALL $1)) * CHOOSE = $(BIG () $(SMALL $1)$(SMALL $2) $(BIG )) - * TABLE_SV = + * TABLE_SV =
* * $0
Special Values
* SVH = $(TR $(TH $1) $(TH $2)) diff --git a/std/internal/math/gammafunction.d b/std/internal/math/gammafunction.d index b8bbf7595..b409e777b 100644 --- a/std/internal/math/gammafunction.d +++ b/std/internal/math/gammafunction.d @@ -8,7 +8,7 @@ * * Macros: - * TABLE_SV = + * TABLE_SV =
* * $0
Special Values
* SVH = $(TR $(TH $1) $(TH $2)) diff --git a/std/math.d b/std/math.d index 7323204c7..182f4742a 100644 --- a/std/math.d +++ b/std/math.d @@ -80,7 +80,7 @@ $(TR $(TDNW Hardware Control) $(TD * Macros: * WIKI = Phobos/StdMath * - * TABLE_SV = + * TABLE_SV =
* * $0
Special Values
* SVH = $(TR $(TH $1) $(TH $2)) @@ -110,7 +110,7 @@ $(TR $(TDNW Hardware Control) $(TD * Copyright: Copyright Digital Mars 2000 - 2011. * D implementations of tan, atan, atan2, exp, expm1, exp2, log, log10, log1p, * log2, floor, ceil and lrint functions are based on the CEPHES math library, - * which is Copyright (C) 2001 Stephen L. Moshier + * which is Copyright (C) 2001 Stephen L. Moshier $(LT)steve@moshier.net$(GT) * and are incorporated herein by permission of the author. The author * reserves the right to distribute this material elsewhere under different * copying permissions. These modifications are distributed here under diff --git a/std/mathspecial.d b/std/mathspecial.d index 29d20e318..6cd5bbc53 100644 --- a/std/mathspecial.d +++ b/std/mathspecial.d @@ -22,7 +22,7 @@ * Macros: * WIKI = Phobos/StdMathSpecial * - * TABLE_SV = + * TABLE_SV =
* * $0
Special Values
* SVH = $(TR $(TH $1) $(TH $2)) diff --git a/std/net/curl.d b/std/net/curl.d index 92e16c8af..d071606e2 100644 --- a/std/net/curl.d +++ b/std/net/curl.d @@ -3063,7 +3063,7 @@ struct HTTP } } - /** The standard HTTP methods : + /** The standard HTTP methods : * $(WEB www.w3.org/Protocols/rfc2616/rfc2616-sec5.html#sec5.1.1, _RFC2616 Section 5.1.1) */ enum Method diff --git a/std/net/isemail.d b/std/net/isemail.d index 10c5ce767..599ad38f9 100644 --- a/std/net/isemail.d +++ b/std/net/isemail.d @@ -1,7 +1,7 @@ /** * Validates an email address according to RFCs 5321, 5322 and others. * - * Authors: Dominic Sayers , Jacob Carlborg + * Authors: Dominic Sayers $(LT)dominic@sayers.cc$(GT), Jacob Carlborg * Copyright: Dominic Sayers, Jacob Carlborg 2008-. * Test schema documentation: Copyright © 2011, Daniel Marschall * License: $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost Software License 1.0) diff --git a/std/outbuffer.d b/std/outbuffer.d index fc66edf59..7f988386a 100644 --- a/std/outbuffer.d +++ b/std/outbuffer.d @@ -329,7 +329,7 @@ class OutBuffer * args = arguments to be formatted * * See_Also: - * $(XREF stdio, writef); + * $(XREF stdio, _writef); * $(XREF format, formattedWrite); */ void writef(Char, A...)(in Char[] fmt, A args) @@ -355,7 +355,7 @@ class OutBuffer * args = arguments to be formatted * * See_Also: - * $(XREF stdio, writefln); + * $(XREF stdio, _writefln); * $(XREF format, formattedWrite); */ void writefln(Char, A...)(in Char[] fmt, A args) diff --git a/std/random.d b/std/random.d index 82edf9105..193f55793 100644 --- a/std/random.d +++ b/std/random.d @@ -32,7 +32,7 @@ distribution in various ways. So far the uniform distribution for integers and real numbers have been implemented. Upgrading: - $(WEB digitalmars.com/d/1.0/phobos/std_random.html#rand Phobos D1 $(D rand())) can + $(WEB digitalmars.com/d/1.0/phobos/std_random.html#rand, Phobos D1 $(D rand())) can be replaced with $(D uniform!uint()). Source: $(PHOBOSSRC std/_random.d) diff --git a/std/range/package.d b/std/range/package.d index 264aa9e29..11d09e09f 100644 --- a/std/range/package.d +++ b/std/range/package.d @@ -11,7 +11,7 @@ files, incoming network data, etc. For more detailed information about the conceptual aspect of ranges and the motivation behind them, see Andrei Alexandrescu's article -$(LINK2 http://www.informit.com/articles/printerfriendly.aspx?p=1407357&rll=1, +$(LINK2 http://www.informit.com/articles/printerfriendly.aspx?p=1407357$(AMP)rll=1, $(I On Iteration)). Submodules: diff --git a/std/regex/package.d b/std/regex/package.d index 91534a022..b863fe594 100644 --- a/std/regex/package.d +++ b/std/regex/package.d @@ -2,7 +2,7 @@ $(LUCKY Regular expressions) are a commonly used method of pattern matching on strings, with $(I regex) being a catchy word for a pattern in this domain specific language. Typical problems usually solved by regular expressions - include validation of user input and the ubiquitous find & replace + include validation of user input and the ubiquitous find $(AMP) replace in text processing utilities. $(SECTION Synopsis) @@ -117,21 +117,21 @@ $(REG_ROW +?, Matches previous character/subexpression 1 or more times. Lazy version - stops as early as possible.) $(REG_ROW {n}, Matches previous character/subexpression exactly n times. ) - $(REG_ROW {n,}, Matches previous character/subexpression n times or more. + $(REG_ROW {n$(COMMA)}, Matches previous character/subexpression n times or more. Greedy version - tries as many times as possible. ) - $(REG_ROW {n,}?, Matches previous character/subexpression n times or more. + $(REG_ROW {n$(COMMA)}?, Matches previous character/subexpression n times or more. Lazy version - stops as early as possible.) - $(REG_ROW {n,m}, Matches previous character/subexpression n to m times. + $(REG_ROW {n$(COMMA)m}, Matches previous character/subexpression n to m times. Greedy version - tries as many times as possible, but no more than m times. ) - $(REG_ROW {n,m}?, Matches previous character/subexpression n to m times. + $(REG_ROW {n$(COMMA)m}?, Matches previous character/subexpression n to m times. Lazy version - stops as early as possible, but no less then n times.) - $(REG_TITLE Other, Subexpressions & alternations ) + $(REG_TITLE Other, Subexpressions $(AMP) alternations ) $(REG_ROW (regex), Matches subexpression regex, saving matched portion of text for later retrieval. ) $(REG_ROW (?:regex), Matches subexpression regex, $(U not) saving matched portion of text. Useful to speed up matching. ) $(REG_ROW A|B, Matches subexpression A, or failing that, matches B. ) - $(REG_ROW (?P<name>regex), Matches named subexpression + $(REG_ROW (?P$(LT)name$(GT)regex), Matches named subexpression regex labeling it with name 'name'. When referring to a matched portion of text, names work like aliases in addition to direct numbers. @@ -164,8 +164,9 @@ $(REG_TITLE Pattern element, Semantics ) $(REG_ROW Any atom, Has the same meaning as outside of a character class.) $(REG_ROW a-z, Includes characters a, b, c, ..., z. ) - $(REG_ROW [a||b], [a--b], [a~~b], [a&&b], Where a, b are arbitrary classes, - means union, set difference, symmetric set difference, and intersection respectively. + $(REG_ROW [a||b]$(COMMA) [a--b]$(COMMA) [a~~b]$(COMMA) [a$(AMP)$(AMP)b], + Where a, b are arbitrary classes, means union, set difference, + symmetric set difference, and intersection respectively. $(I Any sequence of character class elements implicitly forms a union.) ) ) @@ -209,13 +210,13 @@ The format string can reference parts of match using the following notation. $(REG_TABLE $(REG_TITLE Format specifier, Replaced by ) - $(REG_ROW $&, the whole match. ) + $(REG_ROW $$(AMP), the whole match. ) $(REG_ROW $(DOLLAR)$(BACKTICK), part of input $(I preceding) the match. ) $(REG_ROW $', part of input $(I following) the match. ) $(REG_ROW $$, '$' character. ) - $(REG_ROW \c , where c is any character, the character c itself. ) + $(REG_ROW \c $(COMMA) where c is any character, the character c itself. ) $(REG_ROW \\, '\' character. ) - $(REG_ROW $1 .. $99, submatch number 1 to 99 respectively. ) + $(REG_ROW $(DOLLAR)1 .. $(DOLLAR)99, submatch number 1 to 99 respectively. ) ) $(SECTION Slicing and zero memory allocations orientation) @@ -237,7 +238,7 @@ API and utility constructs are modeled after the original $(D std.regex) by Walter Bright and Andrei Alexandrescu. - Source: $(PHOBOSSRC std/regex/_package.d) + Source: $(PHOBOSSRC std/_regex/_package.d) Macros: REG_ROW = $(TR $(TD $(I $1 )) $(TD $+) ) diff --git a/std/stdint.d b/std/stdint.d index 2d09658d3..f0740f04e 100644 --- a/std/stdint.d +++ b/std/stdint.d @@ -17,103 +17,104 @@ The aliases are: - - - - - - - - - -
Exact Alias - Description - At Least Alias - Description - Fast Alias - Description -
int8_t - exactly 8 bits signed - int_least8_t - at least 8 bits signed - int_fast8_t - fast 8 bits signed -
uint8_t - exactly 8 bits unsigned - uint_least8_t - at least 8 bits unsigned - uint_fast8_t - fast 8 bits unsigned + $(ATABLE $(TR + $(TH Exact Alias) + $(TH Description) + $(TH At Least Alias) + $(TH Description) + $(TH Fast Alias) + $(TH Description) + )$(TR + $(TD int8_t) + $(TD exactly 8 bits signed) + $(TD int_least8_t) + $(TD at least 8 bits signed) + $(TD int_fast8_t) + $(TD fast 8 bits signed) + )$(TR + $(TD uint8_t) + $(TD exactly 8 bits unsigned) + $(TD uint_least8_t) + $(TD at least 8 bits unsigned) + $(TD uint_fast8_t) + $(TD fast 8 bits unsigned) -
int16_t - exactly 16 bits signed - int_least16_t - at least 16 bits signed - int_fast16_t - fast 16 bits signed -
uint16_t - exactly 16 bits unsigned - uint_least16_t - at least 16 bits unsigned - uint_fast16_t - fast 16 bits unsigned + )$(TR + $(TD int16_t) + $(TD exactly 16 bits signed) + $(TD int_least16_t) + $(TD at least 16 bits signed) + $(TD int_fast16_t) + $(TD fast 16 bits signed) + )$(TR + $(TD uint16_t) + $(TD exactly 16 bits unsigned) + $(TD uint_least16_t) + $(TD at least 16 bits unsigned) + $(TD uint_fast16_t) + $(TD fast 16 bits unsigned) -
int32_t - exactly 32 bits signed - int_least32_t - at least 32 bits signed - int_fast32_t - fast 32 bits signed -
uint32_t - exactly 32 bits unsigned - uint_least32_t - at least 32 bits unsigned - uint_fast32_t - fast 32 bits unsigned + )$(TR + $(TD int32_t) + $(TD exactly 32 bits signed) + $(TD int_least32_t) + $(TD at least 32 bits signed) + $(TD int_fast32_t) + $(TD fast 32 bits signed) + )$(TR + $(TD uint32_t) + $(TD exactly 32 bits unsigned) + $(TD uint_least32_t) + $(TD at least 32 bits unsigned) + $(TD uint_fast32_t) + $(TD fast 32 bits unsigned) -
int64_t - exactly 64 bits signed - int_least64_t - at least 64 bits signed - int_fast64_t - fast 64 bits signed -
uint64_t - exactly 64 bits unsigned - uint_least64_t - at least 64 bits unsigned - uint_fast64_t - fast 64 bits unsigned -
+ )$(TR + $(TD int64_t) + $(TD exactly 64 bits signed) + $(TD int_least64_t) + $(TD at least 64 bits signed) + $(TD int_fast64_t) + $(TD fast 64 bits signed) + )$(TR + $(TD uint64_t) + $(TD exactly 64 bits unsigned) + $(TD uint_least64_t) + $(TD at least 64 bits unsigned) + $(TD uint_fast64_t) + $(TD fast 64 bits unsigned) + )) The ptr aliases are integral types guaranteed to be large enough to hold a pointer without losing bits: - - - -
Alias - Description -
intptr_t - signed integral type large enough to hold a pointer -
uintptr_t - unsigned integral type large enough to hold a pointer -
+ $(ATABLE $(TR + $(TH Alias) + $(TH Description) + )$(TR + $(TD intptr_t) + $(TD signed integral type large enough to hold a pointer) + )$(TR + $(TD uintptr_t) + $(TD unsigned integral type large enough to hold a pointer) + )) The max aliases are the largest integral types: - - - -
Alias - Description -
intmax_t - the largest signed integral type -
uintmax_t - the largest unsigned integral type -
+ $(ATABLE $(TR + $(TH Alias) + $(TH Description) + )$(TR + $(TD intmax_t) + $(TD the largest signed integral type) + )$(TR + $(TD uintmax_t) + $(TD the largest unsigned integral type) + )) * Macros: * WIKI=Phobos/StdStdint + * ATABLE=$0
* * Copyright: Copyright Digital Mars 2000 - 2009. * License: $(WEB www.boost.org/LICENSE_1_0.txt, Boost License 1.0). diff --git a/std/stdio.d b/std/stdio.d index 0ed2ac594..b6a6bed17 100644 --- a/std/stdio.d +++ b/std/stdio.d @@ -330,12 +330,12 @@ void main(string[] args) // underlying $(D FILE*) is closed. } ---- -
+$(CONSOLE
 % rdmd test.d Jimmy
 % cat test.txt
 Hello, Jimmy!
 % __
-
+) */ struct File { diff --git a/std/traits.d b/std/traits.d index 2b589cfad..a66d1f658 100644 --- a/std/traits.d +++ b/std/traits.d @@ -2207,7 +2207,7 @@ unittest } /** - * Alternate name for $(LREF FieldTypeTuple), kept for legacy compatibility. + * Alternate name for $(LREF Fields), kept for legacy compatibility. */ alias FieldTypeTuple = Fields; diff --git a/std/zlib.d b/std/zlib.d index 2952af19d..eafe02344 100644 --- a/std/zlib.d +++ b/std/zlib.d @@ -1,7 +1,7 @@ // Written in the D programming language. /** - * Compress/decompress data using the $(WEB www.zlib.net, zlib library). + * Compress/decompress data using the $(WEB www._zlib.net, _zlib library). * * References: * $(WEB en.wikipedia.org/wiki/Zlib, Wikipedia)