5 files changed, 163 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a28f407288..4c9bff951b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2023-02-05  Bruno Haible  <bruno@clisp.org>
+
+	c-nullptr: Add tests.
+	* tests/test-nullptr.c: New file.
+	* modules/c-nullptr-tests: New file.
+	* tests/test-nullptr-c++.cc: New file.
+	* modules/c-nullptr-c++-tests: New file.
+
 2023-02-05  Paul Eggert  <eggert@cs.ucla.edu>
 
 	sh-quote: backport fix from diffutils
diff --git a/modules/c-nullptr-c++-tests b/modules/c-nullptr-c++-tests
new file mode 100644
index 0000000000..ae60f4b360
--- /dev/null
+++ b/modules/c-nullptr-c++-tests
@@ -0,0 +1,17 @@
+Files:
+tests/test-nullptr-c++.cc
+
+Status:
+c++-test
+
+Depends-on:
+ansi-c++-opt
+
+configure.ac:
+
+Makefile.am:
+if ANSICXX
+TESTS += test-nullptr-c++
+check_PROGRAMS += test-nullptr-c++
+test_nullptr_c___SOURCES = test-nullptr-c++.cc
+endif
diff --git a/modules/c-nullptr-tests b/modules/c-nullptr-tests
new file mode 100644
index 0000000000..40e28d200b
--- /dev/null
+++ b/modules/c-nullptr-tests
@@ -0,0 +1,12 @@
+Files:
+tests/test-nullptr.c
+tests/macros.h
+
+Depends-on:
+c-nullptr-c++-tests
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-nullptr
+check_PROGRAMS += test-nullptr
diff --git a/tests/test-nullptr-c++.cc b/tests/test-nullptr-c++.cc
new file mode 100644
index 0000000000..fdcfd04356
--- /dev/null
+++ b/tests/test-nullptr-c++.cc
@@ -0,0 +1,57 @@
+/* Test nullptr in C++ mode.
+   Copyright 2023 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible.  */
+
+#include <config.h>
+
+/* Check that nullptr is defined.  */
+int *my_null = nullptr;
+
+/* Check against conflicts between <config.h> and the C++ header files.  */
+#include <iostream>
+#include <vector>
+
+#include <stdarg.h>
+
+#include "macros.h"
+
+void
+varargs_callee (const char *first, ...)
+{
+  va_list args;
+  const char *arg;
+
+  ASSERT (first[0] == 't');
+  va_start (args, first);
+
+  arg = va_arg (args, const char *);
+  ASSERT (arg == NULL);
+
+  arg = va_arg (args, const char *);
+  ASSERT (arg[0] == 'f');
+
+  arg = va_arg (args, const char *);
+  ASSERT (arg == NULL);
+
+  va_end (args);
+}
+
+int
+main ()
+{
+  varargs_callee ("type", nullptr, "foo", nullptr);
+}
diff --git a/tests/test-nullptr.c b/tests/test-nullptr.c
new file mode 100644
index 0000000000..1f9abc7422
--- /dev/null
+++ b/tests/test-nullptr.c
@@ -0,0 +1,69 @@
+/* Test nullptr.
+   Copyright 2023 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
+
+/* Written by Bruno Haible.  */
+
+#include <config.h>
+
+int *my_null = nullptr;
+
+#if 0 /* not yet */
+/* Header that is supposed to define nullptr_t.  */
+# include <stddef.h>
+#endif
+
+#include <stdarg.h>
+
+#include "macros.h"
+
+#if 0 /* not yet */
+
+static void
+simple_callee (nullptr_t x)
+{
+  ASSERT (x == NULL);
+}
+
+#endif
+
+void
+varargs_callee (const char *first, ...)
+{
+  va_list args;
+  const char *arg;
+
+  ASSERT (first[0] == 't');
+  va_start (args, first);
+
+  arg = va_arg (args, const char *);
+  ASSERT (arg == NULL);
+
+  arg = va_arg (args, const char *);
+  ASSERT (arg[0] == 'f');
+
+  arg = va_arg (args, const char *);
+  ASSERT (arg == NULL);
+
+  va_end (args);
+}
+
+int
+main ()
+{
+  varargs_callee ("type", nullptr, "foo", nullptr);
+
+  return 0;
+}