From 959cb5fd4f9586ec3bd265b452fe25fe1db82e3f Mon Sep 17 00:00:00 2001 From: jeff Date: Tue, 13 Jan 2015 23:25:04 -0500 Subject: source format change don't hate me too much if you were planning a big merge. =P --- .../analysis/SourceIndexBehaviorVisitor.java | 159 +++++++++------------ 1 file changed, 64 insertions(+), 95 deletions(-) (limited to 'src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java') diff --git a/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java b/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java index 7ffd170..43c1749 100644 --- a/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java +++ b/src/cuchaz/enigma/analysis/SourceIndexBehaviorVisitor.java @@ -36,159 +36,128 @@ import cuchaz.enigma.mapping.ConstructorEntry; import cuchaz.enigma.mapping.FieldEntry; import cuchaz.enigma.mapping.MethodEntry; -public class SourceIndexBehaviorVisitor extends SourceIndexVisitor -{ +public class SourceIndexBehaviorVisitor extends SourceIndexVisitor { + private BehaviorEntry m_behaviorEntry; - public SourceIndexBehaviorVisitor( BehaviorEntry behaviorEntry ) - { + public SourceIndexBehaviorVisitor(BehaviorEntry behaviorEntry) { m_behaviorEntry = behaviorEntry; } @Override - public Void visitMethodDeclaration( MethodDeclaration node, SourceIndex index ) - { - return recurse( node, index ); + public Void visitMethodDeclaration(MethodDeclaration node, SourceIndex index) { + return recurse(node, index); } @Override - public Void visitConstructorDeclaration( ConstructorDeclaration node, SourceIndex index ) - { - return recurse( node, index ); + public Void visitConstructorDeclaration(ConstructorDeclaration node, SourceIndex index) { + return recurse(node, index); } @Override - public Void visitInvocationExpression( InvocationExpression node, SourceIndex index ) - { - MemberReference ref = node.getUserData( Keys.MEMBER_REFERENCE ); + public Void visitInvocationExpression(InvocationExpression node, SourceIndex index) { + MemberReference ref = node.getUserData(Keys.MEMBER_REFERENCE); // get the behavior entry - ClassEntry classEntry = new ClassEntry( ref.getDeclaringType().getInternalName() ); + ClassEntry classEntry = new ClassEntry(ref.getDeclaringType().getInternalName()); BehaviorEntry behaviorEntry = null; - if( ref instanceof MethodReference ) - { + if (ref instanceof MethodReference) { MethodReference methodRef = (MethodReference)ref; - if( methodRef.isConstructor() ) - { - behaviorEntry = new ConstructorEntry( classEntry, ref.getSignature() ); - } - else if( methodRef.isTypeInitializer() ) - { - behaviorEntry = new ConstructorEntry( classEntry ); - } - else - { - behaviorEntry = new MethodEntry( classEntry, ref.getName(), ref.getSignature() ); + if (methodRef.isConstructor()) { + behaviorEntry = new ConstructorEntry(classEntry, ref.getSignature()); + } else if (methodRef.isTypeInitializer()) { + behaviorEntry = new ConstructorEntry(classEntry); + } else { + behaviorEntry = new MethodEntry(classEntry, ref.getName(), ref.getSignature()); } } - if( behaviorEntry != null ) - { + if (behaviorEntry != null) { // get the node for the token AstNode tokenNode = null; - if( node.getTarget() instanceof MemberReferenceExpression ) - { + if (node.getTarget() instanceof MemberReferenceExpression) { tokenNode = ((MemberReferenceExpression)node.getTarget()).getMemberNameToken(); - } - else if( node.getTarget() instanceof SuperReferenceExpression ) - { + } else if (node.getTarget() instanceof SuperReferenceExpression) { tokenNode = node.getTarget(); - } - else if( node.getTarget() instanceof ThisReferenceExpression ) - { + } else if (node.getTarget() instanceof ThisReferenceExpression) { tokenNode = node.getTarget(); } - if( tokenNode != null ) - { - index.addReference( tokenNode, behaviorEntry, m_behaviorEntry ); + if (tokenNode != null) { + index.addReference(tokenNode, behaviorEntry, m_behaviorEntry); } } - return recurse( node, index ); + return recurse(node, index); } @Override - public Void visitMemberReferenceExpression( MemberReferenceExpression node, SourceIndex index ) - { - MemberReference ref = node.getUserData( Keys.MEMBER_REFERENCE ); - if( ref != null ) - { + public Void visitMemberReferenceExpression(MemberReferenceExpression node, SourceIndex index) { + MemberReference ref = node.getUserData(Keys.MEMBER_REFERENCE); + if (ref != null) { // make sure this is actually a field - if( ref.getSignature().indexOf( '(' ) >= 0 ) - { - throw new Error( "Expected a field here! got " + ref ); + if (ref.getSignature().indexOf('(') >= 0) { + throw new Error("Expected a field here! got " + ref); } - ClassEntry classEntry = new ClassEntry( ref.getDeclaringType().getInternalName() ); - FieldEntry fieldEntry = new FieldEntry( classEntry, ref.getName() ); - index.addReference( node.getMemberNameToken(), fieldEntry, m_behaviorEntry ); + ClassEntry classEntry = new ClassEntry(ref.getDeclaringType().getInternalName()); + FieldEntry fieldEntry = new FieldEntry(classEntry, ref.getName()); + index.addReference(node.getMemberNameToken(), fieldEntry, m_behaviorEntry); } - return recurse( node, index ); + return recurse(node, index); } @Override - public Void visitSimpleType( SimpleType node, SourceIndex index ) - { - TypeReference ref = node.getUserData( Keys.TYPE_REFERENCE ); - if( node.getIdentifierToken().getStartLocation() != TextLocation.EMPTY ) - { - ClassEntry classEntry = new ClassEntry( ref.getInternalName() ); - index.addReference( node.getIdentifierToken(), classEntry, m_behaviorEntry ); + public Void visitSimpleType(SimpleType node, SourceIndex index) { + TypeReference ref = node.getUserData(Keys.TYPE_REFERENCE); + if (node.getIdentifierToken().getStartLocation() != TextLocation.EMPTY) { + ClassEntry classEntry = new ClassEntry(ref.getInternalName()); + index.addReference(node.getIdentifierToken(), classEntry, m_behaviorEntry); } - return recurse( node, index ); + return recurse(node, index); } @Override - public Void visitParameterDeclaration( ParameterDeclaration node, SourceIndex index ) - { - ParameterDefinition def = node.getUserData( Keys.PARAMETER_DEFINITION ); - ClassEntry classEntry = new ClassEntry( def.getDeclaringType().getInternalName() ); + public Void visitParameterDeclaration(ParameterDeclaration node, SourceIndex index) { + ParameterDefinition def = node.getUserData(Keys.PARAMETER_DEFINITION); + ClassEntry classEntry = new ClassEntry(def.getDeclaringType().getInternalName()); MethodDefinition methodDef = (MethodDefinition)def.getMethod(); BehaviorEntry behaviorEntry; - if( methodDef.isConstructor() ) - { - behaviorEntry = new ConstructorEntry( classEntry, methodDef.getSignature() ); - } - else - { - behaviorEntry = new MethodEntry( classEntry, methodDef.getName(), methodDef.getSignature() ); + if (methodDef.isConstructor()) { + behaviorEntry = new ConstructorEntry(classEntry, methodDef.getSignature()); + } else { + behaviorEntry = new MethodEntry(classEntry, methodDef.getName(), methodDef.getSignature()); } - ArgumentEntry argumentEntry = new ArgumentEntry( behaviorEntry, def.getPosition(), node.getName() ); - index.addDeclaration( node.getNameToken(), argumentEntry ); + ArgumentEntry argumentEntry = new ArgumentEntry(behaviorEntry, def.getPosition(), node.getName()); + index.addDeclaration(node.getNameToken(), argumentEntry); - return recurse( node, index ); + return recurse(node, index); } @Override - public Void visitIdentifierExpression( IdentifierExpression node, SourceIndex index ) - { - MemberReference ref = node.getUserData( Keys.MEMBER_REFERENCE ); - if( ref != null ) - { - ClassEntry classEntry = new ClassEntry( ref.getDeclaringType().getInternalName() ); - FieldEntry fieldEntry = new FieldEntry( classEntry, ref.getName() ); - index.addReference( node.getIdentifierToken(), fieldEntry, m_behaviorEntry ); + public Void visitIdentifierExpression(IdentifierExpression node, SourceIndex index) { + MemberReference ref = node.getUserData(Keys.MEMBER_REFERENCE); + if (ref != null) { + ClassEntry classEntry = new ClassEntry(ref.getDeclaringType().getInternalName()); + FieldEntry fieldEntry = new FieldEntry(classEntry, ref.getName()); + index.addReference(node.getIdentifierToken(), fieldEntry, m_behaviorEntry); } - return recurse( node, index ); + return recurse(node, index); } @Override - public Void visitObjectCreationExpression( ObjectCreationExpression node, SourceIndex index ) - { - MemberReference ref = node.getUserData( Keys.MEMBER_REFERENCE ); - if( ref != null ) - { - ClassEntry classEntry = new ClassEntry( ref.getDeclaringType().getInternalName() ); - ConstructorEntry constructorEntry = new ConstructorEntry( classEntry, ref.getSignature() ); - if( node.getType() instanceof SimpleType ) - { + public Void visitObjectCreationExpression(ObjectCreationExpression node, SourceIndex index) { + MemberReference ref = node.getUserData(Keys.MEMBER_REFERENCE); + if (ref != null) { + ClassEntry classEntry = new ClassEntry(ref.getDeclaringType().getInternalName()); + ConstructorEntry constructorEntry = new ConstructorEntry(classEntry, ref.getSignature()); + if (node.getType() instanceof SimpleType) { SimpleType simpleTypeNode = (SimpleType)node.getType(); - index.addReference( simpleTypeNode.getIdentifierToken(), constructorEntry, m_behaviorEntry ); + index.addReference(simpleTypeNode.getIdentifierToken(), constructorEntry, m_behaviorEntry); } } - return recurse( node, index ); + return recurse(node, index); } } -- cgit v1.2.3