diff --git a/src/mem/slicc/parser.py b/src/mem/slicc/parser.py --- a/src/mem/slicc/parser.py +++ b/src/mem/slicc/parser.py @@ -655,6 +655,10 @@ "aexpr : NEW type" p[0] = ast.NewExprAST(self, p[2]) + def p_expr__new_with_param(self, p): + "aexpr : NEW type '(' exprs ')'" + p[0] = ast.NewExprASTParams(self, p[2], p[4]) + def p_expr__null(self, p): "aexpr : OOD" p[0] = ast.OodAST(self) # Node ID 5990fc6e2e539602e2e3e7294e3257aae36fde98 # Parent 52997ce5a9a3d595d02b0ff28d9e11aabe416d54 diff --git a/src/mem/slicc/ast/NewExprASTParams.py b/src/mem/slicc/ast/NewExprASTParams.py new file mode 100644 --- /dev/null +++ b/src/mem/slicc/ast/NewExprASTParams.py @@ -0,0 +1,51 @@ +# Copyright (c) 1999-2008 Mark D. Hill and David A. Wood +# Copyright (c) 2009 The Hewlett-Packard Development Company +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are +# met: redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer; +# redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution; +# neither the name of the copyright holders nor the names of its +# contributors may be used to endorse or promote products derived from +# this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +from slicc.ast.ExprAST import ExprAST + +class NewExprASTParams(ExprAST): + def __init__(self, slicc, type_ast, expr_ast): + super(NewExprASTParams, self).__init__(slicc) + self.type_ast = type_ast + self.exprs = expr_ast + + def __repr__(self): + return "[NewExprASTParams: %r %s]" % (self.type_ast, self.exprs) + + def generate(self, code): + type = self.type_ast.type + + params = "" + for expr in self.exprs: + if params: + params += ", " + params += "m_"+expr.name + + fix = code.nofix() + code("new ${{type.c_ident}} ( ${{params}} )") + code.fix(fix) + return type diff --git a/src/mem/slicc/ast/__init__.py b/src/mem/slicc/ast/__init__.py --- a/src/mem/slicc/ast/__init__.py +++ b/src/mem/slicc/ast/__init__.py @@ -50,6 +50,7 @@ from slicc.ast.MemberExprAST import * from slicc.ast.MethodCallExprAST import * from slicc.ast.NewExprAST import * +from slicc.ast.NewExprASTParams import * from slicc.ast.OodAST import * from slicc.ast.ObjDeclAST import * from slicc.ast.OperatorExprAST import *