riscv
/
yosys
mirror of https://github.com/YosysHQ/yosys.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed parsing of non-arg macro calls followed by "("

This commit is contained in:
Clifford Wolf 2013-12-27 16:25:27 +01:00
parent 0f5ab7649e
commit 1dcbba1abf
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontends/verilog/preproc.cc
View File

@ -204,6 +204,7 @@ static void input_file(FILE *f, std::string filename)
std::string frontend_verilog_preproc(FILE *f, std::string filename, const std::map<std::string, std::string> pre_defines_map, const std::list<std::string> include_dirs) std::string frontend_verilog_preproc(FILE *f, std::string filename, const std::map<std::string, std::string> pre_defines_map, const std::list<std::string> include_dirs)
{ {
std::set<std::string> defines_with_args;
std::map<std::string, std::string> defines_map(pre_defines_map); std::map<std::string, std::string> defines_map(pre_defines_map);
int ifdef_fail_level = 0; int ifdef_fail_level = 0;
bool in_elseif = false; bool in_elseif = false;
@ -354,6 +355,10 @@ std::string frontend_verilog_preproc(FILE *f, std::string filename, const std::m
return_char('\n'); return_char('\n');
// printf("define: >>%s<< -> >>%s<<\n", name.c_str(), value.c_str()); // printf("define: >>%s<< -> >>%s<<\n", name.c_str(), value.c_str());
defines_map[name] = value; defines_map[name] = value;
if (state == 2)
defines_with_args.insert(name);
else
defines_with_args.erase(name);
continue; continue;
} }
@ -363,6 +368,7 @@ std::string frontend_verilog_preproc(FILE *f, std::string filename, const std::m
name = next_token(true); name = next_token(true);
// printf("undef: >>%s<<\n", name.c_str()); // printf("undef: >>%s<<\n", name.c_str());
defines_map.erase(name); defines_map.erase(name);
defines_with_args.erase(name);
continue; continue;
} }
@ -381,7 +387,7 @@ std::string frontend_verilog_preproc(FILE *f, std::string filename, const std::m
// printf("expand: >>%s<< -> >>%s<<\n", name.c_str(), defines_map[name].c_str()); // printf("expand: >>%s<< -> >>%s<<\n", name.c_str(), defines_map[name].c_str());
std::string skipped_spaces = skip_spaces(); std::string skipped_spaces = skip_spaces();
tok = next_token(true); tok = next_token(true);
if (tok == "(") { if (tok == "(" && defines_with_args.count(name) > 0) {
int level = 1; int level = 1;
std::vector<std::string> args; std::vector<std::string> args;
args.push_back(std::string()); args.push_back(std::string());