run_doxygen: Tighter search expression for sed.

2002-11-21  Phil Edwards  <pme@gcc.gnu.org>

	* docs/doxygen/run_doxygen:  Tighter search expression for sed.
	* docs/doxygen/stdheader.cc:  Handle the case of good headers.

From-SVN: r59332

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index bb524b5fa0259407359745909c9f3a8c2b894513..c8225c7ad379cfd730d907bd3520a959318fb3b6 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-21  Phil Edwards  <pme@gcc.gnu.org>
+
+       * docs/doxygen/run_doxygen:  Tighter search expression for sed.
+       * docs/doxygen/stdheader.cc:  Handle the case of good headers.
+
 2002-11-21  Phil Edwards  <pme@gcc.gnu.org>
 
        * acinclude.m4:  Uniform formatting.

diff --git a/libstdc++-v3/docs/doxygen/run_doxygen b/libstdc++-v3/docs/doxygen/run_doxygen
index d8ca2a914287ebaa6fdef6d2baf5d45d474c7807..6a0806ce410718a46b0f7ba8fa91718ae911ab8a 100644 (file)
--- a/libstdc++-v3/docs/doxygen/run_doxygen
+++ b/libstdc++-v3/docs/doxygen/run_doxygen
@@ -208,7 +208,7 @@ g++ ${srcdir}/docs/doxygen/stdheader.cc -o ./stdheader
 problematic=`egrep -l '#include <.*_.*>' [a-z]*.3`
 for f in $problematic; do
     # this is also slow, but safe and easy to debug
-    oldh=`sed -n '/#include </s/.*<\(.*\)>.*/\1/p' $f`
+    oldh=`sed -n '/fC#include </s/.*<\(.*\)>.*/\1/p' $f`
     newh=`echo $oldh | ./stdheader`
     sed "s=${oldh}=${newh}=" $f > TEMP
     mv TEMP $f

diff --git a/libstdc++-v3/docs/doxygen/stdheader.cc b/libstdc++-v3/docs/doxygen/stdheader.cc
index d705d0169c83f154d12868c31e24b0d55dff0da0..a792592fe2b50ad98d6a7cc540156a5a0e6523a4 100644 (file)
--- a/libstdc++-v3/docs/doxygen/stdheader.cc
+++ b/libstdc++-v3/docs/doxygen/stdheader.cc
@@ -111,6 +111,13 @@ void do_word (std::string const& longheader)
 {
     std::string::size_type start = 0;
 
+    // if it doesn't contain a "." then it's already a std header
+    if (longheader.find(".") == std::string::npos)
+    {
+        std::cout << longheader << '\n';
+        return;
+    }
+
     if (longheader.substr(start,5) == "bits/")  start += 5;
     if ((longheader.substr(start,4) == "stl_") ||
         (longheader.substr(start,4) == "std_"))