[input.output] Improved indexing of macros

cplusplus · Dec 31, 2024 · ff57a70 · ff57a70
1 parent 34c8e31
commit ff57a70
Showing 1 changed file with 38 additions and 76 deletions.
diff --git a/source/iostreams.tex b/source/iostreams.tex
@@ -18825,22 +18825,6 @@
 \indexlibraryglobal{size_t}%
 \indexlibraryglobal{FILE}%
 \indexlibraryglobal{fpos_t}%
-\indexlibraryglobal{NULL}%
-\indexlibraryglobal{_IOFBF}%
-\indexlibraryglobal{_IOLBF}%
-\indexlibraryglobal{_IONBF}%
-\indexlibraryglobal{BUFSIZ}%
-\indexlibraryglobal{EOF}%
-\indexlibraryglobal{FOPEN_MAX}%
-\indexlibraryglobal{FILENAME_MAX}%
-\indexlibraryglobal{L_tmpnam}%
-\indexlibraryglobal{SEEK_CUR}%
-\indexlibraryglobal{SEEK_END}%
-\indexlibraryglobal{SEEK_SET}%
-\indexlibraryglobal{TMP_MAX}%
-\indexlibraryglobal{stderr}%
-\indexlibraryglobal{stdin}%
-\indexlibraryglobal{stdout}%
 \indexlibraryglobal{remove}%
 \indexlibraryglobal{rename}%
 \indexlibraryglobal{tmpfile}%
@@ -18893,22 +18877,22 @@
   using fpos_t = @\seebelow@;
 }
 
