feat: Change field and method parsers to both use DEFINE keyword

Author: Col-E

src/main/java/me/coley/recaf/parse/bytecode/Parse.java

@@ -115,9 +115,7 @@ public static AbstractParser<?> getParser(int lineNo, String token) throws ASTPa
 		if(token.endsWith(":"))
 			return new LabelParser();
 		if (token.equals("DEFINE"))
-			return new MethodDefinitionParser();
-		if (token.equals("FIELD"))
-			return new FieldDefinitionParser();
+			return new DefinitionParser();
 		if (token.equals("VALUE"))
 			return new DefaultValueParser();
 		if(token.equals("THROWS"))

src/main/java/me/coley/recaf/parse/bytecode/ast/DefinitionAST.java

@@ -0,0 +1,39 @@
+package me.coley.recaf.parse.bytecode.ast;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Common base for definition AST objects.
+ *
+ * @author Matt
+ */
+public abstract class DefinitionAST extends AST {
+	protected final List<DefinitionModifierAST> modifiers = new ArrayList<>();
+	protected final NameAST name;
+
+	/**
+	 * @param line
+	 * 		Line number this node is written on.
+	 * @param start
+	 * 		Offset from line start this node starts at.
+	 * @param name
+	 * 		Member name.
+	 */
+	public DefinitionAST(int line, int start, NameAST name) {
+		super(line, start);
+		this.name = name;
+	}
+
+	/**
+	 * @return Full descriptor of the definition.
+	 */
+	abstract public String getDescriptor();
+
+	/**
+	 * @return Method name.
+	 */
+	public NameAST getName() {
+		return name;
+	}
+}

src/main/java/me/coley/recaf/parse/bytecode/ast/FieldDefinitionAST.java

@@ -10,9 +10,7 @@
  *
  * @author Matt
  */
