You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2015/08/21 15:02:58 UTC
svn commit: r1696964 - in /commons/proper/bcel/trunk/src: changes/
main/java/org/apache/commons/bcel6/classfile/
main/java/org/apache/commons/bcel6/verifier/statics/
test/java/org/apache/commons/bcel6/visitors/
Author: sebb
Date: Fri Aug 21 13:02:58 2015
New Revision: 1696964
URL: http://svn.apache.org/r1696964
Log:
BCEL-248 StackMapTable[Entry] should be removed and improvements merged into StackMap[Entry]
Removed:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapTable.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapTableEntry.java
Modified:
commons/proper/bcel/trunk/src/changes/changes.xml
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/DescendingVisitor.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/EmptyVisitor.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Visitor.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/StringRepresentation.java
commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/visitors/CounterVisitor.java
Modified: commons/proper/bcel/trunk/src/changes/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/changes/changes.xml?rev=1696964&r1=1696963&r2=1696964&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/changes/changes.xml (original)
+++ commons/proper/bcel/trunk/src/changes/changes.xml Fri Aug 21 13:02:58 2015
@@ -63,7 +63,8 @@ The <action> type attribute can be add,u
<body>
<release version="6.0" date="TBA" description="Major release with Java 7 and 8 support">
- <action issue="BCEL-202" type="fix">StackMapTableEntry.copy() needs to be deep; Improved support for StackMaps</action>
+ <action issue="BCEL-248" type="fix">StackMapTable[Entry] should be removed and improvements merged into StackMap[Entry]</action>
+ <action issue="BCEL-202" type="fix">StackMap[Table]Entry.copy() needs to be deep; Improved support for StackMaps</action>
<action issue="BCEL-251" type="fix">Pass3aVerifier visitANEWARRAY() does not allow 255 array dimensions</action>
<action issue="BCEL-211" type="update">Some additional clone methods should be public.</action>
<action issue="BCEL-249" type="fix">Check for max Short seems wrong</action>
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java?rev=1696964&r1=1696963&r2=1696964&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Attribute.java Fri Aug 21 13:02:58 2015
@@ -220,7 +220,7 @@ public abstract class Attribute implemen
case Constants.ATTR_ENCLOSING_METHOD:
return new EnclosingMethod(name_index, length, file, constant_pool);
case Constants.ATTR_STACK_MAP_TABLE:
- return new StackMapTable(name_index, length, file, constant_pool);
+ return new StackMap(name_index, length, file, constant_pool);
case Constants.ATTR_BOOTSTRAP_METHODS:
return new BootstrapMethods(name_index, length, file, constant_pool);
case Constants.ATTR_METHOD_PARAMETERS:
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/DescendingVisitor.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/DescendingVisitor.java?rev=1696964&r1=1696963&r2=1696964&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/DescendingVisitor.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/DescendingVisitor.java Fri Aug 21 13:02:58 2015
@@ -250,7 +250,6 @@ public class DescendingVisitor implement
/**
* @since 6.0
- */
@Override
public void visitStackMapTable(StackMapTable table)
{
@@ -262,10 +261,10 @@ public class DescendingVisitor implement
}
stack.pop();
}
+ */
/**
* @since 6.0
- */
@Override
public void visitStackMapTableEntry(StackMapTableEntry var)
{
@@ -273,6 +272,7 @@ public class DescendingVisitor implement
var.accept(visitor);
stack.pop();
}
+ */
@Override
public void visitLocalVariable(LocalVariable var)
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/EmptyVisitor.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/EmptyVisitor.java?rev=1696964&r1=1696963&r2=1696964&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/EmptyVisitor.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/EmptyVisitor.java Fri Aug 21 13:02:58 2015
@@ -237,19 +237,19 @@ public class EmptyVisitor implements Vis
/**
* @since 6.0
- */
@Override
public void visitStackMapTable(StackMapTable obj)
{
}
+ */
/**
* @since 6.0
- */
@Override
public void visitStackMapTableEntry(StackMapTableEntry obj)
{
}
+ */
/**
* @since 6.0
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Visitor.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Visitor.java?rev=1696964&r1=1696963&r2=1696964&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Visitor.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Visitor.java Fri Aug 21 13:02:58 2015
@@ -95,16 +95,6 @@ public interface Visitor
/**
* @since 6.0
*/
- void visitStackMapTable(StackMapTable obj);
-
- /**
- * @since 6.0
- */
- void visitStackMapTableEntry(StackMapTableEntry obj);
-
- /**
- * @since 6.0
- */
void visitAnnotation(Annotations obj);
/**
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/StringRepresentation.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/StringRepresentation.java?rev=1696964&r1=1696963&r2=1696964&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/StringRepresentation.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/StringRepresentation.java Fri Aug 21 13:02:58 2015
@@ -53,7 +53,6 @@ import org.apache.commons.bcel6.classfil
import org.apache.commons.bcel6.classfile.Signature;
import org.apache.commons.bcel6.classfile.SourceFile;
import org.apache.commons.bcel6.classfile.StackMap;
-import org.apache.commons.bcel6.classfile.StackMapTable;
import org.apache.commons.bcel6.classfile.Synthetic;
import org.apache.commons.bcel6.classfile.Unknown;
import org.apache.commons.bcel6.verifier.exc.AssertionViolatedException;
@@ -300,14 +299,6 @@ public class StringRepresentation extend
tostring = toString(obj);
}
- /**
- * @since 6.0
- */
- @Override
- public void visitStackMapTable(StackMapTable obj) {
- tostring = toString(obj);
- }
-
@Override
public void visitSynthetic(Synthetic obj) {
tostring = toString(obj);
Modified: commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/visitors/CounterVisitor.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/visitors/CounterVisitor.java?rev=1696964&r1=1696963&r2=1696964&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/visitors/CounterVisitor.java (original)
+++ commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/visitors/CounterVisitor.java Fri Aug 21 13:02:58 2015
@@ -57,8 +57,6 @@ import org.apache.commons.bcel6.classfil
import org.apache.commons.bcel6.classfile.SourceFile;
import org.apache.commons.bcel6.classfile.StackMap;
import org.apache.commons.bcel6.classfile.StackMapEntry;
-import org.apache.commons.bcel6.classfile.StackMapTable;
-import org.apache.commons.bcel6.classfile.StackMapTableEntry;
import org.apache.commons.bcel6.classfile.Synthetic;
import org.apache.commons.bcel6.classfile.Unknown;
import org.apache.commons.bcel6.classfile.Visitor;
@@ -388,20 +386,6 @@ public class CounterVisitor implements V
}
/** @since 6.0 */
- @Override
- public void visitStackMapTable(StackMapTable obj)
- {
- stackMapTableCount++;
- }
-
- /** @since 6.0 */
- @Override
- public void visitStackMapTableEntry(StackMapTableEntry obj)
- {
- stackMapTableEntryCount++;
- }
-
- /** @since 6.0 */
@Override
public void visitBootstrapMethods(BootstrapMethods obj)
{