From a198b46e20033e20a4b47be479d4be0fed4ee7d0 Mon Sep 17 00:00:00 2001 From: Ben Gruver Date: Sun, 28 Feb 2016 12:15:22 -0800 Subject: [PATCH] Fix issue with parameter list parsing This fixes an issue that was initially introduced in the smalidea branch --- smali/src/main/antlr/smaliParser.g | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/smali/src/main/antlr/smaliParser.g b/smali/src/main/antlr/smaliParser.g index 0ce825c1..fcccbe80 100644 --- a/smali/src/main/antlr/smaliParser.g +++ b/smali/src/main/antlr/smaliParser.g @@ -591,8 +591,11 @@ method_prototype : OPEN_PAREN param_list CLOSE_PAREN type_descriptor -> ^(I_METHOD_PROTOTYPE[$start, "I_METHOD_PROTOTYPE"] ^(I_METHOD_RETURN_TYPE type_descriptor) param_list?); +param_list_or_id_primitive_type + : PARAM_LIST_OR_ID_PRIMITIVE_TYPE -> PRIMITIVE_TYPE[$PARAM_LIST_OR_ID_PRIMITIVE_TYPE]; + param_list - : (PARAM_LIST_OR_ID_PRIMITIVE_TYPE -> PRIMITIVE_TYPE[$PARAM_LIST_OR_ID_PRIMITIVE_TYPE])+ + : param_list_or_id_primitive_type+ | nonvoid_type_descriptor*; array_descriptor