zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

BUG: wmkdepend parser missing some files

Browse Source 
- adjusted grammar to be more precise
This commit is contained in:
Mark Olesen
2018-04-17 09:20:01 +02:00
parent ea71484efa
commit aeef1cd4df
2 changed files with 401 additions and 2872 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3204
wmake/src/wmkdepend.cpp
View File

File diff suppressed because it is too large Load Diff

51
wmake/src/wmkdepend.rl
View File

@ -25,20 +25,22 @@ Application
wmkdepend wmkdepend
Description Description
A fast dependency list generator that emulates the behaviour and A faster dependency list generator that emulates the behaviour and
output of cpp -M. output of 'cpp -M'.
The lexer for include statements uses a Ragel-generated lexer and For each (quoted) include directive detected, the specified include
then searches the files found. Each file is visited only once, directories are searched and that file (if found) is also scanned.
which helps make this faster than cpp. It also handles missing
files somewhat more gracefully.
Each include file is visited only once, which helps make this faster
than cpp. It also handles missing files somewhat more gracefully.
The scanner is built with Ragel.
The goto-based finite state machine (FSM) is generated with The goto-based finite state machine (FSM) is generated with
ragel -G2 -o wmkdepend.cpp wmkdepend.rl ragel -G2 -o wmkdepend.cpp wmkdepend.rl
Usage Usage
wmkdepend [-Idir..] [-iheader...] [-eENV...] [-oFile] [-q] filename wmkdepend [-Idir..] [-iheader...] [-eENV...] [-oFile] filename
Note Note
May not capture all possible corner cases or line continuations such as May not capture all possible corner cases or line continuations such as
@ -66,7 +68,7 @@ Note
#include <vector> #include <vector>
// Length of the input read buffer // Length of the input read buffer
#define READ_BUFLEN 16384 #define INBUFLEN 16384
// The executable name (for messages), without requiring access to argv[] // The executable name (for messages), without requiring access to argv[]
#define EXENAME "wmkdepend" #define EXENAME "wmkdepend"
@ -79,7 +81,7 @@ void usage()
std::cerr std::cerr
<< <<
"\nUsage: " EXENAME "\nUsage: " EXENAME
" [-Idir...] [-iheader...] [-eENV...] [-oFile] [-q]" " [-Idir...] [-iheader...] [-eENV...] [-oFile]"
" filename\n\n" " filename\n\n"
" -Idir Directories to be searched for headers.\n" " -Idir Directories to be searched for headers.\n"
" -iheader Headers to be ignored.\n" " -iheader Headers to be ignored.\n"
@ -271,7 +273,7 @@ namespace Files
// This also avoids re-testing and multiple messages. // This also avoids re-testing and multiple messages.
visited.insert(fileName); visited.insert(fileName);
// Report failues // Report failures
if (!infile && !optQuiet) if (!infile && !optQuiet)
{ {
std::cerr std::cerr
@ -306,19 +308,27 @@ namespace Files
action buffer { tok = p; /* Local token start */ } action buffer { tok = p; /* Local token start */ }
action process { processFile(std::string(tok, (p - tok))); } action process { processFile(std::string(tok, (p - tok))); }
white = [ \t\f\r]; # Horizontal whitespace
nl = white* '\n'; # Newline
dnl = [^\n]* '\n'; # Discard up to and including newline
comment := any* :>> '*/' @{ fgoto main; }; comment := any* :>> '*/' @{ fgoto main; };
main := |* main := |*
^space* '#' space* 'include' space* ('"' [^\"]+ >buffer %process '"'); space*; # Discard whitespace, empty lines
white* '#' white* 'include' white*
('"' [^\"]+ >buffer %process '"') dnl;
# Single and double quoted strings # Single and double quoted strings
( 'L'? "'" ( [^'\\\n] | /\\./ )* "'") ; # " swallow ( 'L'? "'" ( [^'\\\n] | /\\./ )* "'") ; # " swallow
( 'L'? '"' ( [^"\\\n] | /\\./ )* '"') ; # ' swallow ( 'L'? '"' ( [^"\\\n] | /\\./ )* '"') ; # ' swallow
'/*' { fgoto comment; }; '//' dnl; # 1-line comment
'//' [^\n]* '\n'; '/*' { fgoto comment; }; # Multi-line comment
[^\n]* '\n'; # Swallow all other lines
dnl; # Discard all other lines
*|; *|;
}%% }%%
@ -356,16 +366,13 @@ void processFile(const std::string& fileName)
char *tok = nullptr; char *tok = nullptr;
// Buffering // Buffering
char inbuf[READ_BUFLEN]; char inbuf[INBUFLEN];
size_t pending = 0; size_t pending = 0;
// Processing loop (as per Ragel pdf example) // Processing loop (as per Ragel pdf example)
for (bool good = true; good; /*nil*/) for (bool good = true; good; /*nil*/)
{ {
char *data = inbuf + pending; // current data buffer if (pending >= INBUFLEN)
const size_t buflen = READ_BUFLEN - pending; // space left in buffer
if (!buflen)
{ {
// We overfilled the buffer while trying to scan a token... // We overfilled the buffer while trying to scan a token...
std::cerr std::cerr
@ -374,6 +381,9 @@ void processFile(const std::string& fileName)
break; break;
} }
char *data = inbuf + pending; // current data buffer
const size_t buflen = INBUFLEN - pending; // space in buffer
// p,pe = Ragel parsing point and parsing end (default naming) // p,pe = Ragel parsing point and parsing end (default naming)
// eof = Ragel EOF point (default naming) // eof = Ragel EOF point (default naming)
@ -385,8 +395,7 @@ void processFile(const std::string& fileName)
if (::feof(infile)) if (::feof(infile))
{ {
// Tag 'pe' as being the EOF for the FSM as well eof = pe; // Tag 'pe' as being the EOF for the FSM as well
eof = pe;
good = false; good = false;
} }
else if (!gcount) else if (!gcount)