From 16ac48e6a419b75e6a9e86fab9cd2fd62ef9a574 Mon Sep 17 00:00:00 2001
From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Sat, 4 Jul 2015 10:43:46 -0500
Subject: ruby: drop NetworkMessage class

This patch drops the NetworkMessage class.  The relevant data members and functions
have been moved to the Message class, which was the parent of NetworkMessage.
---
 src/mem/slicc/ast/AssignStatementAST.py | 9 ++++-----
 src/mem/slicc/symbols/Type.py           | 8 ++------
 2 files changed, 6 insertions(+), 11 deletions(-)

(limited to 'src/mem/slicc')

diff --git a/src/mem/slicc/ast/AssignStatementAST.py b/src/mem/slicc/ast/AssignStatementAST.py
index 042204925..b95979354 100644
--- a/src/mem/slicc/ast/AssignStatementAST.py
+++ b/src/mem/slicc/ast/AssignStatementAST.py
@@ -47,11 +47,10 @@ class AssignStatementAST(StatementAST):
 
         if not (ltype == rtype or (ltype.isInterface and ltype['interface'] == rtype.ident)):
             # FIXME - beckmann
-            # the following if statement is a hack to allow NetDest
-            # objects to be assigned to Sets this allows for the
-            # previous NetworkMessage Destiantion 'Set class' to
-            # migrate to the new NetworkMessage Destiantion 'NetDest
-            # class'
+            # the following if statement is a hack to allow NetDest objects to
+            # be assigned to Sets this allows for the previous Message
+            # Destination 'Set class' to migrate to the new Message Destination
+            # 'NetDest class'
             if str(ltype) != "NetDest" and str(rtype) != "Set":
                 self.error("Assignment type mismatch '%s' and '%s'",
                            ltype, rtype)
diff --git a/src/mem/slicc/symbols/Type.py b/src/mem/slicc/symbols/Type.py
index 2afd9958c..e6e704000 100644
--- a/src/mem/slicc/symbols/Type.py
+++ b/src/mem/slicc/symbols/Type.py
@@ -61,10 +61,8 @@ class Type(Symbol):
         # check for interface that this Type implements
         if "interface" in self:
             interface = self["interface"]
-            if interface in ("Message", "NetworkMessage"):
+            if interface in ("Message"):
                 self["message"] = "yes"
-            if interface == "NetworkMessage":
-                self["networkmessage"] = "yes"
 
         # FIXME - all of the following id comparisons are fragile hacks
         if self.ident in ("CacheMemory"):
@@ -97,9 +95,7 @@ class Type(Symbol):
     @property
     def isPrimitive(self):
         return "primitive" in self
-    @property
-    def isNetworkMessage(self):
-        return "networkmessage" in self
+
     @property
     def isMessage(self):
         return "message" in self
-- 
cgit v1.2.3