sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

slicc: work around improper initialization of a global in slicc.

Browse source
This commit is contained in:
Nathan Binkert 2009-05-12 22:33:05 -07:00
parent d923ce0f8c
commit 0c2b9cf90d
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/mem/slicc/ast/Location.cc
View file

@ -39,11 +39,15 @@
#include "mem/slicc/ast/Location.hh" #include "mem/slicc/ast/Location.hh"
int g_line_number = 0; int g_line_number = 0;
string g_file_name(""); string &g_file_name()
{
static string the_string;
return the_string;
}
Location::Location() Location::Location()
{ {
m_file_name = g_file_name; m_file_name = g_file_name();
m_line_number = g_line_number; m_line_number = g_line_number;
ostringstream sstr; ostringstream sstr;

2
src/mem/slicc/ast/Location.hh
View file

@ -42,7 +42,7 @@
#include "mem/slicc/slicc_global.hh" #include "mem/slicc/slicc_global.hh"
extern int g_line_number; extern int g_line_number;
extern string g_file_name; extern string &g_file_name();
class Location { class Location {
public: public:

4
src/mem/slicc/parser/parser.yy
View file

@ -337,7 +337,7 @@ DeclListAST* parse(string filename)
exit(1); exit(1);
} }
g_line_number = 1; g_line_number = 1;
g_file_name = filename; g_file_name() = filename;
yyin = file; yyin = file;
g_decl_list_ptr = NULL; g_decl_list_ptr = NULL;
yyparse(); yyparse();
@ -346,7 +346,7 @@ DeclListAST* parse(string filename)
extern "C" void yyerror(char* s) extern "C" void yyerror(char* s)
{ {
fprintf(stderr, "%s:%d: %s at %s\n", g_file_name.c_str(), g_line_number, s, yytext); fprintf(stderr, "%s:%d: %s at %s\n", g_file_name().c_str(), g_line_number, s, yytext);
exit(1); exit(1);
} }