Fix Nic30#160 by adding hierarchical_identifier as alternative in del…

…ay_value rule
Thomasb81 · Jul 14, 2024 · cc4ec3f · cc4ec3f
1 parent a2c943d
commit cc4ec3f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/grammars/sv2017Parser.g4 b/grammars/sv2017Parser.g4
@@ -529,6 +529,7 @@ delay_value:
     | KW_1STEP
     | real_number
     | ps_identifier
+    | hierarchical_identifier
 ;
 delay_control:
     HASH ( LPAREN mintypmax_expression RPAREN

diff --git a/src/svConvertor/delayParser.cpp b/src/svConvertor/delayParser.cpp
@@ -95,7 +95,9 @@ unique_ptr<iHdlExprItem> VerDelayParser::visitDelay_value(
 	//     | TIME_LITERAL
 	//     | KW_1STEP
 	//     | real_number
-	//     | ps_identifier;
+	//     | ps_identifier
+	//     | hierarchical_identifier
+	//     ;
 	auto un = ctx->UNSIGNED_NUMBER();
 	if (un) {
 		return VerLiteralParser::visitUNSIGNED_NUMBER(un);
@@ -111,8 +113,12 @@ unique_ptr<iHdlExprItem> VerDelayParser::visitDelay_value(
 		return VerLiteralParser::visitReal_number(r);
 	}
 	auto pi = ctx->ps_identifier();
-	assert(pi);
-	return VerExprParser(this).visitPs_identifier(pi);
+	if (pi) {
+		return VerExprParser(this).visitPs_identifier(pi);
+	}
+	auto hi = ctx->hierarchical_identifier();
+	assert(hi);
+	return VerExprParser(this).visitHierarchical_identifier(hi);
 }
 
 pair<unique_ptr<iHdlExprItem>, VerDelayParser::HdlEventList> VerDelayParser::visitDelay_or_event_control(