From ea5b01d9f38a5a3b56f76bd769f8d733f2d6d7e0 Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Tue, 24 Dec 2019 16:04:28 -0500
Subject: [PATCH] Internals: Rename pexpr. No functional change intended.

---
 src/verilog.y | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/verilog.y b/src/verilog.y
index 03bcb9262..b76846ea4 100644
--- a/src/verilog.y
+++ b/src/verilog.y
@@ -4254,21 +4254,20 @@ elseStmtBlock<nodep>:	// Part of concurrent_assertion_statement
 
 property_spec<nodep>:			// IEEE: property_spec
 	//UNSUP: This rule has been super-specialized to what is supported now
-		'@' '(' senitemEdge ')' yDISABLE yIFF '(' expr ')' property_expr
+		'@' '(' senitemEdge ')' yDISABLE yIFF '(' expr ')' pexpr
 			{ $$ = new AstPropClocked($1, $3, $8, $10); }
-	|	'@' '(' senitemEdge ')' property_expr	 	{ $$ = new AstPropClocked($1, $3, NULL, $5); }
-	|	yDISABLE yIFF '(' expr ')' property_expr 	{ $$ = new AstPropClocked($4->fileline(), NULL, $4, $6); }
-	|	property_expr	 				{ $$ = new AstPropClocked($1->fileline(), NULL, NULL, $1); }
+	|	'@' '(' senitemEdge ')' pexpr	 	{ $$ = new AstPropClocked($1, $3, NULL, $5); }
+	|	yDISABLE yIFF '(' expr ')' pexpr 	{ $$ = new AstPropClocked($4->fileline(), NULL, $4, $6); }
+	|	pexpr	 				{ $$ = new AstPropClocked($1->fileline(), NULL, NULL, $1); }
 	;
 
-property_expr<nodep>:			// IEEE: property_expr
+pexpr<nodep>:  // IEEE: property_expr  (The name pexpr is important as regexps just add an "p" to expr.)
 	//UNSUP: This rule has been super-specialized to what is supported now
-		expr yP_ORMINUSGT property_expr			{ $$ = new AstLogOr($2,new AstLogNot($2,$1),$3); }
-	//UNSUP	expr yP_OREQGT property_expr			{ $$ = new AstLogOr($2,new AstLogNot($2,new AstPast($2,$1, NULL)),$3); } // This handles disable iff in the past time step incorrectly
-	|	expr						{ $$ = $1; }
+		expr yP_ORMINUSGT pexpr			{ $$ = new AstLogOr($2, new AstLogNot($2, $1), $3); }
+	//UNSUP	expr yP_OREQGT pexpr			{ $$ = new AstLogOr($2, new AstLogNot($2, new AstPast($2, $1, NULL)), $3); } // This handles disable iff in the past time step incorrectly
+	|	expr					{ $$ = $1; }
 	;
 
-
 //************************************************
 // Let