From 53e0a44759954e4f8fbda7eec01275f176338a52 Mon Sep 17 00:00:00 2001 From: Phil Edwards Date: Thu, 21 Nov 2002 08:16:32 +0000 Subject: [PATCH] run_doxygen: Tighter search expression for sed. 2002-11-21 Phil Edwards * docs/doxygen/run_doxygen: Tighter search expression for sed. * docs/doxygen/stdheader.cc: Handle the case of good headers. From-SVN: r59332 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/docs/doxygen/run_doxygen | 2 +- libstdc++-v3/docs/doxygen/stdheader.cc | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index bb524b5fa02..c8225c7ad37 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2002-11-21 Phil Edwards + + * docs/doxygen/run_doxygen: Tighter search expression for sed. + * docs/doxygen/stdheader.cc: Handle the case of good headers. + 2002-11-21 Phil Edwards * acinclude.m4: Uniform formatting. diff --git a/libstdc++-v3/docs/doxygen/run_doxygen b/libstdc++-v3/docs/doxygen/run_doxygen index d8ca2a91428..6a0806ce410 100644 --- 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 .*/\1/p' $f` + oldh=`sed -n '/fC#include .*/\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 d705d0169c8..a792592fe2b 100644 --- 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_"))