diff options
| author | Clifford Wolf <clifford@clifford.at> | 2013-03-26 11:13:58 +0100 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2013-03-26 11:31:34 +0100 |
| commit | 7a99349de4d9375845c05e3ac17d1eed366aab2e (patch) | |
| tree | c94341b7fe1dc6266943f6733643127d041c2259 /frontends | |
| parent | 6a382f2abab4d6c24d329204ed1ea18e44f3f3b8 (diff) | |
| download | yosys-7a99349de4d9375845c05e3ac17d1eed366aab2e.tar.gz yosys-7a99349de4d9375845c05e3ac17d1eed366aab2e.tar.bz2 yosys-7a99349de4d9375845c05e3ac17d1eed366aab2e.zip | |
Improvements and bugfixes for generate blocks with local signals
Diffstat (limited to 'frontends')
| -rw-r--r-- | frontends/ast/simplify.cc | 4 | ||||
| -rw-r--r-- | frontends/verilog/lexer.l | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc index 981897db5..a03cd0bed 100644 --- a/frontends/ast/simplify.cc +++ b/frontends/ast/simplify.cc @@ -896,10 +896,8 @@ void AstNode::expand_genblock(std::string index_var, std::string prefix, std::ma return; } - if ((type == AST_IDENTIFIER || type == AST_FCALL || type == AST_TCALL) && name_map.count(str) > 0) { + if ((type == AST_IDENTIFIER || type == AST_FCALL || type == AST_TCALL) && name_map.count(str) > 0) str = name_map[str]; - return; - } std::map<std::string, std::string> backup_name_map; diff --git a/frontends/verilog/lexer.l b/frontends/verilog/lexer.l index a269c072a..2a6c44171 100644 --- a/frontends/verilog/lexer.l +++ b/frontends/verilog/lexer.l @@ -184,7 +184,7 @@ supply1 { return TOK_SUPPLY1; } "$signed" { return TOK_TO_SIGNED; } "$unsigned" { return TOK_TO_UNSIGNED; } -[a-zA-Z_$][a-zA-Z0-9_$]* { +[a-zA-Z_$][a-zA-Z0-9_\.$]* { frontend_verilog_yylval.string = new std::string(std::string("\\") + yytext); return TOK_ID; } |