changeset 7e9edf4297a9 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=7e9edf4297a9
description:
ruby: slicc: slight change to rule for transitions
It had an unnecessary pairs token which is being removed.
diffstat:
src/mem/slicc/ast/DeclAST.py | 2 +-
src/mem/slicc/ast/TransitionDeclAST.py | 7 +++----
src/mem/slicc/parser.py | 16 ++++++++--------
src/mem/slicc/symbols/Transition.py | 4 ++--
4 files changed, 14 insertions(+), 15 deletions(-)
diffs (82 lines):
diff -r 2d2c60bda8b2 -r 7e9edf4297a9 src/mem/slicc/ast/DeclAST.py
--- a/src/mem/slicc/ast/DeclAST.py Sat Apr 19 09:00:30 2014 -0500
+++ b/src/mem/slicc/ast/DeclAST.py Sat Apr 19 09:00:31 2014 -0500
@@ -28,7 +28,7 @@
from slicc.ast.AST import AST
class DeclAST(AST):
- def __init__(self, slicc, pairs):
+ def __init__(self, slicc, pairs = None):
super(DeclAST, self).__init__(slicc, pairs)
def files(self, parent=None):
diff -r 2d2c60bda8b2 -r 7e9edf4297a9 src/mem/slicc/ast/TransitionDeclAST.py
--- a/src/mem/slicc/ast/TransitionDeclAST.py Sat Apr 19 09:00:30 2014 -0500
+++ b/src/mem/slicc/ast/TransitionDeclAST.py Sat Apr 19 09:00:31 2014 -0500
@@ -29,9 +29,9 @@
from slicc.symbols import Transition
class TransitionDeclAST(DeclAST):
- def __init__(self, slicc, request_types, states, events, next_state, pairs,
+ def __init__(self, slicc, request_types, states, events, next_state,
actions):
- super(TransitionDeclAST, self).__init__(slicc, pairs)
+ super(TransitionDeclAST, self).__init__(slicc)
self.request_types = request_types
self.states = states
@@ -69,6 +69,5 @@
self.error("Invalid event: %s is not part of machine: %s"
% \
(event, machine))
t = Transition(self.symtab, machine, state, event, next_state,
- self.actions, self.request_types, self.location,
- self.pairs)
+ self.actions, self.request_types, self.location)
machine.addTransition(t)
diff -r 2d2c60bda8b2 -r 7e9edf4297a9 src/mem/slicc/parser.py
--- a/src/mem/slicc/parser.py Sat Apr 19 09:00:30 2014 -0500
+++ b/src/mem/slicc/parser.py Sat Apr 19 09:00:31 2014 -0500
@@ -278,20 +278,20 @@
p[0] = ast.OutPortDeclAST(self, p[3], p[5], p[7], p[8])
def p_decl__trans0(self, p):
- "decl : TRANS '(' idents ',' idents ',' ident pairs ')' idents"
- p[0] = ast.TransitionDeclAST(self, [], p[3], p[5], p[7], p[8], p[10])
+ "decl : TRANS '(' idents ',' idents ',' ident ')' idents"
+ p[0] = ast.TransitionDeclAST(self, [], p[3], p[5], p[7], p[9])
def p_decl__trans1(self, p):
- "decl : TRANS '(' idents ',' idents pairs ')' idents"
- p[0] = ast.TransitionDeclAST(self, [], p[3], p[5], None, p[6], p[8])
+ "decl : TRANS '(' idents ',' idents ')' idents"
+ p[0] = ast.TransitionDeclAST(self, [], p[3], p[5], None, p[7])
def p_decl__trans2(self, p):
- "decl : TRANS '(' idents ',' idents ',' ident pairs ')' idents idents"
- p[0] = ast.TransitionDeclAST(self, p[10], p[3], p[5], p[7], p[8],
p[11])
+ "decl : TRANS '(' idents ',' idents ',' ident ')' idents idents"
+ p[0] = ast.TransitionDeclAST(self, p[9], p[3], p[5], p[7], p[10])
def p_decl__trans3(self, p):
- "decl : TRANS '(' idents ',' idents pairs ')' idents idents"
- p[0] = ast.TransitionDeclAST(self, p[8], p[3], p[5], None, p[6], p[9])
+ "decl : TRANS '(' idents ',' idents ')' idents idents"
+ p[0] = ast.TransitionDeclAST(self, p[7], p[3], p[5], None, p[8])
def p_decl__extern0(self, p):
"decl : EXTERN_TYPE '(' type pairs ')' SEMI"
diff -r 2d2c60bda8b2 -r 7e9edf4297a9 src/mem/slicc/symbols/Transition.py
--- a/src/mem/slicc/symbols/Transition.py Sat Apr 19 09:00:30 2014 -0500
+++ b/src/mem/slicc/symbols/Transition.py Sat Apr 19 09:00:31 2014 -0500
@@ -29,9 +29,9 @@
class Transition(Symbol):
def __init__(self, table, machine, state, event, nextState, actions,
- request_types, location, pairs):
+ request_types, location):
ident = "%s|%s" % (state, event)
- super(Transition, self).__init__(table, ident, location, pairs)
+ super(Transition, self).__init__(table, ident, location)
self.state = machine.states[state]
self.event = machine.events[event]
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