-public class FieldDefinitionAST extends AST {
-	private final List<DefinitionModifierAST> modifiers = new ArrayList<>();
-	private final NameAST name;
+public class FieldDefinitionAST extends DefinitionAST {
 	private final DescAST type;
 
 	/**
@@ -26,8 +24,7 @@ public class FieldDefinitionAST extends AST {
 	 * 		Field return type.
 	 */
 	public FieldDefinitionAST(int line, int start, NameAST name, DescAST type) {
-		super(line, start);
-		this.name = name;
+		super(line, start, name);
 		this.type = type;
 	}
 
@@ -47,23 +44,21 @@ public void addModifier(DefinitionModifierAST modifier) {
 		addChild(modifier);
 	}
 
-	/**
-	 * @return Field name.
-	 */
-	public NameAST getName() {
-		return name;
-	}
-
 	/**
 	 * @return Field type.
 	 */
 	public DescAST getType() {
 		return type;
 	}
 
+	@Override
+	public String getDescriptor() {
+		return getType().getDesc();
+	}
+
 	@Override
 	public String print() {
 		String modifiersStr = getModifiers().stream().map(AST::print).collect(joining(" "));
-		return "FIELD " + modifiersStr + " " + getType().print() + " " + getName().print();
+		return "DEFINE " + modifiersStr + " " + getType().print() + " " + getName().print();
 	}
 }

src/main/java/me/coley/recaf/parse/bytecode/ast/MethodDefinitionAST.java

@@ -11,10 +11,8 @@
  *
  * @author Matt
  */
-public class MethodDefinitionAST extends AST {
-	private final List<DefinitionModifierAST> modifiers = new ArrayList<>();
+public class MethodDefinitionAST extends DefinitionAST {
 	private final List<DefinitionArgAST> arguments = new ArrayList<>();
-	private final NameAST name;
 	private final DescAST retType;
 
 	/**
@@ -28,8 +26,7 @@ public class MethodDefinitionAST extends AST {
 	 * 		Method return type.
 	 */
 	public MethodDefinitionAST(int line, int start, NameAST name, DescAST retType) {
-		super(line, start);
-		this.name = name;
+		super(line, start, name);
 		this.retType = retType;
 	}
 
@@ -74,13 +71,6 @@ public void addArgument(DefinitionArgAST arg) {
 		addChild(arg);
 	}
 
-	/**
-	 * @return Method name.
-	 */
-	public NameAST getName() {
-		return name;
-	}
-
 	/**
 	 * @return Method return type.
 	 */
@@ -92,6 +82,7 @@ public DescAST getReturnType() {
 	/**
 	 * @return Combined method descriptor of argument children and return type child.
 	 */
+	@Override
 	public String getDescriptor() {
 		String args = search(DefinitionArgAST.class).stream()
 				.map(ast -> ast.getDesc().getDesc())

src/main/java/me/coley/recaf/parse/bytecode/parser/DefinitionParser.java

@@ -0,0 +1,22 @@
+package me.coley.recaf.parse.bytecode.parser;
+
+import me.coley.recaf.parse.bytecode.AbstractParser;
+import me.coley.recaf.parse.bytecode.ast.DefinitionAST;
+import me.coley.recaf.parse.bytecode.exception.ASTParseException;
+
+/**
+ * Wrapper parser for all parsers using the {@code DEFINE} keyword.
+ *
+ * @author Matt
+ * @see FieldDefinitionParser
+ * @see MethodDefinitionParser
+ */
+public class DefinitionParser extends AbstractParser<DefinitionAST> {
+	@Override
+	public DefinitionAST visit(int lineNo, String text) throws ASTParseException {
+		if (text.contains("("))
+			return new MethodDefinitionParser().visit(lineNo, text);
+		else
+			return new FieldDefinitionParser().visit(lineNo, text);
+	}
+}

src/main/java/me/coley/recaf/parse/bytecode/parser/FieldDefinitionParser.java

@@ -19,7 +19,7 @@
  * @author Matt
  */
 public class FieldDefinitionParser extends AbstractParser<FieldDefinitionAST> {
-	private static final int DEFINE_LEN = "FIELD ".length();
+	private static final int DEFINE_LEN = "DEFINE ".length();
 
 	@Override
 	public FieldDefinitionAST visit(int lineNo, String line) throws ASTParseException {

src/main/java/me/coley/recaf/parse/bytecode/parser/FieldInsnParser.java

@@ -19,7 +19,7 @@ public FieldInsnAST visit(int lineNo, String line) throws ASTParseException {
 		try {
 			String[] trim = line.trim().split("\\s+");
 			if (trim.length < 3)
-				throw new ASTParseException(lineNo, "Not enough paramters");
+				throw new ASTParseException(lineNo, "Not enough parameters");
 			int start = line.indexOf(trim[0]);
 			// op
 			OpcodeParser opParser = new OpcodeParser();
@@ -53,7 +53,7 @@ public FieldInsnAST visit(int lineNo, String line) throws ASTParseException {
 
 	@Override
 	public List<String> suggest(ParseResult<RootAST> lastParse, String text) {
-		// FIELD owner.name desc
+		// DEFINE owner.name desc
 		int space = text.indexOf(' ');
 		if (space >= 0) {
 			String sub = text.substring(space + 1);

src/test/java/me/coley/recaf/AssemblyAstTest.java

@@ -105,7 +105,7 @@ public void testMethodDefine() {
 
 		@Test
 		public void testFieldDefine() {
-			FieldDefinitionAST def = single("FIELD public static Ljava/util/List; myList");
+			FieldDefinitionAST def = single("DEFINE public static Ljava/util/List; myList");
 			assertEquals("myList", def.getName().getName());
 			assertEquals(2, def.getModifiers().size());
 			assertEquals("public", def.getModifiers().get(0).getName());
@@ -122,15 +122,15 @@ public void testMethodDefineNoModifiers() {
 
 		@Test
 		public void testFieldDefineNoModifiers() {
-			FieldDefinitionAST def = single("FIELD Ljava/util/List; myList");
+			FieldDefinitionAST def = single("DEFINE Ljava/util/List; myList");
 			assertEquals("myList", def.getName().getName());
 			assertEquals("Ljava/util/List;", def.getType().getDesc());
 			assertEquals(0, def.getModifiers().size());
 		}
 
 		@Test
 		public void testFieldDefinePrimitive() {
-			FieldDefinitionAST def = single("FIELD J myLong");
+			FieldDefinitionAST def = single("DEFINE J myLong");
 			assertEquals("myLong", def.getName().getName());
 			assertEquals("J", def.getType().getDesc());
 			assertEquals(0, def.getModifiers().size());