added Expr#indexofBytecode.

git-svn-id: http://anonsvn.jboss.org/repos/javassist/trunk@31 30ef5769-5b8d-40dd-aea6-55b5d6557bb3

diff --git a/Readme.html b/Readme.html
index 4a5781c34f541a77b4318f308edabf5e4de4be68..0f319d683a2748a78c58469d73b2c27b66756512 100644 (file)
--- a/Readme.html
+++ b/Readme.html
@@ -236,11 +236,12 @@ see javassist.Dump.
 
 <h2>Changes</h2>
 
-<p>- version 2.6 in July, 2003.
+<p>- version 2.6 in August, 2003.
 
 <ul>
   <li>CtConstructor.setBody() now works for class initializers.
   <li>CtNewMethod.delegator() now works for static methods.
+  <li>javassist.expr.Expr.indexOfBytecode() has been added.
 </ul>
 
 <p>- version 2.5.1 in May, 2003.

diff --git a/src/main/javassist/bytecode/CodeIterator.java b/src/main/javassist/bytecode/CodeIterator.java
index 637dfc99cb31564e01e506fe47043a8e596a9dda..40eb90d449d8e88ed1111fc1473f81444318082e 100644 (file)
--- a/src/main/javassist/bytecode/CodeIterator.java
+++ b/src/main/javassist/bytecode/CodeIterator.java
@@ -137,7 +137,7 @@ public class CodeIterator implements Opcode {
 
     /**
      * Returns the index of the next instruction
-     * (not the next opcode).
+     * (not the operand following the current opcode).
      *
      * <p>Note that the index is into the byte array returned by
      * <code>get().getCode()</code>.

diff --git a/src/main/javassist/expr/Expr.java b/src/main/javassist/expr/Expr.java
index b02d40e96036243de971aa6e1366e9999ede0e89..2764767d9c466704c531b0297f35de4e8a00e497 100644 (file)
--- a/src/main/javassist/expr/Expr.java
+++ b/src/main/javassist/expr/Expr.java
@@ -35,7 +35,7 @@ public abstract class Expr implements Opcode {
 
     static final String javaLangObject = "java.lang.Object";
 
-    Expr(int pos, CodeIterator i, CtClass declaring, MethodInfo m) {
+    protected Expr(int pos, CodeIterator i, CtClass declaring, MethodInfo m) {
         currentPos = pos;
         iterator = i;
         thisClass = declaring;
@@ -124,6 +124,16 @@ public abstract class Expr implements Opcode {
         list.add(c);
     }
 
+    /**
+     * Returns the index of the bytecode corresponding to the
+     * expression.
+     * It is the index into the byte array containing the Java bytecode
+     * that implements the method.
+     */
+    public int indexOfBytecode() {
+        return currentPos;
+    }
+
     /**
      * Returns the line number of the source line containing the
      * expression.