From: Clifford Wolf <clifford@clifford.at>
Date: Mon, 6 May 2019 09:46:10 +0000 (+0200)
Subject: Merge branch 'master' of github.com:YosysHQ/yosys into clifford/specify
X-Git-Tag: yosys-0.9~141^2~2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c7f2e93024b7758a865254cfb350997645f663b2;p=yosys.git

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

c7f2e93024b7758a865254cfb350997645f663b2
diff --cc frontends/verilog/verilog_parser.y
index 351f38101,08377ad9a..4914b2c18
--- a/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