Skip to content

Commit 8d04957

Browse files
eisenwaveeisenwave
authored
[cstdint.syn] Add various missing index entries, use inline indexing (cplusplus#9334)
1 parent bb05db0 commit 8d04957

1 file changed

Lines changed: 54 additions & 99 deletions

File tree

‎source/support.tex‎

Lines changed: 54 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -1838,34 +1838,6 @@
18381838
macros that specify limits of integer types.
18391839

18401840
\indexheader{cstdint}%
1841-
\indexlibraryglobal{int8_t}%
1842-
\indexlibraryglobal{int16_t}%
1843-
\indexlibraryglobal{int32_t}%
1844-
\indexlibraryglobal{int64_t}%
1845-
\indexlibraryglobal{int_fast8_t}%
1846-
\indexlibraryglobal{int_fast16_t}%
1847-
\indexlibraryglobal{int_fast32_t}%
1848-
\indexlibraryglobal{int_fast64_t}%
1849-
\indexlibraryglobal{int_least8_t}%
1850-
\indexlibraryglobal{int_least16_t}%
1851-
\indexlibraryglobal{int_least32_t}%
1852-
\indexlibraryglobal{int_least64_t}%
1853-
\indexlibraryglobal{intmax_t}%
1854-
\indexlibraryglobal{intptr_t}%
1855-
\indexlibraryglobal{uint8_t}%
1856-
\indexlibraryglobal{uint16_t}%
1857-
\indexlibraryglobal{uint32_t}%
1858-
\indexlibraryglobal{uint64_t}%
1859-
\indexlibraryglobal{uint_fast8_t}%
1860-
\indexlibraryglobal{uint_fast16_t}%
1861-
\indexlibraryglobal{uint_fast32_t}%
1862-
\indexlibraryglobal{uint_fast64_t}%
1863-
\indexlibraryglobal{uint_least8_t}%
1864-
\indexlibraryglobal{uint_least16_t}%
1865-
\indexlibraryglobal{uint_least32_t}%
1866-
\indexlibraryglobal{uint_least64_t}%
1867-
\indexlibraryglobal{uintmax_t}%
1868-
\indexlibraryglobal{uintptr_t}%
18691841
\indexlibraryglobal{INTN_MIN}%
18701842
\indexlibraryglobal{INTN_MAX}%
18711843
\indexlibraryglobal{UINTN_MAX}%
@@ -1875,71 +1847,54 @@
18751847
\indexlibraryglobal{INT_LEASTN_MIN}%
18761848
\indexlibraryglobal{INT_LEASTN_MAX}%
18771849
\indexlibraryglobal{UINT_LEASTN_MAX}%
1878-
\indexlibraryglobal{INTMAX_MIN}%
1879-
\indexlibraryglobal{INTMAX_MAX}%
1880-
\indexlibraryglobal{UINTMAX_MAX}%
1881-
\indexlibraryglobal{INTPTR_MIN}%
1882-
\indexlibraryglobal{INTPTR_MAX}%
1883-
\indexlibraryglobal{UINTPTR_MAX}%
1884-
\indexlibraryglobal{PTRDIFF_MIN}%
1885-
\indexlibraryglobal{PTRDIFF_MAX}%
1886-
\indexlibraryglobal{SIZE_MAX}%
1887-
\indexlibraryglobal{SIG_ATOMIC_MIN}%
1888-
\indexlibraryglobal{SIG_ATOMIC_MAX}%
1889-
\indexlibraryglobal{WCHAR_MAX}%
1890-
\indexlibraryglobal{WCHAR_MIN}%
1891-
\indexlibraryglobal{WINT_MIN}%
1892-
\indexlibraryglobal{WINT_MAX}%
18931850
\indexlibraryglobal{INTN_C}%
18941851
\indexlibraryglobal{UINTN_C}%
1895-
\indexlibraryglobal{INTMAX_C}%
1896-
\indexlibraryglobal{UINTMAX_C}%
18971852
\begin{codeblock}
18981853
// all freestanding
18991854
#define @\libmacro{__STDC_VERSION_STDINT_H__}@ 202311L
19001855

19011856
namespace std {
1902-
using int8_t = @\textit{signed integer type}@; // optional
1903-
using int16_t = @\textit{signed integer type}@; // optional
1904-
using int32_t = @\textit{signed integer type}@; // optional
1905-
using int64_t = @\textit{signed integer type}@; // optional
1857+
using @\libglobal{int8_t}@ = @\textit{signed integer type}@; // optional
1858+
using @\libglobal{int16_t}@ = @\textit{signed integer type}@; // optional
1859+
using @\libglobal{int32_t}@ = @\textit{signed integer type}@; // optional
1860+
using @\libglobal{int64_t}@ = @\textit{signed integer type}@; // optional
19061861
using int@\placeholdernc{N}@_t = @\seebelow@; // optional
19071862

1908-
using int_fast8_t = @\textit{signed integer type}@;
1909-
using int_fast16_t = @\textit{signed integer type}@;
1910-
using int_fast32_t = @\textit{signed integer type}@;
1911-
using int_fast64_t = @\textit{signed integer type}@;
1863+
using @\libglobal{int_fast8_t}@ = @\textit{signed integer type}@;
1864+
using @\libglobal{int_fast16_t}@ = @\textit{signed integer type}@;
1865+
using @\libglobal{int_fast32_t}@ = @\textit{signed integer type}@;
1866+
using @\libglobal{int_fast64_t}@ = @\textit{signed integer type}@;
19121867
using int_fast@\placeholdernc{N}@_t = @\seebelow@; // optional
19131868

1914-
using int_least8_t = @\textit{signed integer type}@;
1915-
using int_least16_t = @\textit{signed integer type}@;
1916-
using int_least32_t = @\textit{signed integer type}@;
1917-
using int_least64_t = @\textit{signed integer type}@;
1869+
using @\libglobal{int_least8_t}@ = @\textit{signed integer type}@;
1870+
using @\libglobal{int_least16_t}@ = @\textit{signed integer type}@;
1871+
using @\libglobal{int_least32_t}@ = @\textit{signed integer type}@;
1872+
using @\libglobal{int_least64_t}@ = @\textit{signed integer type}@;
19181873
using int_least@\placeholdernc{N}@_t = @\seebelow@; // optional
19191874

1920-
using intmax_t = @\textit{signed integer type}@;
1921-
using intptr_t = @\textit{signed integer type}@;
1875+
using @\libglobal{intmax_t}@ = @\textit{signed integer type}@;
1876+
using @\libglobal{intptr_t}@ = @\textit{signed integer type}@;
19221877

1923-
using uint8_t = @\textit{unsigned integer type}@; // optional
1924-
using uint16_t = @\textit{unsigned integer type}@; // optional
1925-
using uint32_t = @\textit{unsigned integer type}@; // optional
1926-
using uint64_t = @\textit{unsigned integer type}@; // optional
1878+
using @\libglobal{uint8_t}@ = @\textit{unsigned integer type}@; // optional
1879+
using @\libglobal{uint16_t}@ = @\textit{unsigned integer type}@; // optional
1880+
using @\libglobal{uint32_t}@ = @\textit{unsigned integer type}@; // optional
1881+
using @\libglobal{uint64_t}@ = @\textit{unsigned integer type}@; // optional
19271882
using uint@\placeholdernc{N}@_t = @\seebelow@; // optional
19281883

1929-
using uint_fast8_t = @\textit{unsigned integer type}@;
1930-
using uint_fast16_t = @\textit{unsigned integer type}@;
1931-
using uint_fast32_t = @\textit{unsigned integer type}@;
1932-
using uint_fast64_t = @\textit{unsigned integer type}@;
1884+
using @\libglobal{uint_fast8_t}@ = @\textit{unsigned integer type}@;
1885+
using @\libglobal{uint_fast16_t}@ = @\textit{unsigned integer type}@;
1886+
using @\libglobal{uint_fast32_t}@ = @\textit{unsigned integer type}@;
1887+
using @\libglobal{uint_fast64_t}@ = @\textit{unsigned integer type}@;
19331888
using uint_fast@\placeholdernc{N}@_t = @\seebelow@; // optional
19341889

1935-
using uint_least8_t = @\textit{unsigned integer type}@;
1936-
using uint_least16_t = @\textit{unsigned integer type}@;
1937-
using uint_least32_t = @\textit{unsigned integer type}@;
1938-
using uint_least64_t = @\textit{unsigned integer type}@;
1890+
using @\libglobal{uint_least8_t}@ = @\textit{unsigned integer type}@;
1891+
using @\libglobal{uint_least16_t}@ = @\textit{unsigned integer type}@;
1892+
using @\libglobal{uint_least32_t}@ = @\textit{unsigned integer type}@;
1893+
using @\libglobal{uint_least64_t}@ = @\textit{unsigned integer type}@;
19391894
using uint_least@\placeholdernc{N}@_t = @\seebelow@; // optional
19401895

1941-
using uintmax_t = @\textit{unsigned integer type}@;
1942-
using uintptr_t = @\textit{unsigned integer type}@;
1896+
using @\libglobal{uintmax_t}@ = @\textit{unsigned integer type}@;
1897+
using @\libglobal{uintptr_t}@ = @\textit{unsigned integer type}@;
19431898
}
19441899

19451900
#define INT@\placeholdernc{N}@_MIN @\seebelow@
@@ -1960,40 +1915,40 @@
19601915
#define INT_LEAST@\placeholdernc{N}@_WIDTH @\seebelow@
19611916
#define UINT_LEAST@\placeholdernc{N}@_WIDTH @\seebelow@
19621917

1963-
#define INTMAX_MIN @\seebelow@
1964-
#define INTMAX_MAX @\seebelow@
1965-
#define UINTMAX_MAX @\seebelow@
1966-
#define INTMAX_WIDTH @\seebelow@
1967-
#define UINTMAX_WIDTH @\seebelow@
1918+
#define @\libmacro{INTMAX_MIN}@ @\seebelow@
1919+
#define @\libmacro{INTMAX_MAX}@ @\seebelow@
1920+
#define @\libmacro{UINTMAX_MAX}@ @\seebelow@
1921+
#define @\libmacro{INTMAX_WIDTH}@ @\seebelow@
1922+
#define @\libmacro{UINTMAX_WIDTH}@ @\seebelow@
19681923

1969-
#define INTPTR_MIN @\seebelow@
1970-
#define INTPTR_MAX @\seebelow@
1971-
#define UINTPTR_MAX @\seebelow@
1972-
#define INTPTR_WIDTH @\seebelow@
1973-
#define UINTPTR_WIDTH @\seebelow@
1924+
#define @\libglobal{INTPTR_MIN}@ @\seebelow@
1925+
#define @\libglobal{INTPTR_MAX}@ @\seebelow@
1926+
#define @\libglobal{UINTPTR_MAX}@ @\seebelow@
1927+
#define @\libglobal{INTPTR_WIDTH}@ @\seebelow@
1928+
#define @\libglobal{UINTPTR_WIDTH}@ @\seebelow@
19741929

1975-
#define PTRDIFF_MIN @\seebelow@
1976-
#define PTRDIFF_MAX @\seebelow@
1977-
#define PTRDIFF_WIDTH @\seebelow@
1978-
#define SIZE_MAX @\seebelow@
1979-
#define SIZE_WIDTH @\seebelow@
1930+
#define @\libmacro{PTRDIFF_MIN}@ @\seebelow@
1931+
#define @\libmacro{PTRDIFF_MAX}@ @\seebelow@
1932+
#define @\libmacro{PTRDIFF_WIDTH}@ @\seebelow@
1933+
#define @\libmacro{SIZE_MAX}@ @\seebelow@
1934+
#define @\libmacro{SIZE_WIDTH}@ @\seebelow@
19801935

1981-
#define SIG_ATOMIC_MIN @\seebelow@
1982-
#define SIG_ATOMIC_MAX @\seebelow@
1983-
#define SIG_ATOMIC_WIDTH @\seebelow@
1936+
#define @\libmacro{SIG_ATOMIC_MIN}@ @\seebelow@
1937+
#define @\libmacro{SIG_ATOMIC_MAX}@ @\seebelow@
1938+
#define @\libmacro{SIG_ATOMIC_WIDTH}@ @\seebelow@
19841939

1985-
#define WCHAR_MIN @\seebelow@
1986-
#define WCHAR_MAX @\seebelow@
1987-
#define WCHAR_WIDTH @\seebelow@
1940+
#define @\libmacro{WCHAR_MIN}@ @\seebelow@
1941+
#define @\libmacro{WCHAR_MAX}@ @\seebelow@
1942+
#define @\libmacro{WCHAR_WIDTH}@ @\seebelow@
19881943

1989-
#define WINT_MIN @\seebelow@
1990-
#define WINT_MAX @\seebelow@
1991-
#define WINT_WIDTH @\seebelow@
1944+
#define @\libmacro{WINT_MIN}@ @\seebelow@
1945+
#define @\libmacro{WINT_MAX}@ @\seebelow@
1946+
#define @\libmacro{WINT_WIDTH}@ @\seebelow@
19921947

19931948
#define INT@\placeholdernc{N}@_C(value) @\seebelow@
19941949
#define UINT@\placeholdernc{N}@_C(value) @\seebelow@
1995-
#define INTMAX_C(value) @\seebelow@
1996-
#define UINTMAX_C(value) @\seebelow@
1950+
#define @\libmacro{INTMAX_C}@(value) @\seebelow@
1951+
#define @\libmacro{UINTMAX_C}@(value) @\seebelow@
19971952
\end{codeblock}
19981953

19991954
\pnum

0 commit comments

Comments
 (0)