Author: tcurdt
Date: Sat Mar 10 07:08:05 2007
New Revision: 516724

URL: http://svn.apache.org/viewvc?view=rev&rev=516724
Log:
http://issues.apache.org/bugzilla/show_bug.cgi?id=40044

and some source code cleanup


Modified:
    jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/InstructionFinder.java

Modified: 
jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/InstructionFinder.java
URL: 
http://svn.apache.org/viewvc/jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/InstructionFinder.java?view=diff&rev=516724&r1=516723&r2=516724
==============================================================================
--- 
jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/InstructionFinder.java 
(original)
+++ 
jakarta/bcel/trunk/src/main/java/org/apache/bcel/util/InstructionFinder.java 
Sat Mar 10 07:08:05 2007
@@ -24,6 +24,7 @@
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+
 import org.apache.bcel.Constants;
 import org.apache.bcel.generic.ClassGenException;
 import org.apache.bcel.generic.Instruction;
@@ -64,6 +65,7 @@
  * @see Instruction
  * @see InstructionList
  */
[EMAIL PROTECTED]("unchecked")
 public class InstructionFinder {
 
     private static final int OFFSET = 32767; // char + OFFSET is
@@ -227,7 +229,7 @@
         while (start < il_string.length() && matcher.find(start)) {
             int startExpr = matcher.start();
             int endExpr = matcher.end();
-            int lenExpr = (endExpr - startExpr) + 1;
+            int lenExpr = (endExpr - startExpr);
             InstructionHandle[] match = getMatch(startExpr, lenExpr);
             if ((constraint == null) || constraint.checkCode(match)) {
                 matches.add(match);
@@ -314,122 +316,77 @@
 
     // Initialize pattern map
     static {
-        map
-                .put(
-                        "arithmeticinstruction",
-                        
"(irem|lrem|iand|ior|ineg|isub|lneg|fneg|fmul|ldiv|fadd|lxor|frem|idiv|land|ixor|ishr|fsub|lshl|fdiv|iadd|lor|dmul|lsub|ishl|imul|lmul|lushr|dneg|iushr|lshr|ddiv|drem|dadd|ladd|dsub)");
-        map.put("invokeinstruction", 
"(invokevirtual|invokeinterface|invokestatic|invokespecial)");
-        map
-                .put(
-                        "arrayinstruction",
-                        
"(baload|aastore|saload|caload|fastore|lastore|iaload|castore|iastore|aaload|bastore|sastore|faload|laload|daload|dastore)");
-        map.put("gotoinstruction", "(goto|goto_w)");
-        map.put("conversioninstruction",
-                
"(d2l|l2d|i2s|d2i|l2i|i2b|l2f|d2f|f2i|i2d|i2l|f2d|i2c|f2l|i2f)");
-        map.put("localvariableinstruction",
-                
"(fstore|iinc|lload|dstore|dload|iload|aload|astore|istore|fload|lstore)");
-        map.put("loadinstruction", "(fload|dload|lload|iload|aload)");
-        map.put("fieldinstruction", "(getfield|putstatic|getstatic|putfield)");
-        map
-                .put(
-                        "cpinstruction",
-                        
"(ldc2_w|invokeinterface|multianewarray|putstatic|instanceof|getstatic|checkcast|getfield|invokespecial|ldc_w|invokestatic|invokevirtual|putfield|ldc|new|anewarray)");
-        map.put("stackinstruction", 
"(dup2|swap|dup2_x2|pop|pop2|dup|dup2_x1|dup_x2|dup_x1)");
-        map
-                .put(
-                        "branchinstruction",
-                        
"(ifle|if_acmpne|if_icmpeq|if_acmpeq|ifnonnull|goto_w|iflt|ifnull|if_icmpne|tableswitch|if_icmple|ifeq|if_icmplt|jsr_w|if_icmpgt|ifgt|jsr|goto|ifne|ifge|lookupswitch|if_icmpge)");
-        map.put("returninstruction", 
"(lreturn|ireturn|freturn|dreturn|areturn|return)");
-        map.put("storeinstruction", "(istore|fstore|dstore|astore|lstore)");
-        map.put("select", "(tableswitch|lookupswitch)");
-        map
-                .put(
-                        "ifinstruction",
-                        
"(ifeq|ifgt|if_icmpne|if_icmpeq|ifge|ifnull|ifne|if_icmple|if_icmpge|if_acmpeq|if_icmplt|if_acmpne|ifnonnull|iflt|if_icmpgt|ifle)");
-        map.put("jsrinstruction", "(jsr|jsr_w)");
-        map.put("variablelengthinstruction", 
"(tableswitch|jsr|goto|lookupswitch)");
-        map.put("unconditionalbranch", "(goto|jsr|jsr_w|athrow|goto_w)");
-        map.put("constantpushinstruction", 
"(dconst|bipush|sipush|fconst|iconst|lconst)");
-        map
-                .put(
-                        "typedinstruction",
-                        
"(imul|lsub|aload|fload|lor|new|aaload|fcmpg|iand|iaload|lrem|idiv|d2l|isub|dcmpg|dastore|ret|f2d|f2i|drem|iinc|i2c|checkcast|frem|lreturn|astore|lushr|daload|dneg|fastore|istore|lshl|ldiv|lstore|areturn|ishr|ldc_w|invokeinterface|aastore|lxor|ishl|l2d|i2f|return|faload|sipush|iushr|caload|instanceof|invokespecial|putfield|fmul|ireturn|laload|d2f|lneg|ixor|i2l|fdiv|lastore|multianewarray|i2b|getstatic|i2d|putstatic|fcmpl|saload|ladd|irem|dload|jsr_w|dconst|dcmpl|fsub|freturn|ldc|aconst_null|castore|lmul|ldc2_w|dadd|iconst|f2l|ddiv|dstore|land|jsr|anewarray|dmul|bipush|dsub|sastore|d2i|i2s|lshr|iadd|l2i|lload|bastore|fstore|fneg|iload|fadd|baload|fconst|ior|ineg|dreturn|l2f|lconst|getfield|invokevirtual|invokestatic|iastore)");
-        map.put("popinstruction", 
"(fstore|dstore|pop|pop2|astore|putstatic|istore|lstore)");
-        map.put("allocationinstruction", 
"(multianewarray|new|anewarray|newarray)");
-        map
-                .put(
-                        "indexedinstruction",
-                        
"(lload|lstore|fload|ldc2_w|invokeinterface|multianewarray|astore|dload|putstatic|instanceof|getstatic|checkcast|getfield|invokespecial|dstore|istore|iinc|ldc_w|ret|fstore|invokestatic|iload|putfield|invokevirtual|ldc|new|aload|anewarray)");
-        map
-                .put(
-                        "pushinstruction",
-                        
"(dup|lload|dup2|bipush|fload|ldc2_w|sipush|lconst|fconst|dload|getstatic|ldc_w|aconst_null|dconst|iload|ldc|iconst|aload)");
-        map
-                .put(
-                        "stackproducer",
-                        
"(imul|lsub|aload|fload|lor|new|aaload|fcmpg|iand|iaload|lrem|idiv|d2l|isub|dcmpg|dup|f2d|f2i|drem|i2c|checkcast|frem|lushr|daload|dneg|lshl|ldiv|ishr|ldc_w|invokeinterface|lxor|ishl|l2d|i2f|faload|sipush|iushr|caload|instanceof|invokespecial|fmul|laload|d2f|lneg|ixor|i2l|fdiv|getstatic|i2b|swap|i2d|dup2|fcmpl|saload|ladd|irem|dload|jsr_w|dconst|dcmpl|fsub|ldc|arraylength|aconst_null|tableswitch|lmul|ldc2_w|iconst|dadd|f2l|ddiv|land|jsr|anewarray|dmul|bipush|dsub|d2i|newarray|i2s|lshr|iadd|lload|l2i|fneg|iload|fadd|baload|fconst|lookupswitch|ior|ineg|lconst|l2f|getfield|invokevirtual|invokestatic)");
-        map
-                .put(
-                        "stackconsumer",
-                        
"(imul|lsub|lor|iflt|fcmpg|if_icmpgt|iand|ifeq|if_icmplt|lrem|ifnonnull|idiv|d2l|isub|dcmpg|dastore|if_icmpeq|f2d|f2i|drem|i2c|checkcast|frem|lreturn|astore|lushr|pop2|monitorexit|dneg|fastore|istore|lshl|ldiv|lstore|areturn|if_icmpge|ishr|monitorenter|invokeinterface|aastore|lxor|ishl|l2d|i2f|return|iushr|instanceof|invokespecial|fmul|ireturn|d2f|lneg|ixor|pop|i2l|ifnull|fdiv|lastore|i2b|if_acmpeq|ifge|swap|i2d|putstatic|fcmpl|ladd|irem|dcmpl|fsub|freturn|ifgt|castore|lmul|dadd|f2l|ddiv|dstore|land|if_icmpne|if_acmpne|dmul|dsub|sastore|ifle|d2i|i2s|lshr|iadd|l2i|bastore|fstore|fneg|fadd|ior|ineg|ifne|dreturn|l2f|if_icmple|getfield|invokevirtual|invokestatic|iastore)");
-        map
-                .put(
-                        "exceptionthrower",
-                        
"(irem|lrem|laload|putstatic|baload|dastore|areturn|getstatic|ldiv|anewarray|iastore|castore|idiv|saload|lastore|fastore|putfield|lreturn|caload|getfield|return|aastore|freturn|newarray|instanceof|multianewarray|athrow|faload|iaload|aaload|dreturn|monitorenter|checkcast|bastore|arraylength|new|invokevirtual|sastore|ldc_w|ireturn|invokespecial|monitorexit|invokeinterface|ldc|invokestatic|daload)");
-        map
-                .put(
-                        "loadclass",
-                        
"(multianewarray|invokeinterface|instanceof|invokespecial|putfield|checkcast|putstatic|invokevirtual|new|getstatic|invokestatic|getfield|anewarray)");
-        map
-                .put(
-                        "instructiontargeter",
-                        
"(ifle|if_acmpne|if_icmpeq|if_acmpeq|ifnonnull|goto_w|iflt|ifnull|if_icmpne|tableswitch|if_icmple|ifeq|if_icmplt|jsr_w|if_icmpgt|ifgt|jsr|goto|ifne|ifge|lookupswitch|if_icmpge)");
-        // Some aliases
-        map.put("if_icmp", 
"(if_icmpne|if_icmpeq|if_icmple|if_icmpge|if_icmplt|if_icmpgt)");
-        map.put("if_acmp", "(if_acmpeq|if_acmpne)");
-        map.put("if", "(ifeq|ifne|iflt|ifge|ifgt|ifle)");
-        // Precompile some aliases first
-        map.put("iconst", precompile(Constants.ICONST_0, Constants.ICONST_5, 
Constants.ICONST_M1));
-        map.put("lconst", new String(new char[] {
-                '(', makeChar(Constants.LCONST_0), '|', 
makeChar(Constants.LCONST_1), ')'
-        }));
-        map.put("dconst", new String(new char[] {
-                '(', makeChar(Constants.DCONST_0), '|', 
makeChar(Constants.DCONST_1), ')'
-        }));
-        map.put("fconst", new String(new char[] {
-                '(', makeChar(Constants.FCONST_0), '|', 
makeChar(Constants.FCONST_1), ')'
-        }));
-        map.put("iload", precompile(Constants.ILOAD_0, Constants.ILOAD_3, 
Constants.ILOAD));
-        map.put("dload", precompile(Constants.DLOAD_0, Constants.DLOAD_3, 
Constants.DLOAD));
-        map.put("fload", precompile(Constants.FLOAD_0, Constants.FLOAD_3, 
Constants.FLOAD));
-        map.put("aload", precompile(Constants.ALOAD_0, Constants.ALOAD_3, 
Constants.ALOAD));
-        map.put("istore", precompile(Constants.ISTORE_0, Constants.ISTORE_3, 
Constants.ISTORE));
-        map.put("dstore", precompile(Constants.DSTORE_0, Constants.DSTORE_3, 
Constants.DSTORE));
-        map.put("fstore", precompile(Constants.FSTORE_0, Constants.FSTORE_3, 
Constants.FSTORE));
-        map.put("astore", precompile(Constants.ASTORE_0, Constants.ASTORE_3, 
Constants.ASTORE));
-        // Compile strings
-        for (Iterator i = map.keySet().iterator(); i.hasNext();) {
-            String key = (String) i.next();
-            String value = (String) map.get(key);
-            char ch = value.charAt(1); // Omit already precompiled patterns
-            if (ch < OFFSET) {
-                map.put(key, compilePattern(value)); // precompile all patterns
-            }
-        }
-        // Add instruction alias to match anything
-        StringBuffer buf = new StringBuffer("(");
-        for (short i = 0; i < NO_OPCODES; i++) {
-            if (Constants.NO_OF_OPERANDS[i] != Constants.UNDEFINED) { // Not an
-                // invalid
-                // opcode
-                buf.append(makeChar(i));
-                if (i < NO_OPCODES - 1) {
-                    buf.append('|');
-                }
-            }
-        }
-        buf.append(')');
-        map.put("instruction", buf.toString());
+        
map.put("arithmeticinstruction","(irem|lrem|iand|ior|ineg|isub|lneg|fneg|fmul|ldiv|fadd|lxor|frem|idiv|land|ixor|ishr|fsub|lshl|fdiv|iadd|lor|dmul|lsub|ishl|imul|lmul|lushr|dneg|iushr|lshr|ddiv|drem|dadd|ladd|dsub)");
+               map.put("invokeinstruction", 
"(invokevirtual|invokeinterface|invokestatic|invokespecial)");
+               map.put("arrayinstruction", 
"(baload|aastore|saload|caload|fastore|lastore|iaload|castore|iastore|aaload|bastore|sastore|faload|laload|daload|dastore)");
+               map.put("gotoinstruction", "(goto|goto_w)");
+               map.put("conversioninstruction", 
"(d2l|l2d|i2s|d2i|l2i|i2b|l2f|d2f|f2i|i2d|i2l|f2d|i2c|f2l|i2f)");
+               
map.put("localvariableinstruction","(fstore|iinc|lload|dstore|dload|iload|aload|astore|istore|fload|lstore)");
+               map.put("loadinstruction", "(fload|dload|lload|iload|aload)");
+               map.put("fieldinstruction", 
"(getfield|putstatic|getstatic|putfield)");
+               map.put("cpinstruction", 
"(ldc2_w|invokeinterface|multianewarray|putstatic|instanceof|getstatic|checkcast|getfield|invokespecial|ldc_w|invokestatic|invokevirtual|putfield|ldc|new|anewarray)");
+               map.put("stackinstruction", 
"(dup2|swap|dup2_x2|pop|pop2|dup|dup2_x1|dup_x2|dup_x1)");
+               map.put("branchinstruction", 
"(ifle|if_acmpne|if_icmpeq|if_acmpeq|ifnonnull|goto_w|iflt|ifnull|if_icmpne|tableswitch|if_icmple|ifeq|if_icmplt|jsr_w|if_icmpgt|ifgt|jsr|goto|ifne|ifge|lookupswitch|if_icmpge)");
+               map.put("returninstruction", 
"(lreturn|ireturn|freturn|dreturn|areturn|return)");
+               map.put("storeinstruction", 
"(istore|fstore|dstore|astore|lstore)");
+               map.put("select", "(tableswitch|lookupswitch)");
+               map.put("ifinstruction", 
"(ifeq|ifgt|if_icmpne|if_icmpeq|ifge|ifnull|ifne|if_icmple|if_icmpge|if_acmpeq|if_icmplt|if_acmpne|ifnonnull|iflt|if_icmpgt|ifle)");
+               map.put("jsrinstruction", "(jsr|jsr_w)");
+               map.put("variablelengthinstruction", 
"(tableswitch|jsr|goto|lookupswitch)");
+               map.put("unconditionalbranch", 
"(goto|jsr|jsr_w|athrow|goto_w)");
+               map.put("constantpushinstruction", 
"(dconst|bipush|sipush|fconst|iconst|lconst)");
+               map.put("typedinstruction", 
"(imul|lsub|aload|fload|lor|new|aaload|fcmpg|iand|iaload|lrem|idiv|d2l|isub|dcmpg|dastore|ret|f2d|f2i|drem|iinc|i2c|checkcast|frem|lreturn|astore|lushr|daload|dneg|fastore|istore|lshl|ldiv|lstore|areturn|ishr|ldc_w|invokeinterface|aastore|lxor|ishl|l2d|i2f|return|faload|sipush|iushr|caload|instanceof|invokespecial|putfield|fmul|ireturn|laload|d2f|lneg|ixor|i2l|fdiv|lastore|multianewarray|i2b|getstatic|i2d|putstatic|fcmpl|saload|ladd|irem|dload|jsr_w|dconst|dcmpl|fsub|freturn|ldc|aconst_null|castore|lmul|ldc2_w|dadd|iconst|f2l|ddiv|dstore|land|jsr|anewarray|dmul|bipush|dsub|sastore|d2i|i2s|lshr|iadd|l2i|lload|bastore|fstore|fneg|iload|fadd|baload|fconst|ior|ineg|dreturn|l2f|lconst|getfield|invokevirtual|invokestatic|iastore)");
+               map.put("popinstruction", 
"(fstore|dstore|pop|pop2|astore|putstatic|istore|lstore)");
+               map.put("allocationinstruction", 
"(multianewarray|new|anewarray|newarray)");
+               map.put("indexedinstruction", 
"(lload|lstore|fload|ldc2_w|invokeinterface|multianewarray|astore|dload|putstatic|instanceof|getstatic|checkcast|getfield|invokespecial|dstore|istore|iinc|ldc_w|ret|fstore|invokestatic|iload|putfield|invokevirtual|ldc|new|aload|anewarray)");
+               map.put("pushinstruction", 
"(dup|lload|dup2|bipush|fload|ldc2_w|sipush|lconst|fconst|dload|getstatic|ldc_w|aconst_null|dconst|iload|ldc|iconst|aload)");
+               map.put("stackproducer", 
"(imul|lsub|aload|fload|lor|new|aaload|fcmpg|iand|iaload|lrem|idiv|d2l|isub|dcmpg|dup|f2d|f2i|drem|i2c|checkcast|frem|lushr|daload|dneg|lshl|ldiv|ishr|ldc_w|invokeinterface|lxor|ishl|l2d|i2f|faload|sipush|iushr|caload|instanceof|invokespecial|fmul|laload|d2f|lneg|ixor|i2l|fdiv|getstatic|i2b|swap|i2d|dup2|fcmpl|saload|ladd|irem|dload|jsr_w|dconst|dcmpl|fsub|ldc|arraylength|aconst_null|tableswitch|lmul|ldc2_w|iconst|dadd|f2l|ddiv|land|jsr|anewarray|dmul|bipush|dsub|d2i|newarray|i2s|lshr|iadd|lload|l2i|fneg|iload|fadd|baload|fconst|lookupswitch|ior|ineg|lconst|l2f|getfield|invokevirtual|invokestatic)");
+               map.put("stackconsumer", 
"(imul|lsub|lor|iflt|fcmpg|if_icmpgt|iand|ifeq|if_icmplt|lrem|ifnonnull|idiv|d2l|isub|dcmpg|dastore|if_icmpeq|f2d|f2i|drem|i2c|checkcast|frem|lreturn|astore|lushr|pop2|monitorexit|dneg|fastore|istore|lshl|ldiv|lstore|areturn|if_icmpge|ishr|monitorenter|invokeinterface|aastore|lxor|ishl|l2d|i2f|return|iushr|instanceof|invokespecial|fmul|ireturn|d2f|lneg|ixor|pop|i2l|ifnull|fdiv|lastore|i2b|if_acmpeq|ifge|swap|i2d|putstatic|fcmpl|ladd|irem|dcmpl|fsub|freturn|ifgt|castore|lmul|dadd|f2l|ddiv|dstore|land|if_icmpne|if_acmpne|dmul|dsub|sastore|ifle|d2i|i2s|lshr|iadd|l2i|bastore|fstore|fneg|fadd|ior|ineg|ifne|dreturn|l2f|if_icmple|getfield|invokevirtual|invokestatic|iastore)");
+               
map.put("exceptionthrower","(irem|lrem|laload|putstatic|baload|dastore|areturn|getstatic|ldiv|anewarray|iastore|castore|idiv|saload|lastore|fastore|putfield|lreturn|caload|getfield|return|aastore|freturn|newarray|instanceof|multianewarray|athrow|faload|iaload|aaload|dreturn|monitorenter|checkcast|bastore|arraylength|new|invokevirtual|sastore|ldc_w|ireturn|invokespecial|monitorexit|invokeinterface|ldc|invokestatic|daload)");
+               map.put("loadclass", 
"(multianewarray|invokeinterface|instanceof|invokespecial|putfield|checkcast|putstatic|invokevirtual|new|getstatic|invokestatic|getfield|anewarray)");
+               map.put("instructiontargeter", 
"(ifle|if_acmpne|if_icmpeq|if_acmpeq|ifnonnull|goto_w|iflt|ifnull|if_icmpne|tableswitch|if_icmple|ifeq|if_icmplt|jsr_w|if_icmpgt|ifgt|jsr|goto|ifne|ifge|lookupswitch|if_icmpge)");
+               // Some aliases
+               map.put("if_icmp", 
"(if_icmpne|if_icmpeq|if_icmple|if_icmpge|if_icmplt|if_icmpgt)");
+               map.put("if_acmp", "(if_acmpeq|if_acmpne)");
+               map.put("if", "(ifeq|ifne|iflt|ifge|ifgt|ifle)");
+               // Precompile some aliases first
+               map.put("iconst", precompile(Constants.ICONST_0, 
Constants.ICONST_5, Constants.ICONST_M1));
+               map.put("lconst", new String(new char[] { '(', 
makeChar(Constants.LCONST_0), '|', makeChar(Constants.LCONST_1), ')' }));
+               map.put("dconst", new String(new char[] { '(', 
makeChar(Constants.DCONST_0), '|', makeChar(Constants.DCONST_1), ')' }));
+               map.put("fconst", new String(new char[] { '(', 
makeChar(Constants.FCONST_0), '|', makeChar(Constants.FCONST_1), ')' }));
+               map.put("iload", precompile(Constants.ILOAD_0, 
Constants.ILOAD_3, Constants.ILOAD));
+               map.put("dload", precompile(Constants.DLOAD_0, 
Constants.DLOAD_3, Constants.DLOAD));
+               map.put("fload", precompile(Constants.FLOAD_0, 
Constants.FLOAD_3, Constants.FLOAD));
+               map.put("aload", precompile(Constants.ALOAD_0, 
Constants.ALOAD_3, Constants.ALOAD));
+               map.put("istore", precompile(Constants.ISTORE_0, 
Constants.ISTORE_3, Constants.ISTORE));
+               map.put("dstore", precompile(Constants.DSTORE_0, 
Constants.DSTORE_3, Constants.DSTORE));
+               map.put("fstore", precompile(Constants.FSTORE_0, 
Constants.FSTORE_3, Constants.FSTORE));
+               map.put("astore", precompile(Constants.ASTORE_0, 
Constants.ASTORE_3, Constants.ASTORE));
+               // Compile strings
+               for (Iterator i = map.keySet().iterator(); i.hasNext();) {
+                       String key = (String) i.next();
+                       String value = (String) map.get(key);
+                       char ch = value.charAt(1); // Omit already precompiled 
patterns
+                       if (ch < OFFSET) {
+                               map.put(key, compilePattern(value)); // 
precompile all
+                                                                               
                                // patterns
+                       }
+               }
+               // Add instruction alias to match anything
+               StringBuffer buf = new StringBuffer("(");
+               for (short i = 0; i < NO_OPCODES; i++) {
+                       if (Constants.NO_OF_OPERANDS[i] != Constants.UNDEFINED) 
{ // Not
+                                                                               
                                                                // an
+                               // invalid
+                               // opcode
+                               buf.append(makeChar(i));
+                               if (i < NO_OPCODES - 1) {
+                                       buf.append('|');
+                               }
+                       }
+               }
+               buf.append(')');
+               map.put("instruction", buf.toString());
     }
 
 
@@ -446,27 +403,27 @@
 
 
     /*
-     * Internal debugging routines.
-     */
-    private static final String pattern2string( String pattern ) {
-        return pattern2string(pattern, true);
-    }
-
-
-    private static final String pattern2string( String pattern, boolean 
make_string ) {
-        StringBuffer buf = new StringBuffer();
-        for (int i = 0; i < pattern.length(); i++) {
-            char ch = pattern.charAt(i);
-            if (ch >= OFFSET) {
-                if (make_string) {
-                    buf.append(Constants.OPCODE_NAMES[ch - OFFSET]);
-                } else {
-                    buf.append((ch - OFFSET));
-                }
-            } else {
-                buf.append(ch);
-            }
-        }
-        return buf.toString();
-    }
+        * Internal debugging routines.
+        */
+//    private static final String pattern2string( String pattern ) {
+//        return pattern2string(pattern, true);
+//    }
+
+
+//    private static final String pattern2string( String pattern, boolean 
make_string ) {
+//        StringBuffer buf = new StringBuffer();
+//        for (int i = 0; i < pattern.length(); i++) {
+//            char ch = pattern.charAt(i);
+//            if (ch >= OFFSET) {
+//                if (make_string) {
+//                    buf.append(Constants.OPCODE_NAMES[ch - OFFSET]);
+//                } else {
+//                    buf.append((ch - OFFSET));
+//                }
+//            } else {
+//                buf.append(ch);
+//            }
+//        }
+//        return buf.toString();
+//    }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to