From: Stefan Biereigel <stefan@biereigel.de>
Date: Mon, 27 May 2019 17:07:46 +0000 (+0200)
Subject: Merge branch 'master' into wandwor
X-Git-Tag: yosys-0.9~102^2~2^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=816082d5a11e758b6ff68a2dc442fc2519356669;p=yosys.git

Merge branch 'master' into wandwor
---

816082d5a11e758b6ff68a2dc442fc2519356669
diff --cc frontends/ast/ast.cc
index 44b8863f9,29e175c15..83993eea9
--- a/frontends/ast/ast.cc
+++ b/frontends/ast/ast.cc
@@@ -194,8 -194,7 +194,9 @@@ AstNode::AstNode(AstNodeType type, AstN
  	is_logic = false;
  	is_signed = false;
  	is_string = false;
 +	is_wand = false;
 +	is_wor = false;
+ 	is_unsized = false;
  	was_checked = false;
  	range_valid = false;
  	range_swapped = false;
diff --cc frontends/ast/ast.h
index 6c19dc7e6,f90e683ad..46d482f1a
--- a/frontends/ast/ast.h
+++ b/frontends/ast/ast.h
@@@ -173,7 -173,7 +173,7 @@@ namespace AS
  		// node content - most of it is unused in most node types
  		std::string str;
  		std::vector<RTLIL::State> bits;
- 		bool is_input, is_output, is_reg, is_logic, is_signed, is_string, is_wand, is_wor, range_valid, range_swapped, was_checked;
 -		bool is_input, is_output, is_reg, is_logic, is_signed, is_string, range_valid, range_swapped, was_checked, is_unsized;
++		bool is_input, is_output, is_reg, is_logic, is_signed, is_string, is_wand, is_wor, range_valid, range_swapped, was_checked, is_unsized;
  		int port_id, range_left, range_right;
  		uint32_t integer;
  		double realvalue;