From b624b6002ecf8cf4b17a5dfa89316c03a6d2fbb7 Mon Sep 17 00:00:00 2001 From: steve Date: Sat, 3 Nov 2001 04:09:10 +0000 Subject: [PATCH] Parse more [gosh darn] specify syntax. --- parse.y | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/parse.y b/parse.y index dea7e4b55..7ef47642a 100644 --- a/parse.y +++ b/parse.y @@ -19,7 +19,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #if !defined(WINNT) && !defined(macintosh) -#ident "$Id: parse.y,v 1.133 2001/10/31 03:11:15 steve Exp $" +#ident "$Id: parse.y,v 1.134 2001/11/03 04:09:10 steve Exp $" #endif # include "config.h" @@ -1892,13 +1892,13 @@ specify_edge_path_decl specify_edge_path : '(' K_posedge specify_path_identifiers spec_polarity K_EG IDENTIFIER ')' - | '(' K_posedge specify_path_identifiers spec_polarity K_EG '(' IDENTIFIER polarity_operator expression ')' ')' + | '(' K_posedge specify_path_identifiers spec_polarity K_EG '(' expr_primary polarity_operator expression ')' ')' | '(' K_posedge specify_path_identifiers spec_polarity K_SG IDENTIFIER ')' - | '(' K_posedge specify_path_identifiers spec_polarity K_SG '(' IDENTIFIER polarity_operator expression ')' ')' + | '(' K_posedge specify_path_identifiers spec_polarity K_SG '(' expr_primary polarity_operator expression ')' ')' | '(' K_negedge specify_path_identifiers spec_polarity K_EG IDENTIFIER ')' - | '(' K_negedge specify_path_identifiers spec_polarity K_EG '(' IDENTIFIER polarity_operator expression ')' ')' + | '(' K_negedge specify_path_identifiers spec_polarity K_EG '(' expr_primary polarity_operator expression ')' ')' | '(' K_negedge specify_path_identifiers spec_polarity K_SG IDENTIFIER ')' - | '(' K_negedge specify_path_identifiers spec_polarity K_SG '(' IDENTIFIER polarity_operator expression ')' ')' + | '(' K_negedge specify_path_identifiers spec_polarity K_SG '(' expr_primary polarity_operator expression ')' ')' ; polarity_operator @@ -1943,18 +1943,20 @@ specparam_list spec_polarity: '+' | '-' | ; spec_reference_event - : K_posedge IDENTIFIER + : K_posedge expression { delete $2; } - | K_negedge IDENTIFIER + | K_negedge expression { delete $2; } - | K_posedge IDENTIFIER K_TAND expression + | K_posedge expr_primary K_TAND expression { delete $2; delete $4; } - | K_negedge IDENTIFIER K_TAND expression + | K_negedge expr_primary K_TAND expression { delete $2; delete $4; } + | expr_primary + { delete $1; } ; spec_notifier_opt