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

Align smallidea tokens and grammar on smali

Browse Source 
- Now the following tests are fixed:
 * org.jf.smalidea.MethodRenameTest.testMethodRename
 * org.jf.smalidea.dexlib.SmalideaMethodTest.testArrayData
 * org.jf.smalidea.dexlib.SmalideaMethodTest.testCatchBlocks
 * org.jf.smalidea.MethodReferenceTest.testJavaReferenceFromSmali
 * org.jf.smalidea.MethodReferenceTest.testSmaliReferenceFromSmali
 * org.jf.smalidea.SmaliCodeFragmentFactoryTest.testUnknownClass
 * org.jf.smalidea.SmaliCodeFragmentFactoryTest.testRegisterType
 * org.jf.smalidea.findUsages.MethodUsageTypeTest.testMethodUsageTypes
 * org.jf.smalidea.findUsages.HighlightLocalClassUsagesTest.testHighlightLocalClassUsage
 * org.jf.smalidea.findUsages.FindClassUsagesTest.testSmaliUsageInSmaliFile
 * org.jf.smalidea.findUsages.FindClassUsagesTest.testJavaUsageInSmaliFile
This commit is contained in:
Mikaël 2018-10-06 14:00:24 +02:00 committed by Ben Gruver
parent 280fe36112
commit 7f46be6473
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
smalidea/src/main/antlr/smalideaParser.g
View File

@ -400,6 +400,7 @@ simple_name
| INSTRUCTION_FORMAT31t | INSTRUCTION_FORMAT31t
| INSTRUCTION_FORMAT35c_METHOD | INSTRUCTION_FORMAT35c_METHOD
| INSTRUCTION_FORMAT35c_METHOD_ODEX | INSTRUCTION_FORMAT35c_METHOD_ODEX
| INSTRUCTION_FORMAT35c_METHOD_OR_METHOD_HANDLE_TYPE
| INSTRUCTION_FORMAT35c_TYPE | INSTRUCTION_FORMAT35c_TYPE
| INSTRUCTION_FORMAT35mi_METHOD | INSTRUCTION_FORMAT35mi_METHOD
| INSTRUCTION_FORMAT35ms_METHOD | INSTRUCTION_FORMAT35ms_METHOD
@ -1253,7 +1254,7 @@ insn_format32x
insn_format35c_method insn_format35c_method
: //e.g. invoke-virtual {v0,v1} java/io/PrintStream/print(Ljava/lang/Stream;)V : //e.g. invoke-virtual {v0,v1} java/io/PrintStream/print(Ljava/lang/Stream;)V
INSTRUCTION_FORMAT35c_METHOD register_list comma fully_qualified_method; (INSTRUCTION_FORMAT35c_METHOD | INSTRUCTION_FORMAT35c_METHOD_OR_METHOD_HANDLE_TYPE) register_list comma fully_qualified_method;
insn_format35c_type insn_format35c_type
: //e.g. filled-new-array {v0,v1}, I : //e.g. filled-new-array {v0,v1}, I

3
smalidea/src/main/java/org/jf/smalidea/SmaliTokens.java
View File

@ -120,6 +120,7 @@ public class SmaliTokens {
@SuppressWarnings({"UnusedDeclaration"}) public static IElementType INSTRUCTION_FORMAT32x; @SuppressWarnings({"UnusedDeclaration"}) public static IElementType INSTRUCTION_FORMAT32x;
@SuppressWarnings({"UnusedDeclaration"}) public static IElementType INSTRUCTION_FORMAT35c_METHOD; @SuppressWarnings({"UnusedDeclaration"}) public static IElementType INSTRUCTION_FORMAT35c_METHOD;
@SuppressWarnings({"UnusedDeclaration"}) public static IElementType INSTRUCTION_FORMAT35c_METHOD_ODEX; @SuppressWarnings({"UnusedDeclaration"}) public static IElementType INSTRUCTION_FORMAT35c_METHOD_ODEX;
@SuppressWarnings({"UnusedDeclaration"}) public static IElementType INSTRUCTION_FORMAT35c_METHOD_OR_METHOD_HANDLE_TYPE;
@SuppressWarnings({"UnusedDeclaration"}) public static IElementType INSTRUCTION_FORMAT35c_TYPE; @SuppressWarnings({"UnusedDeclaration"}) public static IElementType INSTRUCTION_FORMAT35c_TYPE;
@SuppressWarnings({"UnusedDeclaration"}) public static IElementType INSTRUCTION_FORMAT35mi_METHOD; @SuppressWarnings({"UnusedDeclaration"}) public static IElementType INSTRUCTION_FORMAT35mi_METHOD;
@SuppressWarnings({"UnusedDeclaration"}) public static IElementType INSTRUCTION_FORMAT35ms_METHOD; @SuppressWarnings({"UnusedDeclaration"}) public static IElementType INSTRUCTION_FORMAT35ms_METHOD;
@ -238,6 +239,7 @@ public class SmaliTokens {
tokenColors.put("INSTRUCTION_FORMAT32x", SmaliHighlightingColors.INSTRUCTION); tokenColors.put("INSTRUCTION_FORMAT32x", SmaliHighlightingColors.INSTRUCTION);
tokenColors.put("INSTRUCTION_FORMAT35c_METHOD", SmaliHighlightingColors.INSTRUCTION); tokenColors.put("INSTRUCTION_FORMAT35c_METHOD", SmaliHighlightingColors.INSTRUCTION);
tokenColors.put("INSTRUCTION_FORMAT35c_METHOD_ODEX", SmaliHighlightingColors.INSTRUCTION); tokenColors.put("INSTRUCTION_FORMAT35c_METHOD_ODEX", SmaliHighlightingColors.INSTRUCTION);
tokenColors.put("INSTRUCTION_FORMAT35c_METHOD_OR_METHOD_HANDLE_TYPE", SmaliHighlightingColors.INSTRUCTION);
tokenColors.put("INSTRUCTION_FORMAT35c_TYPE", SmaliHighlightingColors.INSTRUCTION); tokenColors.put("INSTRUCTION_FORMAT35c_TYPE", SmaliHighlightingColors.INSTRUCTION);
tokenColors.put("INSTRUCTION_FORMAT35mi_METHOD", SmaliHighlightingColors.INSTRUCTION); tokenColors.put("INSTRUCTION_FORMAT35mi_METHOD", SmaliHighlightingColors.INSTRUCTION);
tokenColors.put("INSTRUCTION_FORMAT35ms_METHOD", SmaliHighlightingColors.INSTRUCTION); tokenColors.put("INSTRUCTION_FORMAT35ms_METHOD", SmaliHighlightingColors.INSTRUCTION);
@ -343,6 +345,7 @@ public class SmaliTokens {
INSTRUCTION_FORMAT32x, INSTRUCTION_FORMAT32x,
INSTRUCTION_FORMAT35c_METHOD, INSTRUCTION_FORMAT35c_METHOD,
INSTRUCTION_FORMAT35c_METHOD_ODEX, INSTRUCTION_FORMAT35c_METHOD_ODEX,
INSTRUCTION_FORMAT35c_METHOD_OR_METHOD_HANDLE_TYPE,
INSTRUCTION_FORMAT35c_TYPE, INSTRUCTION_FORMAT35c_TYPE,
INSTRUCTION_FORMAT35mi_METHOD, INSTRUCTION_FORMAT35mi_METHOD,
INSTRUCTION_FORMAT35ms_METHOD, INSTRUCTION_FORMAT35ms_METHOD,