From e62e1d89b63fe24e1339a02fa4eb406719f4dc4e Mon Sep 17 00:00:00 2001
From: steve <steve>
Date: Sat, 7 Dec 2002 02:49:24 +0000
Subject: [PATCH]  Named event triggers can take hierarchical names.

---
 net_design.cc | 22 ++++++++++++++--------
 net_scope.cc  |  9 ++++++---
 netlist.h     |  7 +++++--
 parse.y       |  6 +++---
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/net_design.cc b/net_design.cc
index b1ff3adc8..426794d05 100644
--- a/net_design.cc
+++ b/net_design.cc
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: net_design.cc,v 1.29 2002/11/02 03:27:52 steve Exp $"
+#ident "$Id: net_design.cc,v 1.30 2002/12/07 02:49:24 steve Exp $"
 #endif
 
 # include "config.h"
@@ -501,24 +501,27 @@ NetScope* Design::find_task(const hname_t&key)
       return 0;
 }
 
-NetEvent* Design::find_event(NetScope*scope, const hname_t&path)
+NetEvent* Design::find_event(NetScope*scope, const hname_t&p)
 {
+      hname_t path = p;
       assert(scope);
 
+      char*key = path.remove_tail_name();
+      if (path.peek_name(0))
+	    scope = find_scope(scope, path);
+
       while (scope) {
-	    if (NetEvent*ev = scope->find_event(path)) {
+	    if (NetEvent*ev = scope->find_event(key)) {
+		  delete key;
 		  return ev;
 	    }
 
-	      // If this is a simple name, then do not scan up scopes
-	      // past a module scope. This is a Verilog scoping rule.
-	    if ((path.component_count() == 1)
-		&& (scope->type() == NetScope::MODULE))
+	    if (scope->type() == NetScope::MODULE)
 		  break;
-
 	    scope = scope->parent();
       }
 
+      delete key;
       return 0;
 }
 
@@ -597,6 +600,9 @@ void Design::delete_process(NetProcTop*top)
 
 /*
  * $Log: net_design.cc,v $
+ * Revision 1.30  2002/12/07 02:49:24  steve
+ *  Named event triggers can take hierarchical names.
+ *
  * Revision 1.29  2002/11/02 03:27:52  steve
  *  Allow named events to be referenced by
  *  hierarchical names.
diff --git a/net_scope.cc b/net_scope.cc
index 2be61c0b3..57692d4ae 100644
--- a/net_scope.cc
+++ b/net_scope.cc
@@ -17,7 +17,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: net_scope.cc,v 1.20 2002/10/19 22:59:49 steve Exp $"
+#ident "$Id: net_scope.cc,v 1.21 2002/12/07 02:49:24 steve Exp $"
 #endif
 
 # include "config.h"
@@ -255,10 +255,10 @@ void NetScope::rem_event(NetEvent*ev)
 }
 
 
-NetEvent* NetScope::find_event(const hname_t&name)
+NetEvent* NetScope::find_event(const char*name)
 {
       for (NetEvent*cur = events_;  cur ;  cur = cur->snext_)
-	    if (strcmp(cur->name(), name.peek_tail_name()) == 0)
+	    if (strcmp(cur->name(), name) == 0)
 		  return cur;
 
       return 0;
@@ -432,6 +432,9 @@ string NetScope::local_hsymbol()
 
 /*
  * $Log: net_scope.cc,v $
+ * Revision 1.21  2002/12/07 02:49:24  steve
+ *  Named event triggers can take hierarchical names.
+ *
  * Revision 1.20  2002/10/19 22:59:49  steve
  *  Redo the parameter vector support to allow
  *  parameter names in range expressions.
diff --git a/netlist.h b/netlist.h
index be9123eef..ff7858470 100644
--- a/netlist.h
+++ b/netlist.h
@@ -19,7 +19,7 @@
  *    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
  */
 #ifdef HAVE_CVS_IDENT
-#ident "$Id: netlist.h,v 1.270 2002/12/05 02:14:33 steve Exp $"
+#ident "$Id: netlist.h,v 1.271 2002/12/07 02:49:24 steve Exp $"
 #endif
 
 /*
@@ -2795,7 +2795,7 @@ class NetScope {
 
       void add_event(NetEvent*);
       void rem_event(NetEvent*);
-      NetEvent*find_event(const hname_t&name);
+      NetEvent*find_event(const char*name);
 
 
 	/* These methods manage signals. The add_ and rem_signal
@@ -3085,6 +3085,9 @@ extern ostream& operator << (ostream&, NetNet::Type);
 
 /*
  * $Log: netlist.h,v $
+ * Revision 1.271  2002/12/07 02:49:24  steve
+ *  Named event triggers can take hierarchical names.
+ *
  * Revision 1.270  2002/12/05 02:14:33  steve
  *  Support bit select in constant expressions.
  *
diff --git a/parse.y b/parse.y
index d43e720c4..6ceeeee4d 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.166 2002/11/26 03:56:10 steve Exp $"
+#ident "$Id: parse.y,v 1.167 2002/12/07 02:49:24 steve Exp $"
 #endif
 
 # include "config.h"
@@ -2316,8 +2316,8 @@ statement
 		  delete $2;
 		  $$ = tmp;
 		}
-	| K_TRIGGER IDENTIFIER ';'
-		{ PTrigger*tmp = new PTrigger(hname_t($2));
+	| K_TRIGGER identifier ';'
+		{ PTrigger*tmp = new PTrigger(*$2);
 		  tmp->set_file(@2.text);
 		  tmp->set_lineno(@2.first_line);
 		  delete $2;