[gem5-dev] changeset in gem5: imported patch jason/slicc-external-structure...

[Brad Beckmann]

changeset aa9b75db7ea0 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=aa9b75db7ea0
description:
        imported patch jason/slicc-external-structure-fix

diffstat:

 src/mem/slicc/ast/AssignStatementAST.py |  2 +-
 src/mem/slicc/ast/FuncCallExprAST.py    |  2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diffs (24 lines):

diff -r b576c490e7d1 -r aa9b75db7ea0 src/mem/slicc/ast/AssignStatementAST.py
--- a/src/mem/slicc/ast/AssignStatementAST.py   Tue Jul 10 22:51:54 2012 -0700
+++ b/src/mem/slicc/ast/AssignStatementAST.py   Tue Jul 10 22:51:54 2012 -0700
@@ -45,7 +45,7 @@
 
         code("$lcode = $rcode;")
 
-        if ltype != rtype:
+        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
diff -r b576c490e7d1 -r aa9b75db7ea0 src/mem/slicc/ast/FuncCallExprAST.py
--- a/src/mem/slicc/ast/FuncCallExprAST.py      Tue Jul 10 22:51:54 2012 -0700
+++ b/src/mem/slicc/ast/FuncCallExprAST.py      Tue Jul 10 22:51:54 2012 -0700
@@ -93,7 +93,7 @@
         for expr,expected_type in zip(self.exprs, func.param_types):
             # Check the types of the parameter
             actual_type,param_code = expr.inline(True)
-            if actual_type != expected_type:
+            if str(actual_type) != str(expected_type):
                 expr.error("Type mismatch: expected: %s actual: %s" % \
                            (expected_type, actual_type))
             cvec.append(param_code)
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev