Merge branch 'master' of github.com:YosysHQ/yosys into clifford/specify

diff --cc frontends/verilog/verilog_lexer.l
Simple merge

diff --cc frontends/verilog/verilog_parser.y
index 351f38101563cb8c692b92944004e5238a02eacd,08377ad9a36d742500551beeefbb3f4ab538a4ac..4914b2c182576e1d993a8859116bb58c1ed5c380
--- 1/frontends/verilog/verilog_parser.y
--- 2/frontends/verilog/verilog_parser.y
+++ b/frontends/verilog/verilog_parser.y
@@@ -116,16 -102,11 +116,16 @@@ struct specify_rise_fall 
        std::string *string;
        struct YOSYS_NAMESPACE_PREFIX AST::AstNode *ast;
        std::map<std::string, YOSYS_NAMESPACE_PREFIX AST::AstNode*> *al;
 +      struct specify_target *specify_target_ptr;
 +      struct specify_triple *specify_triple_ptr;
 +      struct specify_rise_fall *specify_rise_fall_ptr;
        bool boolean;
 +      char ch;
  }
  
 -%token <string> TOK_STRING TOK_ID TOK_CONSTVAL TOK_REALVAL TOK_PRIMITIVE TOK_SVA_LABEL
 +%token <string> TOK_STRING TOK_ID TOK_CONSTVAL TOK_REALVAL TOK_PRIMITIVE
 +%token <string> TOK_SVA_LABEL TOK_SPECIFY_OPER
- %token TOK_ASSERT TOK_ASSUME TOK_RESTRICT TOK_COVER
+ %token TOK_ASSERT TOK_ASSUME TOK_RESTRICT TOK_COVER TOK_FINAL
  %token ATTR_BEGIN ATTR_END DEFATTR_BEGIN DEFATTR_END
  %token TOK_MODULE TOK_ENDMODULE TOK_PARAMETER TOK_LOCALPARAM TOK_DEFPARAM
  %token TOK_PACKAGE TOK_ENDPACKAGE TOK_PACKAGESEP

diff --cc passes/opt/opt_clean.cc
Simple merge