Merge pull request #3153 from hirooih/sv-multiple-package-import-declarations

SystemVerilog: support multiple package-import-declarations

close #3150

Author: hirooih

Units/parser-verilog.r/systemverilog-package.d/expected.tags

@@ -45,3 +45,9 @@ mul	input.sv	/^    function MyData mul(MyData x, y);$/;"	f	package:MyPackage
 x	input.sv	/^    function MyData mul(MyData x, y);$/;"	p	function:MyPackage.mul
 y	input.sv	/^    function MyData mul(MyData x, y);$/;"	p	function:MyPackage.mul
 var_to_check_context	input.sv	/^reg var_to_check_context;$/;"	r
+mod_a	input.sv	/^module mod_a$/;"	m
+in_a	input.sv	/^    input var logic in_a$/;"	p	module:mod_a
+sig_a	input.sv	/^    logic sig_a;$/;"	r	module:mod_a
+mod_b	input.sv	/^module mod_b$/;"	m
+in_b	input.sv	/^    input var logic in_b$/;"	p	module:mod_b
+sig_b	input.sv	/^    logic sig_b;$/;"	r	module:mod_b

Units/parser-verilog.r/systemverilog-package.d/input.sv

@@ -87,3 +87,21 @@ package MyPackage;
 endpackage : MyPackage
 
 reg var_to_check_context;
+
+// multiple package import declarations, #3150
+module mod_a
+    import A::*, B::*;
+(
+    input var logic in_a
+);
+    logic sig_a;
+endmodule
+
+module mod_b
+    import A::*;
+    import B::*;
+(
+    input var logic in_b
+);
+    logic sig_b;
+endmodule

parsers/verilog.c

@@ -1408,7 +1408,7 @@ static int processDesignElementL (tokenInfo *const token, int c)
 		createTag (token, kind);	// identifier
 
 	// skip package_import_declaration
-	if (isWordToken (c))
+	while (isWordToken (c))
 	{
 		c = readWordToken (token, c);
 		if (token->kind == K_IMPORT)