diff options
author | Eddie Hung <eddie@fpgeh.com> | 2019-05-28 09:30:53 -0700 |
---|---|---|
committer | Eddie Hung <eddie@fpgeh.com> | 2019-05-28 09:30:53 -0700 |
commit | ba9513b325433f9232e1c4312a2b526ca7dacdd4 (patch) | |
tree | 995de7437e31e2c383a0185049e4e844df4d27e0 /frontends/verilog/verilog_lexer.l | |
parent | f745727de5af085412b2e5f8161aa1018cc5e276 (diff) | |
parent | 8e647901ef6ea484bfe41628f258c53590ae4114 (diff) | |
download | yosys-ba9513b325433f9232e1c4312a2b526ca7dacdd4.tar.gz yosys-ba9513b325433f9232e1c4312a2b526ca7dacdd4.tar.bz2 yosys-ba9513b325433f9232e1c4312a2b526ca7dacdd4.zip |
Merge remote-tracking branch 'origin/master' into xc7mux
Diffstat (limited to 'frontends/verilog/verilog_lexer.l')
-rw-r--r-- | frontends/verilog/verilog_lexer.l | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/frontends/verilog/verilog_lexer.l b/frontends/verilog/verilog_lexer.l index 142d05d45..9558bbfb9 100644 --- a/frontends/verilog/verilog_lexer.l +++ b/frontends/verilog/verilog_lexer.l @@ -218,6 +218,8 @@ YOSYS_NAMESPACE_END "output" { return TOK_OUTPUT; } "inout" { return TOK_INOUT; } "wire" { return TOK_WIRE; } +"wor" { return TOK_WOR; } +"wand" { return TOK_WAND; } "reg" { return TOK_REG; } "integer" { return TOK_INTEGER; } "signed" { return TOK_SIGNED; } @@ -232,7 +234,7 @@ YOSYS_NAMESPACE_END return TOK_CONSTVAL; } -[0-9]*[ \t]*\'s?[bodhBODH][ \t\r\n]*[0-9a-fA-FzxZX?_]+ { +[0-9]*[ \t]*\'s?[bodhBODH]*[ \t\r\n]*[0-9a-fA-FzxZX?_]+ { frontend_verilog_yylval.string = new std::string(yytext); return TOK_CONSTVAL; } |