COMP: Added constructor to cmDependsFortranFile to avoid using initializer list. Also included assert.h.
This commit is contained in:
parent
da7b9d306e
commit
f1b52f3f98
@ -21,6 +21,7 @@
|
|||||||
#include "cmDependsFortranLexer.h" /* Interface to lexer object. */
|
#include "cmDependsFortranLexer.h" /* Interface to lexer object. */
|
||||||
#include "cmDependsFortranParser.h" /* Interface to parser object. */
|
#include "cmDependsFortranParser.h" /* Interface to parser object. */
|
||||||
|
|
||||||
|
#include <assert.h>
|
||||||
#include <stack>
|
#include <stack>
|
||||||
|
|
||||||
//----------------------------------------------------------------------------
|
//----------------------------------------------------------------------------
|
||||||
@ -37,6 +38,9 @@ extern "C"
|
|||||||
// Define parser object internal structure.
|
// Define parser object internal structure.
|
||||||
struct cmDependsFortranFile
|
struct cmDependsFortranFile
|
||||||
{
|
{
|
||||||
|
cmDependsFortranFile(FILE* file, YY_BUFFER_STATE buffer,
|
||||||
|
const std::string& dir):
|
||||||
|
File(file), Buffer(buffer), Directory(dir) {}
|
||||||
FILE* File;
|
FILE* File;
|
||||||
YY_BUFFER_STATE Buffer;
|
YY_BUFFER_STATE Buffer;
|
||||||
std::string Directory;
|
std::string Directory;
|
||||||
@ -215,7 +219,7 @@ int cmDependsFortranParser_FilePush(cmDependsFortranParser* parser,
|
|||||||
YY_BUFFER_STATE current =
|
YY_BUFFER_STATE current =
|
||||||
cmDependsFortranLexer_GetCurrentBuffer(parser->Scanner);
|
cmDependsFortranLexer_GetCurrentBuffer(parser->Scanner);
|
||||||
std::string dir = cmSystemTools::GetParentDirectory(fname);
|
std::string dir = cmSystemTools::GetParentDirectory(fname);
|
||||||
cmDependsFortranFile f = {file, current, dir};
|
cmDependsFortranFile f(file, current, dir);
|
||||||
YY_BUFFER_STATE buffer =
|
YY_BUFFER_STATE buffer =
|
||||||
cmDependsFortran_yy_create_buffer(0, 16384, parser->Scanner);
|
cmDependsFortran_yy_create_buffer(0, 16384, parser->Scanner);
|
||||||
cmDependsFortran_yy_switch_to_buffer(buffer, parser->Scanner);
|
cmDependsFortran_yy_switch_to_buffer(buffer, parser->Scanner);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user