diff options
| -rw-r--r-- | src/mem/slicc/ast/FuncCallExprAST.py | 17 | ||||
| -rw-r--r-- | src/mem/slicc/ast/MethodCallExprAST.py | 21 | ||||
| -rw-r--r-- | src/mem/slicc/parser.py | 6 | ||||
| -rw-r--r-- | src/mem/slicc/symbols/Func.py | 21 |
4 files changed, 30 insertions, 35 deletions
diff --git a/src/mem/slicc/ast/FuncCallExprAST.py b/src/mem/slicc/ast/FuncCallExprAST.py index 9336a2297..0c9880d6d 100644 --- a/src/mem/slicc/ast/FuncCallExprAST.py +++ b/src/mem/slicc/ast/FuncCallExprAST.py @@ -93,22 +93,7 @@ class FuncCallExprAST(ExprAST): if func is None: self.error("Unrecognized function name: '%s'", func_name_args) - if len(self.exprs) != len(func.param_types): - self.error("Wrong number of arguments passed to function : '%s'" +\ - " Expected %d, got %d", self.proc_name, - len(func.param_types), len(self.exprs)) - - cvec = [] - type_vec = [] - 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 str(actual_type) != 'OOD' and \ - str(actual_type) != str(expected_type): - expr.error("Type mismatch: expected: %s actual: %s" % \ - (expected_type, actual_type)) - cvec.append(param_code) - type_vec.append(expected_type) + cvec, type_vec = func.checkArguments(self.exprs) # OK, the semantics of "trigger" here is that, ports in the # machine have different priorities. We always check the first diff --git a/src/mem/slicc/ast/MethodCallExprAST.py b/src/mem/slicc/ast/MethodCallExprAST.py index 8be319a40..104d6f8df 100644 --- a/src/mem/slicc/ast/MethodCallExprAST.py +++ b/src/mem/slicc/ast/MethodCallExprAST.py @@ -56,20 +56,8 @@ class MethodCallExprAST(ExprAST): self.error("Invalid method call: Type '%s' does not have a method '%s'", obj_type, methodId) - if len(self.expr_ast_vec) != \ - len(obj_type.methods[methodId].param_types): - # Right number of parameters - self.error("Wrong number of parameters for function name: '%s', " + \ - "expected: , actual: ", proc_name, - len(obj_type.methods[methodId].param_types), - len(self.expr_ast_vec)) - - for actual_type, expected_type in \ - zip(paramTypes, obj_type.methods[methodId].param_types): - if actual_type != expected_type and \ - str(actual_type["interface"]) != str(expected_type): - self.error("Type mismatch: expected: %s actual: %s", - expected_type, actual_type) + func = obj_type.methods[methodId] + func.checkArguments(self.expr_ast_vec) # Return the return type of the method return obj_type.methods[methodId].return_type @@ -78,10 +66,9 @@ class MethodCallExprAST(ExprAST): pass class MemberMethodCallExprAST(MethodCallExprAST): - def __init__(self, slicc, obj_expr_ast, proc_name, expr_ast_vec): + def __init__(self, slicc, obj_expr_ast, func_call): s = super(MemberMethodCallExprAST, self) - s.__init__(slicc, proc_name, expr_ast_vec) - + s.__init__(slicc, func_call.proc_name, func_call.exprs) self.obj_expr_ast = obj_expr_ast def __repr__(self): diff --git a/src/mem/slicc/parser.py b/src/mem/slicc/parser.py index a50907a28..07c067f68 100644 --- a/src/mem/slicc/parser.py +++ b/src/mem/slicc/parser.py @@ -669,11 +669,13 @@ class SLICC(Grammar): def p_expr__member_method_call(self, p): "aexpr : aexpr DOT ident '(' exprs ')'" - p[0] = ast.MemberMethodCallExprAST(self, p[1], p[3], p[5]) + p[0] = ast.MemberMethodCallExprAST(self, p[1], + ast.FuncCallExprAST(self, p[3], p[5])) def p_expr__class_method_call(self, p): "aexpr : type DOUBLE_COLON ident '(' exprs ')'" - p[0] = ast.ClassMethodCallExprAST(self, p[1], p[3], p[5]) + p[0] = ast.ClassMethodCallExprAST(self, p[1], + ast.FuncCallExprAST(self, p[3], p[5])) def p_expr__aexpr(self, p): "expr : aexpr" diff --git a/src/mem/slicc/symbols/Func.py b/src/mem/slicc/symbols/Func.py index d50d0309f..6da74002a 100644 --- a/src/mem/slicc/symbols/Func.py +++ b/src/mem/slicc/symbols/Func.py @@ -62,6 +62,27 @@ class Func(Symbol): def writeCodeFiles(self, path, includes): return + def checkArguments(self, args): + if len(args) != len(self.param_types): + self.error("Wrong number of arguments passed to function : '%s'" +\ + " Expected %d, got %d", self.c_ident, + len(self.param_types), len(args)) + + cvec = [] + type_vec = [] + for expr,expected_type in zip(args, self.param_types): + # Check the types of the parameter + actual_type,param_code = expr.inline(True) + if str(actual_type) != 'OOD' and \ + str(actual_type) != str(expected_type) and \ + str(actual_type["interface"]) != str(expected_type): + expr.error("Type mismatch: expected: %s actual: %s" % \ + (expected_type, actual_type)) + cvec.append(param_code) + type_vec.append(expected_type) + + return cvec, type_vec + def generateCode(self): '''This write a function of object Chip''' if "external" in self: |