ENH: add -i(ignore) option to wmkdep, wmkdepend

- specifies headers that should be ignored. Provides a workaround
  for the fact that wmkdep/wmkdepend doesn't handle defines at all.

STYLE: code cleanup of wmkdep.l
This commit is contained in:
Mark Olesen
2010-03-09 16:16:17 +01:00
parent 27ecc9177c
commit d4054f6b1f
7 changed files with 273 additions and 208 deletions

View File

@ -52,9 +52,9 @@ namespace wmake {
#include <sys/types.h>
#include <dirent.h>
std::set<std::string> Parser::visitedFiles_;
std::set<std::string> Parser::visitedDirs_;
std::set<std::string> Parser::visitedFiles;
std::list<std::string> Parser::includeDirs;
std::string Parser::sourceFile;
std::string Parser::depFile;
@ -80,7 +80,7 @@ void Parser::ignoreDir(const std::string& name)
void Parser::includeFile(const std::string& name)
{
if (!visitedFiles_.insert(name).second)
if (!visitedFiles.insert(name).second)
{
return; // already existed (did not insert)
}
@ -129,7 +129,7 @@ void Parser::includeFile(const std::string& name)
);
// only report the first occurance
visitedFiles_.insert(name);
visitedFiles.insert(name);
}
}