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

---
 .../enigma/bytecode/BytecodeIndexIterator.java     | 121 ++++++++-------------
 1 file changed, 46 insertions(+), 75 deletions(-)

(limited to 'src/cuchaz/enigma/bytecode/BytecodeIndexIterator.java')

diff --git a/src/cuchaz/enigma/bytecode/BytecodeIndexIterator.java b/src/cuchaz/enigma/bytecode/BytecodeIndexIterator.java
index aadbeb2..fc2bac3 100644
--- a/src/cuchaz/enigma/bytecode/BytecodeIndexIterator.java
+++ b/src/cuchaz/enigma/bytecode/BytecodeIndexIterator.java
@@ -18,67 +18,53 @@ import javassist.bytecode.CodeAttribute;
 import javassist.bytecode.CodeIterator;
 import javassist.bytecode.Opcode;
 
-public class BytecodeIndexIterator implements Iterator<BytecodeIndexIterator.Index>
-{
-	public static class Index
-	{
+public class BytecodeIndexIterator implements Iterator<BytecodeIndexIterator.Index> {
+	
+	public static class Index {
+		
 		private CodeIterator m_iter;
 		private int m_pos;
 		private boolean m_isWide;
 		
-		protected Index( CodeIterator iter, int pos, boolean isWide )
-		{
+		protected Index(CodeIterator iter, int pos, boolean isWide) {
 			m_iter = iter;
 			m_pos = pos;
 			m_isWide = isWide;
 		}
 		
-		public int getIndex( )
-		{
-			if( m_isWide )
-			{
-				return m_iter.s16bitAt( m_pos );
-			}
-			else
-			{
-				return m_iter.byteAt( m_pos );
+		public int getIndex() {
+			if (m_isWide) {
+				return m_iter.s16bitAt(m_pos);
+			} else {
+				return m_iter.byteAt(m_pos);
 			}
 		}
 		
-		public void setIndex( int val )
-		throws BadBytecode
-		{
-			if( m_isWide )
-			{
-				m_iter.write16bit( val, m_pos );
-			}
-			else
-			{
-				if( val < 256 )
-				{
+		public void setIndex(int val) throws BadBytecode {
+			if (m_isWide) {
+				m_iter.write16bit(val, m_pos);
+			} else {
+				if (val < 256) {
 					// we can write the byte
-					m_iter.writeByte( val, m_pos );
-				}
-				else
-				{
+					m_iter.writeByte(val, m_pos);
+				} else {
 					// we need to upgrade this instruction to LDC_W
-					assert( m_iter.byteAt( m_pos - 1 ) == Opcode.LDC );
-					m_iter.insertGap( m_pos - 1, 1 );
-					m_iter.writeByte( Opcode.LDC_W, m_pos - 1 );
-					m_iter.write16bit( val, m_pos );
+					assert (m_iter.byteAt(m_pos - 1) == Opcode.LDC);
+					m_iter.insertGap(m_pos - 1, 1);
+					m_iter.writeByte(Opcode.LDC_W, m_pos - 1);
+					m_iter.write16bit(val, m_pos);
 					m_isWide = true;
 					
 					// move the iterator to the next opcode
-					m_iter.move( m_pos + 2 );
+					m_iter.move(m_pos + 2);
 				}
 			}
 			
 			// sanity check
-			assert( val == getIndex() );
+			assert (val == getIndex());
 		}
 		
-		public boolean isValid( Bytecode bytecode )
-		{
+		public boolean isValid(Bytecode bytecode) {
 			return getIndex() >= 0 && getIndex() < bytecode.getConstPool().getSize();
 		}
 	}
@@ -88,9 +74,7 @@ public class BytecodeIndexIterator implements Iterator<BytecodeIndexIterator.Ind
 	private CodeIterator m_iter;
 	private Index m_next;
 	
-	public BytecodeIndexIterator( Bytecode bytecode )
-	throws BadBytecode
-	{
+	public BytecodeIndexIterator(Bytecode bytecode) throws BadBytecode {
 		m_bytecode = bytecode;
 		m_attribute = bytecode.toCodeAttribute();
 		m_iter = m_attribute.iterator();
@@ -99,41 +83,32 @@ public class BytecodeIndexIterator implements Iterator<BytecodeIndexIterator.Ind
 	}
 	
 	@Override
-	public boolean hasNext( )
-	{
+	public boolean hasNext() {
 		return m_next != null;
 	}
-
+	
 	@Override
-	public Index next( )
-	{
+	public Index next() {
 		Index out = m_next;
-		try
-		{
+		try {
 			m_next = getNext();
-		}
-		catch( BadBytecode ex )
-		{
-			throw new Error( ex );
+		} catch (BadBytecode ex) {
+			throw new Error(ex);
 		}
 		return out;
 	}
-
+	
 	@Override
-	public void remove( )
-	{
+	public void remove() {
 		throw new UnsupportedOperationException();
 	}
 	
-	private Index getNext( )
-	throws BadBytecode
-	{
-		while( m_iter.hasNext() )
-		{
+	private Index getNext() throws BadBytecode {
+		while (m_iter.hasNext()) {
 			int pos = m_iter.next();
-			int opcode = m_iter.byteAt( pos );
-			switch( opcode )
-			{
+			int opcode = m_iter.byteAt(pos);
+			switch (opcode) {
+				
 				// for only these opcodes, the next two bytes are a const pool reference
 				case Opcode.ANEWARRAY:
 				case Opcode.CHECKCAST:
@@ -151,30 +126,26 @@ public class BytecodeIndexIterator implements Iterator<BytecodeIndexIterator.Ind
 				case Opcode.PUTSTATIC:
 				case Opcode.GETFIELD:
 				case Opcode.GETSTATIC:
-					return new Index( m_iter, pos + 1, true );
-				
+					return new Index(m_iter, pos + 1, true);
+					
 				case Opcode.LDC:
-					return new Index( m_iter, pos + 1, false );
+					return new Index(m_iter, pos + 1, false);
 			}
 		}
 		
 		return null;
 	}
 	
-	public Iterable<Index> indices( )
-	{
-		return new Iterable<Index>( )
-		{
+	public Iterable<Index> indices() {
+		return new Iterable<Index>() {
 			@Override
-			public Iterator<Index> iterator( )
-			{
+			public Iterator<Index> iterator() {
 				return BytecodeIndexIterator.this;
 			}
 		};
 	}
 	
-	public void saveChangesToBytecode( )
-	{
-		BytecodeTools.setBytecode( m_bytecode, m_attribute.getCode() );
+	public void saveChangesToBytecode() {
+		BytecodeTools.setBytecode(m_bytecode, m_attribute.getCode());
 	}
 }
-- 
cgit v1.2.3