ReVanced/smali
1
0
Fork 0
mirror of https://github.com/revanced/smali.git synced 2025-05-01 23:24:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add better error recovery for the type_descriptor rule

Browse Source
This commit is contained in:
Ben Gruver 2015-02-26 19:33:41 -08:00
parent 62958a7091
commit 21d509aa6c
5 changed files with 80 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
smalidea/src/main/antlr3/smalideaParser.g
View File

@ -536,6 +536,11 @@ type_descriptor
| primitive_type | primitive_type
| class_descriptor | class_descriptor
| array_descriptor; | array_descriptor;
catch [RecognitionException re] {
Marker marker = mark();
recover(input, re);
reportError(marker, re, false);
}
nonvoid_type_descriptor nonvoid_type_descriptor
: primitive_type : primitive_type

2
smalidea/testData/InvalidMethod4.smalidea
View File

@ -4,3 +4,5 @@
.method blah(I .blah V .method blah(I .blah V
.end method .end method
.method blah())V
.end method

20
smalidea/testData/InvalidMethod4.txt
View File

@ -50,4 +50,24 @@ smali.FILE
PsiElement(VOID_TYPE) PsiElement(VOID_TYPE)
PsiElement(VOID_TYPE)('V') PsiElement(VOID_TYPE)('V')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(END_METHOD_DIRECTIVE)('.end method')
PsiWhiteSpace('\n\n')
SmaliMethod(METHOD)
SmaliThrowsList(THROWS_LIST)
<empty list>
PsiElement(METHOD_DIRECTIVE)('.method')
PsiWhiteSpace(' ')
SmaliModifierList(MODIFIER_LIST)
<empty list>
PsiElement(MEMBER_NAME)
PsiElement(SIMPLE_NAME)('blah')
SmaliMethodPrototype(METHOD_PROTOTYPE)
PsiElement(OPEN_PAREN)('(')
SmaliMethodParamList(METHOD_PARAM_LIST)
<empty list>
PsiElement(CLOSE_PAREN)(')')
PsiErrorElement:no viable alternative at input ')'
PsiElement(CLOSE_PAREN)(')')
PsiElement(VOID_TYPE)('V')
PsiWhiteSpace('\n')
PsiElement(END_METHOD_DIRECTIVE)('.end method') PsiElement(END_METHOD_DIRECTIVE)('.end method')

5
smalidea/testData/InvalidMethodReference.smalidea
View File

@ -17,3 +17,8 @@ invoke-virtual {v0}, Lblah;->blah .blah )V
.registers 1 .registers 1
invoke-virtual {v0}, Lblah;->blah(I .blah V invoke-virtual {v0}, Lblah;->blah(I .blah V
.end method .end method
.method blah5()V
.registers 1
invoke-virtual {v0}, Lblah;->blah())V
.end method

48
smalidea/testData/InvalidMethodReference.txt
View File

@ -186,4 +186,52 @@ smali.FILE
PsiElement(VOID_TYPE) PsiElement(VOID_TYPE)
PsiElement(VOID_TYPE)('V') PsiElement(VOID_TYPE)('V')
PsiWhiteSpace('\n') PsiWhiteSpace('\n')
PsiElement(END_METHOD_DIRECTIVE)('.end method')
PsiWhiteSpace('\n\n')
SmaliMethod(METHOD)
SmaliThrowsList(THROWS_LIST)
<empty list>
PsiElement(METHOD_DIRECTIVE)('.method')
PsiWhiteSpace(' ')
SmaliModifierList(MODIFIER_LIST)
<empty list>
PsiElement(MEMBER_NAME)
PsiElement(SIMPLE_NAME)('blah5')
SmaliMethodPrototype(METHOD_PROTOTYPE)
PsiElement(OPEN_PAREN)('(')
SmaliMethodParamList(METHOD_PARAM_LIST)
<empty list>
PsiElement(CLOSE_PAREN)(')')
PsiElement(VOID_TYPE)
PsiElement(VOID_TYPE)('V')
PsiWhiteSpace('\n')
PsiElement(REGISTERS_STATEMENT)
PsiElement(REGISTERS_DIRECTIVE)('.registers')
PsiWhiteSpace(' ')
PsiElement(LITERAL)
PsiElement(POSITIVE_INTEGER_LITERAL)('1')
PsiWhiteSpace('\n')
PsiElement(INSTRUCTION)
PsiElement(INSTRUCTION_FORMAT35c_METHOD)('invoke-virtual')
PsiWhiteSpace(' ')
PsiElement(OPEN_BRACE)('{')
PsiElement(REGISTER_REFERENCE)
PsiElement(REGISTER)('v0')
PsiElement(CLOSE_BRACE)('}')
PsiElement(COMMA)(',')
PsiWhiteSpace(' ')
PsiElement(METHOD_REFERENCE)
PsiElement(CLASS_TYPE)
PsiElement(CLASS_DESCRIPTOR)('Lblah;')
PsiElement(ARROW)('->')
PsiElement(MEMBER_NAME)
PsiElement(SIMPLE_NAME)('blah')
PsiElement(OPEN_PAREN)('(')
PsiElement(METHOD_REFERENCE_PARAM_LIST)
<empty list>
PsiElement(CLOSE_PAREN)(')')
PsiErrorElement:no viable alternative at input ')'
PsiElement(CLOSE_PAREN)(')')
PsiElement(VOID_TYPE)('V')
PsiWhiteSpace('\n')
PsiElement(END_METHOD_DIRECTIVE)('.end method') PsiElement(END_METHOD_DIRECTIVE)('.end method')