-#define NULL @\textit{see \ref{support.types.nullptr}}@
-#define _IOFBF @\seebelow@
-#define _IOLBF @\seebelow@
-#define _IONBF @\seebelow@
-#define BUFSIZ @\seebelow@
-#define EOF @\seebelow@
-#define FOPEN_MAX @\seebelow@
-#define FILENAME_MAX @\seebelow@
-#define L_tmpnam @\seebelow@
-#define SEEK_CUR @\seebelow@
-#define SEEK_END @\seebelow@
-#define SEEK_SET @\seebelow@
-#define TMP_MAX @\seebelow@
-#define stderr @\seebelow@
-#define stdin @\seebelow@
-#define stdout @\seebelow@
+#define @\libmacro{NULL}@ @\textit{see \ref{support.types.nullptr}}@
+#define @\libmacro{_IOFBF}@ @\seebelow@
+#define @\libmacro{_IOLBF}@ @\seebelow@
+#define @\libmacro{_IONBF}@ @\seebelow@
+#define @\libmacro{BUFSIZ}@ @\seebelow@
+#define @\libmacro{EOF}@ @\seebelow@
+#define @\libmacro{FOPEN_MAX}@ @\seebelow@
+#define @\libmacro{FILENAME_MAX}@ @\seebelow@
+#define @\libmacro{L_tmpnam}@ @\seebelow@
+#define @\libmacro{SEEK_CUR}@ @\seebelow@
+#define @\libmacro{SEEK_END}@ @\seebelow@
+#define @\libmacro{SEEK_SET}@ @\seebelow@
+#define @\libmacro{TMP_MAX}@ @\seebelow@
+#define @\libmacro{stderr}@ @\seebelow@
+#define @\libmacro{stdin}@ @\seebelow@
+#define @\libmacro{stdout}@ @\seebelow@
 
 namespace std {
   int remove(const char* filename);
@@ -19015,28 +18999,6 @@
 \indexlibraryglobal{SCNoFASTN}%
 \indexlibraryglobal{SCNuFASTN}%
 \indexlibraryglobal{SCNxFASTN}%
-\indexlibraryglobal{PRIdMAX}%
-\indexlibraryglobal{PRIiMAX}%
-\indexlibraryglobal{PRIoMAX}%
-\indexlibraryglobal{PRIuMAX}%
-\indexlibraryglobal{PRIxMAX}%
-\indexlibraryglobal{PRIXMAX}%
-\indexlibraryglobal{SCNdMAX}%
-\indexlibraryglobal{SCNiMAX}%
-\indexlibraryglobal{SCNoMAX}%
-\indexlibraryglobal{SCNuMAX}%
-\indexlibraryglobal{SCNxMAX}%
-\indexlibraryglobal{PRIdPTR}%
-\indexlibraryglobal{PRIiPTR}%
-\indexlibraryglobal{PRIoPTR}%
-\indexlibraryglobal{PRIuPTR}%
-\indexlibraryglobal{PRIxPTR}%
-\indexlibraryglobal{PRIXPTR}%
-\indexlibraryglobal{SCNdPTR}%
-\indexlibraryglobal{SCNiPTR}%
-\indexlibraryglobal{SCNoPTR}%
-\indexlibraryglobal{SCNuPTR}%
-\indexlibraryglobal{SCNxPTR}%
 \begin{codeblock}
 #include <cstdint>  // see \ref{cstdint.syn}
 
@@ -19087,28 +19049,28 @@
 #define SCNoFAST@\placeholdernc{N}@ @\seebelow@
 #define SCNuFAST@\placeholdernc{N}@ @\seebelow@
 #define SCNxFAST@\placeholdernc{N}@ @\seebelow@
-#define PRIdMAX @\seebelow@
-#define PRIiMAX @\seebelow@
-#define PRIoMAX @\seebelow@
-#define PRIuMAX @\seebelow@
-#define PRIxMAX @\seebelow@
-#define PRIXMAX @\seebelow@
-#define SCNdMAX @\seebelow@
-#define SCNiMAX @\seebelow@
-#define SCNoMAX @\seebelow@
-#define SCNuMAX @\seebelow@
-#define SCNxMAX @\seebelow@
-#define PRIdPTR @\seebelow@
-#define PRIiPTR @\seebelow@
-#define PRIoPTR @\seebelow@
-#define PRIuPTR @\seebelow@
-#define PRIxPTR @\seebelow@
-#define PRIXPTR @\seebelow@
-#define SCNdPTR @\seebelow@
-#define SCNiPTR @\seebelow@
-#define SCNoPTR @\seebelow@
-#define SCNuPTR @\seebelow@
-#define SCNxPTR @\seebelow@
+#define @\libmacro{PRIdMAX}@ @\seebelow@
+#define @\libmacro{PRIiMAX}@ @\seebelow@
+#define @\libmacro{PRIoMAX}@ @\seebelow@
+#define @\libmacro{PRIuMAX}@ @\seebelow@
+#define @\libmacro{PRIxMAX}@ @\seebelow@
+#define @\libmacro{PRIXMAX}@ @\seebelow@
+#define @\libmacro{SCNdMAX}@ @\seebelow@
+#define @\libmacro{SCNiMAX}@ @\seebelow@
+#define @\libmacro{SCNoMAX}@ @\seebelow@
+#define @\libmacro{SCNuMAX}@ @\seebelow@
+#define @\libmacro{SCNxMAX}@ @\seebelow@
+#define @\libmacro{PRIdPTR}@ @\seebelow@
+#define @\libmacro{PRIiPTR}@ @\seebelow@
+#define @\libmacro{PRIoPTR}@ @\seebelow@
+#define @\libmacro{PRIuPTR}@ @\seebelow@
+#define @\libmacro{PRIxPTR}@ @\seebelow@
+#define @\libmacro{PRIXPTR}@ @\seebelow@
+#define @\libmacro{SCNdPTR}@ @\seebelow@
+#define @\libmacro{SCNiPTR}@ @\seebelow@
+#define @\libmacro{SCNoPTR}@ @\seebelow@
+#define @\libmacro{SCNuPTR}@ @\seebelow@
+#define @\libmacro{SCNxPTR}@ @\seebelow@
 \end{codeblock}
 
 \pnum