summaryrefslogtreecommitdiff
path: root/src/mem/slicc/parser.py
diff options
context:
space:
mode:
authorDerek Hower <drh5@cs.wisc.edu>2010-01-22 17:23:21 -0600
committerDerek Hower <drh5@cs.wisc.edu>2010-01-22 17:23:21 -0600
commit589218168c5ae1ed143372e43dbc468369a1bb8f (patch)
tree5e5154c08e7def83b49b16769c213b0e78ea41fb /src/mem/slicc/parser.py
parent1c448e2ab00acb05d368c9de62c5cf08e64c6213 (diff)
parentf7de30ab1a9e1655de8bf7d4c15007a682a2a629 (diff)
downloadgem5-589218168c5ae1ed143372e43dbc468369a1bb8f.tar.xz
Automated merge with ssh://hg@m5sim.org/m5
Diffstat (limited to 'src/mem/slicc/parser.py')
-rw-r--r--src/mem/slicc/parser.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mem/slicc/parser.py b/src/mem/slicc/parser.py
index 6c3f45629..226106678 100644
--- a/src/mem/slicc/parser.py
+++ b/src/mem/slicc/parser.py
@@ -514,8 +514,8 @@ class SLICC(Grammar):
p[0] = ast.EnqueueStatementAST(self, p[3], p[5], p[6], p[8])
def p_statement__peek(self, p):
- "statement : PEEK '(' var ',' type ')' statements"
- p[0] = ast.PeekStatementAST(self, p[3], p[5], p[7], "peek")
+ "statement : PEEK '(' var ',' type pairs ')' statements"
+ p[0] = ast.PeekStatementAST(self, p[3], p[5], p[6], p[8], "peek")
def p_statement__copy_head(self, p):
"statement : COPY_HEAD '(' var ',' var pairs ')' SEMI"